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
Sally Cochenour
c313de326e
Teleport bubble trap overlay after slowing down rather than before
2020-03-17 20:47:05 -04:00
Sally Cochenour
dad1d7b610
Apply to flame shield as well (although it didn't need it)
2020-03-17 20:37:36 -04:00
Sally Cochenour
e5fb55df83
Fix infinite bubble bug
2020-03-17 20:36:23 -04:00
Sally Cochenour
1886115e54
Allow Eggman items to be picked up by players using invulerability items
2020-03-17 20:30:30 -04:00
Sally Cochenour
5ef433f9c7
Remove bumper when you respawn in Battle again
...
(This stuff really should be its own function...)
2020-03-17 19:54:32 -04:00
Sally Cochenour
54e1444852
Reset bubble cooldown & holdready when used
2020-03-17 19:41:53 -04:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sally Cochenour
eb2c36348e
Bubble Shield trap overlay fixes
...
- Add player momentum to it, so that it lines up better
- Set noclip so it doesn't stop against walls
2020-03-17 19:27:09 -04:00
Sally Cochenour
32d1abeb2b
Bubble cooldown is longer
...
It was meant to be the same length as inflate & deflate AFTER you were done, but it was only half of that -- now you're vulnerable for the same amount of time as you held it down.
2020-03-17 19:22:13 -04:00
Sally Cochenour
4b2b116481
Try using GameSpeedScalar for thrown item scaling between game speeds, rather than arbritrary values
...
In Hard mode: Spikeballs will be thrown slightly less with this code change, while Bananas will be thrown slightly farther.
That said, the difference is so small that it's very likely not noticable, it just makes the code nicer looking & more consistent :P
2020-03-17 18:55:15 -04:00
Sally Cochenour
9e3a37cdc7
Make Ballhog thrown more like normal missiles
...
(For some reason, it used banana toss throwing speeds before)
2020-03-17 18:49:16 -04:00
Jaime Passos
876d4cd02b
Fix OpenGL
2020-03-17 15:23:13 -03:00
Jaime Passos
7ac4c3eea7
Fix con_backpic
2020-03-17 13:05:54 -03:00
Sally Cochenour
fccc4d2937
Slow down backwards spikeballs (again)
2020-03-16 04:24:32 -04:00
Sally Cochenour
860c1fe23b
Opaque rain
2020-03-16 04:17:45 -04:00
