Commit graph

14505 commits

Author SHA1 Message Date
James R
ffd88746da Update version names, SUBVERSION, MODVERSION 2020-05-11 14:41:36 -07:00
Monster Iestyn
ce3639f569 Merge branch 'master' into next 2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony
cb9d0a2fbe Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02:00
MascaraSnake
ca324f7edc Merge branch 'showfps-fix' into 'master'
Don't show the FPS counter during startup.

See merge request STJr/SRB2!930
2020-05-11 13:31:26 -04:00
MascaraSnake
35b4f88efe Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
Fix Simple Camera not working with the tutorial's statue challenge

See merge request STJr/SRB2!931
2020-05-11 13:31:09 -04:00
MascaraSnake
2ec7a14b9d Merge branch 'delete-lua-again' into 'next'
Fix the BotRespawn hook and hooking A_Dye being disabled for no reason

See merge request STJr/SRB2!932
2020-05-11 13:30:18 -04:00
toaster
67e01ad66e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
# Conflicts:
#	src/m_menu.c
2020-05-11 15:00:31 +01:00
Sally Coolatta
b4f5d931cc Skincolor code cleanup
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
James R
1065ded275 Remove instances of HAVE_BLUA that actually disable Lua now 2020-05-10 19:59:56 -07:00
James R
5ad69621f2 Use camera angle, not mobj angle, when comparing Angle Anchor 2020-05-10 19:40:28 -07:00
Sally Coolatta
ccc2d17817 Actually do what the last commit said it would do
🤦
2020-05-10 19:43:41 -04:00
sphere
0490dc3e8e Don't show the FPS counter during startup. 2020-05-11 01:33:34 +02:00
Sally Coolatta
7f04e58665 Use shiny frame as outwards drift 1 2020-05-10 19:28:36 -04:00
SteelT
1b4d36245f Merge branch '2.2.3-prep' into 'next'
2.2.3 preparation

See merge request STJr/SRB2!929
2020-05-10 17:13:04 -04:00
Steel Titanium
f9195d6593 Merge branch 'next' into 2.2.3-prep 2020-05-10 17:05:56 -04:00
Monster Iestyn
d591b56ef4 Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep 2020-05-10 20:10:11 +01:00
Monster Iestyn
1ea3a031da Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
2020-05-10 20:09:08 +01:00
lachwright
a4cba6a5f9 Merge branch 'master' into next 2020-05-11 01:29:10 +08:00
Lachlan Wright
72c16b0761 Merge branch '1upsound' into 'master'
Play the 1-up sound when 1upsound is set to sound

See merge request STJr/SRB2!926
2020-05-10 13:28:09 -04:00
Lachlan Wright
7df8c24a9b Merge branch 'patch_music' into 'next'
patch_music.pk3

See merge request STJr/SRB2!812
2020-05-10 12:51:49 -04:00
lachwright
10187a1e9b Update MD5 hashes for player.dta and patch.pk3 2020-05-11 00:23:32 +08:00
Monster Iestyn
398770b952 Fix logging on Mac
These fixes were suggested by Sveciaost on #mac-users on Discord
2020-05-10 16:47:01 +01:00
Monster Iestyn
f218920395 Update version number to 2.2.3 in all the usual files, also updated MODVERSION 2020-05-10 16:02:23 +01:00
Sally Coolatta
393c637954 Gravity is higher underwater when going down 2020-05-10 03:19:21 -04:00
Sally Coolatta
f11751bf8f Stronger turning while underwater 2020-05-10 03:18:41 -04:00
Sally Coolatta
2d7113ac2c Ice physics when touching/underwater 2020-05-10 02:42:05 -04:00
Sally Coolatta
347b9bfc5c Low water gravity only applies going up 2020-05-10 02:41:35 -04:00
wolfs
7bb51aabfd Merge branch 'default-manifest' into 'awful-mix'
Add a default manifest file.

See merge request SinnamonLat/Kart-Public!16
2020-05-10 02:08:19 -04:00
wolfs
ca39b3faef Merge branch 'fallback-refusal' into 'awful-mix'
Display refusal message if there is no HTTP source and internal downloads are disabled

See merge request SinnamonLat/Kart-Public!17
2020-05-10 02:07:59 -04:00
LJ Sonic
1952c30344 Merge branch 'gfz3laser-mkii' into 'next'
New Greenflower Zone 3 laser

See merge request STJr/SRB2!924
2020-05-09 16:40:40 -04:00
LJ Sonic
8b5becfcba Merge branch 'optimise-archiving' into 'next'
Optimise net-archiving of Lua strings, numbers and booleans

See merge request STJr/SRB2!904
2020-05-09 16:40:28 -04:00
Jaime Passos
125cd263db Fix OpenGL only recording the first frame of unoptimized GIFs 2020-05-09 16:59:09 -03:00
LJ Sonic
9cfa75b9b5 Merge branch 'showfps-tweaks' into 'next'
FPS counter tweaks

See merge request STJr/SRB2!927
2020-05-09 15:46:08 -04:00
Wolfy
742bf3453b Update hash again 2020-05-09 10:52:23 -05:00
Wolfy
eed42360b0 Forgot to update date modified 2020-05-09 09:15:17 -05:00
ThatAwesomeGuy173
972d052c67 Display refusal message if there is no HTTP source and internal downloads are disabled 2020-05-09 06:06:21 -06:00
Latapostrophe
e9f184f95f Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-05-09 11:33:11 +02:00
Wolfy
1134d87b5f Update patch.kart hash 2020-05-09 03:16:46 -05:00
Sally Coolatta
b97f3cdcce Horizontal springs offset the sprite 2020-05-09 02:17:35 -04:00
Wolfy
18ee678a3a Minor credits updates 2020-05-09 01:17:10 -05:00
Steel Titanium
63104b78fa Add a default manifest file.
The tldr is that it fixes opengl not working on systems with broken drivers, which is usually older intel GPUs
2020-05-08 22:59:19 -04:00
Sally Coolatta
4941d0ce0e Typo in comment 2020-05-08 21:43:19 -04:00
Sally Coolatta
f210b4a417 Sprite offset code 2020-05-08 19:38:51 -04:00
Sally Coolatta
c2b18a989c More logic to spinning your wheels
Use "tire spinning" animations when you're moving on the ground and/or holding accelerate!

The two cases that are changed are:
- If you're in the air and not pressing accelerate, your tires won't spin anymore.
- If you're on the ground, but not moving, but you're still pressing accelerate, they will spin in place. (right now only happens for start boosting, later it will be for spindashing)

Isn't really a tell for anything, just thought it'd be fun attention to detail :)

Additionally, we can use drift frames in the air. Just makes sense because we have air sparks now.
2020-05-08 18:27:51 -04:00
Sally Coolatta
9ea37836e2 New kart animations!
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
2020-05-08 17:26:27 -04:00
sphere
6b761c1486 Make showfps save to config, and add a compact option. 2020-05-08 15:40:50 +02:00
Sally Coolatta
9429ae80e1 Only do this if you're the server :VVV 2020-05-07 22:19:32 -04:00
Lachlan
05c83bbd68 Play the 1-up sound when 1upsound is set to sound 2020-05-08 04:07:00 +08:00
MascaraSnake
59a49d9f3c Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-05-07 22:00:02 +02:00
MascaraSnake
9ebbb5b7c2 Fixed a typo 2020-05-07 21:59:39 +02:00