Commit graph

14498 commits

Author SHA1 Message Date
Sal
27a7f020d3 Merge branch 'camtilt' into 'master'
Add camera pitching when driving on downhill slopes

See merge request KartKrew/Kart!210
2020-03-20 21:41:17 -04:00
Sal
aeb6567b53 Merge branch 'sal-waypoints' into 'waypoints'
Sal edits to waypoints

See merge request KartKrew/Kart!202
2020-03-20 20:43:27 -04:00
Sally Cochenour
263ef8f92c Use divide/multiply for waypoint closest calculations 2020-03-20 19:33:41 -04:00
Latapostrophe
366fff9942 Red rings, fuse, and spb game speed support 2020-03-20 21:58:14 +01:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Monster Iestyn
ffb2674a6e Merge branch 'next' into demos-refactor
# Conflicts:
#	src/g_game.c

(also update g_demo.c)
2020-03-20 17:48:31 +00:00
Latapostrophe
897feac651 Make SPB spawn damaging dust and sliptides while it moves around 2020-03-20 14:59:38 +01:00
LJ Sonic
17ffdda974 Merge branch 'delete-lua' into 'next'
Delete Lua

See merge request STJr/SRB2!852
2020-03-20 09:53:24 -04:00
Latapostrophe
b959c01349 Fix antigrav respawn, no respawn flag, and remove spinout when respawning 2020-03-20 11:04:26 +01:00
Sally Cochenour
2ccc3894e2 Make size differences impact bump knockback more 2020-03-20 00:35:18 -04:00
Sally Cochenour
e83e162463 Thrust when you extinguish flame shield 2020-03-20 00:30:50 -04:00
Sally Cochenour
86edea91d4 Scale thrown items with grow/shrink 2020-03-20 00:27:31 -04:00
Sally Cochenour
46049dba40 Fix drift spark weirdness in mobjscale maps 2020-03-19 22:52:11 -04:00
Sally Cochenour
7924606fe4 Opaque splash 2020-03-19 22:37:13 -04:00
Sally Cochenour
40e01fb71c Increase thrust of destroyed items
Roughly matches what it was supposed to look like before gravity was increased
2020-03-19 22:35:07 -04:00
Sally Cochenour
9a1c013cfc Add basic sound effect 2020-03-19 20:23:00 -04:00
Sally Cochenour
ac8717b981 Make flame gauge placeholder behavior proportional to player count 2020-03-19 20:17:25 -04:00
fickleheart
077b4f14e2 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 2020-03-19 18:55:10 -05:00
Jaime Passos
4579c6f631 Fix lib_setSpriteInfo indexes being off-by-one 2020-03-19 19:09:34 -03:00
Monster Iestyn
45092d854f We don't need m_cheat.h either in g_demo.c 2020-03-19 21:10:23 +00:00
Monster Iestyn
bcfbaec629 We definitely don't need these files to compile! 2020-03-19 20:43:56 +00:00
Monster Iestyn
690ccb49d8 Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all) 2020-03-19 20:42:51 +00:00
Monster Iestyn
8ae098a1e3 update Makefile, CMakeLists.txt and MSVC project files 2020-03-19 20:13:39 +00:00
Monster Iestyn
ac7a71f85b Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c 2020-03-19 20:09:55 +00:00
Louis-Antoine
789ddf9a66 Update CircleCI config 2020-03-19 19:26:46 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Louis-Antoine
1a21da7e2b Fix compiler warning 2020-03-19 14:40:35 +01:00
Louis-Antoine
5318e41f26 Fix misleading naming 2020-03-19 14:40:12 +01:00
Louis-Antoine
85d0a92eb4 Simplify hook code 2020-03-19 14:38:42 +01:00
LJ Sonic
d11479b493 Merge branch 'lua-music' into 'next'
Expose more music-related functions to Lua

See merge request STJr/SRB2!817
2020-03-19 06:53:57 -04:00
Sally Cochenour
6969c833c2 Add more momentum variation 2020-03-19 02:17:12 -04:00
Sally Cochenour
f8d5a5bdf1 Copy boost smoke effect but bigger 2020-03-19 02:12:09 -04:00
Sally Cochenour
9de1e535f2 More complete flame shield rework 2020-03-19 01:35:31 -04:00
fickleheart
0208d1e837 Avoid infinite loops if no maps are selectable (y tho) 2020-03-18 22:56:20 -05:00
fickleheart
7bf9bc4b9e Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
fickleheart
ecb8a6f4e2 More union types for the union type god 2020-03-18 22:42:31 -05:00
fickleheart
83b8c53afa Are these casts unnecessary...?? 2020-03-18 22:40:11 -05:00
fickleheart
95a01de67d Clean up after myself 2020-03-18 22:38:51 -05:00
fickleheart
d7421d14c7 > building SRB2 without Lua in 2020 2020-03-18 22:38:18 -05:00
fickleheart
2176136480 Rename hook to ShouldJingleContinue 2020-03-18 22:35:21 -05:00
James R
cca9b5e2f4 Merge branch 'parties-only' into parties 2020-03-18 19:42:58 -07:00
James R
26794eef46 Draw mini ping counter in splitscreen 2020-03-18 19:42:13 -07:00
Steel Titanium
98be23e3c2 Merge branch 'master' into next 2020-03-18 15:42:02 -04:00
SteelT
d2d8fe64f5 Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'
NiGHTS Mode menu fixes

See merge request STJr/SRB2!841
2020-03-18 15:41:17 -04:00
SteelT
f3a275930b Merge branch 'deadzone-sigfpe-fix' into 'master'
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones

See merge request STJr/SRB2!838
2020-03-18 15:39:04 -04:00
SteelT
2e25a5b56d Merge branch 'viewpointswitch-fix' into 'next'
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
LJ Sonic
b46b698c91 Merge branch 'screenshot-menu-header' into 'master'
Actually use the "SCREENSHOT OPTIONS" header for its menu.

See merge request STJr/SRB2!832
2020-03-18 10:56:35 -04:00
LJ Sonic
753cdd117f Merge branch 'increase-input-buffer' into 'next'
Increase the length of the player input buffer

See merge request STJr/SRB2!835
2020-03-18 09:49:14 -04:00
Sally Cochenour
10c625b42e Start on flame shield rework 2020-03-18 02:38:02 -04:00
Sally Cochenour
bb516042a8 Correct shadow size 2020-03-17 21:02:44 -04:00