James R
b8e143d253
How many bruh moments can we have?
2020-02-16 20:45:09 -08:00
James R
b758e7b75b
Merge branch 'colormap_flags_refactor' into 'next'
...
Clean up the mess that is extracolormap_t::fog
See merge request STJr/SRB2!790
2020-02-16 23:28:26 -05:00
James R
5df690af98
Merge branch 'fix-overtime' into 'next'
...
Fix overtime not working
See merge request STJr/SRB2!784
2020-02-16 23:15:01 -05:00
Jaime Passos
2a0495f11b
Merge remote-tracking branch 'origin/next' into fix-overtime
2020-02-17 00:48:42 -03:00
Steel Titanium
a6f8db2d44
Merge branch 'master' into public_next
2020-02-16 21:00:08 -05:00
Steel Titanium
c234d8765d
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 20:41:17 -05:00
James R
fe43dd8306
Merge remote-tracking branch 'origin/next' into public_next
2020-02-16 17:38:03 -08:00
James R
39a0e8b3e1
Merge remote-tracking branch 'origin/master' into next
2020-02-16 17:35:59 -08:00
James R
920a2d51e0
Merge branch 'revert-console-in-menus' into 'master'
...
No more console in menus because codebase sucks xd
See merge request STJr/SRB2!791
2020-02-16 20:33:52 -05:00
James R
73368b0c9a
Revert "Let the console open in menus"
...
This reverts commit 3a9cc8db92
2020-02-16 17:14:54 -08:00
Steel Titanium
e6f6024828
Update credit at Rob's request
2020-02-16 20:10:30 -05:00
SteelT
7ed75dfcbe
Merge branch 'mobj-shadowscale-send' into 'public_next'
...
Fix object shadow not appearing for mid-joiners
See merge request STJr/SRB2Internal!627
2020-02-16 20:05:59 -05:00
Steel Titanium
a7f8ee9dd1
Merge branch 'public_next' into mobj-shadowscale-send
2020-02-16 18:55:44 -05:00
Steel Titanium
6eff91c4fc
Update file hash yet again
2020-02-16 18:54:51 -05:00
Steel Titanium
8019a18e04
Fix object shadow not appearing for mid-joiners
2020-02-16 18:45:49 -05:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
Steel Titanium
82cbf88ae5
Update comment
2020-02-16 11:34:02 -05:00
Steel Titanium
93e61e2519
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 11:32:43 -05:00
LJ Sonic
0da35aff25
Merge branch 'fix-ded-servers' into 'next'
...
Fix dedicated servers not running gamelogic
See merge request STJr/SRB2!788
2020-02-15 18:01:04 -05:00
Louis-Antoine
4314d44d42
Fix dedicated servers not running gamelogic
...
Note to future testers:
Remember to test dedicated servers before merging.
And splitscreen also.
2020-02-15 23:47:11 +01:00
Jaime Passos
23f148f32d
Fix overtime not working
2020-02-15 13:07:53 -03:00
MascaraSnake
fb7ee2cea1
Update hashes (again)
2020-02-15 12:44:03 +01:00
MascaraSnake
7cd6f5b3a4
Merge remote-tracking branch 'Public/next' into public_next
2020-02-15 12:32:39 +01:00
MascaraSnake
de939049ee
Merge branch 'master' into next
2020-02-15 12:32:09 +01:00
MascaraSnake
b52a6d1297
Merge branch 'dropshadows-refactor' into 'next'
...
Use exact object types when setting shadowscale
See merge request STJr/SRB2!755
2020-02-15 06:31:25 -05:00
MascaraSnake
2813b49271
Merge branch 'fix-shift-in-ciptbx' into 'master'
...
I broke SHIFT in the Connect IP Textbox.. whoops.
See merge request STJr/SRB2!777
2020-02-15 06:31:23 -05:00
MascaraSnake
10980c1291
Merge branch 'leftover-tokens' into 'next'
...
Don't carry extra tokens into the next level if you got all 7 emeralds already
See merge request STJr/SRB2!778
2020-02-15 06:31:17 -05:00
MascaraSnake
ffd75b9571
Merge remote-tracking branch 'Public/next' into public_next
2020-02-15 12:25:29 +01:00
MascaraSnake
b094f69008
Merge branch 'po-slide-fixes' into 'next'
...
Improvements to polyobjects carrying things
See merge request STJr/SRB2!772
2020-02-15 06:24:45 -05:00
MascaraSnake
b812fef4c1
Merge branch 'S_SKIN-missing-flag' into 'next'
...
Missing flag in S_SKIN
See merge request STJr/SRB2!781
2020-02-15 02:07:56 -05:00
James R
0ca3a4eca3
Merge branch 'patch-valid' into 'next'
...
Don't error when checking patch.valid on invalid patches
See merge request STJr/SRB2!780
2020-02-12 21:19:19 -05:00
James R
eada06b7ff
Add flag name variant of SF_NONIGHTSROTATION to S_SKIN
2020-02-12 18:02:36 -08:00
colette
b2e040404e
comment
2020-02-12 08:54:20 -05:00
fickleheart
48e3b8d3fc
Don't error when checking patch.valid on invalid patches
2020-02-11 23:25:01 -06:00
Jaime Passos
edf7c16bbe
Merge branch 'gtr-shift' into 'next'
...
1 left shifted by zero is still 1
See merge request STJr/SRB2!766
2020-02-11 23:33:43 -05:00
James R
0723383587
Remove extra tokens if we got all 7 emeroods
2020-02-11 19:36:09 -08:00
Steel Titanium
d6a65a8a87
Merge remote-tracking branch 'public/next' into public_next
2020-02-11 20:43:26 -05:00
James R
04d58c56e5
Merge branch 'patch-1' into 'next'
...
Fix title/card hud hooks grabbing the wrong functions
See merge request STJr/SRB2!758
2020-02-11 20:17:50 -05:00
GoldenTails
54acb48e4a
I broke SHIFT in the Connect IP Textbox.. whoops.
...
It's okay, I literally had to remove one line lmao.
2020-02-11 19:07:48 -06:00
MascaraSnake
60b0ea77e8
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 23:38:31 +01:00
MascaraSnake
2cfe5e3425
Merge branch '2.2.1-prep' into 'next'
...
2.2.1 preparation
See merge request STJr/SRB2!759
2020-02-11 17:37:23 -05:00
MascaraSnake
2687b65095
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 22:27:50 +01:00
MascaraSnake
905d9a5ee6
Merge branch 'signpostfixes' into 'next'
...
Fix CLEAR! signpost showing up in unmodded games (& add proper support for SPR2 animated signpost)
See merge request STJr/SRB2!775
2020-02-11 16:23:06 -05:00
MascaraSnake
b001c6c9db
Merge branch 'defuse-minecarts' into 'next'
...
Defuse minecarts
See merge request STJr/SRB2!776
2020-02-11 13:22:10 -05:00
lachwright
e5b788ed65
Defuse minecarts
2020-02-12 01:41:11 +08:00
lachwright
390511a531
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
2544681658
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
MascaraSnake
8ab1adc895
Merge remote-tracking branch 'Public/2.2.1-prep' into public_next
2020-02-10 22:47:22 +01:00
MascaraSnake
5961c7adc6
Merge remote-tracking branch 'Public/next' into public_next
2020-02-10 22:44:15 +01:00
fickleheart
6a076091f7
Improvements to polyobjects carrying things:
...
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
actual problem :]
2020-02-10 00:07:25 -06:00
