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
Steel Titanium
6d8de954e6
Restore this that got shifted.
2020-02-15 17:55:25 -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
Steel Titanium
46cd8fa760
New Lua functions: R_GetColorByName and R_GetNameByColor
2020-02-15 17:35:00 -05:00
Steel Titanium
eed763651f
Add prefoppoistecolor support to save cards
2020-02-15 17:34:21 -05:00
Jaime Passos
23f148f32d
Fix overtime not working
2020-02-15 13:07:53 -03:00
Jaime Passos
fc81f2dce5
change prefix to "PLAYER"
2020-02-15 12:40:41 -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
Steel Titanium
08533debe6
Add six new skin colors
2020-02-14 22:30:37 -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
Jaime Passos
495812aa0e
Cast Moment
2020-02-12 13:59:08 -03:00
Jaime Passos
83112c8248
Add MAXTOL
2020-02-12 13:41:30 -03:00
Jaime Passos
e844f8dbad
Merge remote-tracking branch 'origin/next' into tolfix
2020-02-12 13:03:16 -03: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
Jaime Passos
61bbcb02c6
player model prefix
2020-02-11 23:54:39 -03: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
862f21d1b2
Get rotated sprites with v.getSprite(2)Patch
...
NOTE: since rotated sprites are offset upward by 4px from non-rotated
sprites, these functions will now return a third boolean (true) if a
rotated sprite was returned, so that scripters can offset accordingly.
2020-02-10 01:02:06 -06: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
fickleheart
b87cea3272
Expose stoppedclock to Lua
2020-02-10 00:07:01 -06:00
Steel Titanium
e2c1f9cd4b
Update file hashes
2020-02-09 21:29:46 -05:00
Steel Titanium
89916b7a28
Merge branch 'next' into 2.2.1-prep
2020-02-09 20:30:48 -05:00
