James R
4a973e2906
Revert "...Also remove kartdebugamount"
...
This reverts commit 22cb7451e9
2020-03-21 15:56:38 -07:00
Sal
cbfce16dcc
Merge branch 'done-with-spikeballs' into 'master'
...
Slow down backwards spikeballs (again)
See merge request KartKrew/Kart!212
2020-03-21 18:49:02 -04:00
Sal
0cb5e5893c
Merge branch 'objscalefixes' into 'master'
...
Minor map object scale fixes
See merge request KartKrew/Kart!206
2020-03-21 18:48:36 -04:00
Sally Cochenour
668f80a8ea
Properly scale...
2020-03-21 18:47:44 -04:00
Sal
21f28b27f5
Merge branch 'oops' into 'master'
...
Fix compile error with camtilt
See merge request KartKrew/Kart!214
2020-03-21 18:45:19 -04:00
Sryder
738d1f1940
Make kartdebugwaypoints far more clear to use for the debugging lines
...
Fix memory reallocation issue that I don't think could be seen currently
2020-03-21 21:32:40 +00:00
James R
52fa738ef8
Replace even more ints with INT32
2020-03-21 13:18:17 -07:00
James R
8a28d3cfe5
Replace some instances of int with fixed width types
2020-03-21 13:12:50 -07:00
James R
29ebf7ee60
Attempt to fix Sal's compiler warnings
2020-03-21 13:07:22 -07:00
James R
1dd95f5e3b
gr_shearing doesn't exist in master!
2020-03-21 12:53:33 -07:00
James R
b1db9077a4
splitscreen -> r_splitscreen
2020-03-21 12:48:51 -07:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
MascaraSnake
19aedbb0a7
Merge branch 'master' into next
2020-03-21 20:17:48 +01:00
MascaraSnake
828bc47846
Another ZB config fix
2020-03-21 20:17:28 +01:00
Sryder
3d3b8b6bc6
Replace many cases of if else if statements with I_Asserts.
...
This is done specifically on static functions that aren't used as callbacks.
This is done to keep the code cleaner, and the I_Asserts get compiled out in Release builds.
Logic is left in the "public" functions to avoid crashes as a result of the modules.
2020-03-21 19:00:00 +00:00
MascaraSnake
59899f3cce
Merge branch 'master' into next
2020-03-21 19:16:52 +01:00
MascaraSnake
91f6c68a8f
Merge branch 'config-fixes' into 'master'
...
Updates and fixes for the ZB config
See merge request STJr/SRB2!859
2020-03-21 14:16:04 -04:00
MascaraSnake
915e6fce23
Add Object Special text for Star Post
2020-03-21 15:16:07 +01:00
LJ Sonic
0942c3f39a
Merge branch 'delete-slopes' into 'next'
...
Delete slopes
See merge request STJr/SRB2!857
2020-03-21 09:35:27 -04:00
LJ Sonic
fee49140e1
Merge branch 'skip-empty-gametypes' into 'master'
...
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
2020-03-21 08:52:54 -04:00
fickleheart
ee754b211f
Define SERVER_URL_PROTOCOL const for easy reconfiguration
2020-03-21 07:47:29 -05:00
MascaraSnake
7c8fa41b54
Updates and fixes for the ZB config
2020-03-21 12:06:52 +01:00
Sally Cochenour
46364422d9
Real dumb bug
2020-03-21 05:58:42 -04:00
MascaraSnake
9c3544e8d7
Merge branch 'master' into next
2020-03-21 09:40:57 +01:00
MascaraSnake
4b71029bdd
Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB
2020-03-21 09:40:37 +01:00
fickleheart
8219268f2e
Add support for srb2:// URL handler (server links)
2020-03-21 01:36:39 -05:00
Sal
68bec970a3
Merge branch 'viewpoint-text-toggle' into 'master'
...
Option to hide/show viewpoint text
See merge request KartKrew/Kart!209
2020-03-20 22:07:30 -04:00
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
