MascaraSnake
ffb8928141
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
James R
d6251a763b
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
88809684ef
Merge branch 'extra-emblem-display' into 'next'
...
Extra emblem hint display
See merge request STJr/SRB2!721
2020-02-17 00:00:36 -05:00
James R
2b71af5127
Merge branch 'stoppedclock-exposed' into 'next'
...
Expose stoppedclock to Lua
See merge request STJr/SRB2!771
2020-02-16 23:55:33 -05:00
James R
9117060cee
Merge branch 'lua-hud-get-rotsprites' into 'next'
...
Get rotated sprites with v.getSprite(2)Patch
See merge request STJr/SRB2!773
2020-02-16 23:51:49 -05:00
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
Jaime Passos
2a0495f11b
Merge remote-tracking branch 'origin/next' into fix-overtime
2020-02-17 00:48:42 -03:00
fickleheart
51ef6b3684
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
Steel Titanium
c234d8765d
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 20:41:17 -05:00
James R
39a0e8b3e1
Merge remote-tracking branch 'origin/master' into next
2020-02-16 17:35:59 -08: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
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
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
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
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
9769748f99
R_GetLinedefTransTable: Calculate the transtable arithmetically instead of doing an if-else cascade
2020-02-11 19:18:31 +01: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
MascaraSnake
f4a7a5db11
Some fixes for the linedef alpha field
2020-02-10 20:26:29 +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
