James R
|
d0b9027d0a
|
Merge branch 'viewroll' into 'next'
Rolling
See merge request STJr/SRB2!690
|
2020-02-17 00:10:57 -05:00 |
|
James R
|
9bd9e667c5
|
Merge branch 'push-special-params' into 'master'
"+" command line parameters make sense
See merge request STJr/SRB2!707
|
2020-02-17 00:05:49 -05:00 |
|
James R
|
3ea51c943a
|
Merge branch 'trim-floats' into 'master'
Trim the trailing zeros off floats for cvars
See merge request STJr/SRB2!716
|
2020-02-17 00:04:15 -05:00 |
|
James R
|
8e4cb953c8
|
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
|
132e8f82d5
|
Merge branch 'local-color-table' into 'master'
Local Color Table for GIF movie mode
See merge request STJr/SRB2!742
|
2020-02-16 23:58:11 -05:00 |
|
James R
|
af14166730
|
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
|
7ed7e53c81
|
Merge branch 'tolfix' into 'master'
Don't freeslot TOL_ twice
See merge request STJr/SRB2!779
|
2020-02-16 23:52:45 -05:00 |
|
James R
|
11a1ce6df9
|
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
|
f4c2a4551b
|
How many bruh moments can we have?
|
2020-02-16 20:45:09 -08:00 |
|
James R
|
fb66691991
|
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
|
94aec0101f
|
Merge branch 'grfang' into 'master'
Allow models for skin/sprites with same name
See merge request STJr/SRB2!767
|
2020-02-16 23:21:07 -05:00 |
|
Jaime Passos
|
067a2667e3
|
move hw texture used to be always below.
|
2020-02-17 01:20:00 -03:00 |
|
Sally Cochenour
|
07d71778dc
|
FIX COLOR BUG
|
2020-02-17 01:19:28 -03:00 |
|
James R
|
d4e80ddc8f
|
Merge branch 'fix-overtime' into 'next'
Fix overtime not working
See merge request STJr/SRB2!784
|
2020-02-16 23:15:01 -05:00 |
|
Steel Titanium
|
0299f21dc7
|
Merge branch 'next' into the-colors-feel-so-right
|
2020-02-16 22:56:27 -05:00 |
|
Jaime Passos
|
ae013108ab
|
Merge remote-tracking branch 'origin/next' into fix-overtime
|
2020-02-17 00:48:42 -03:00 |
|
Jaime Passos
|
9e83e2751d
|
Clear setrenderneeded after calling VID_CheckRenderer
|
2020-02-17 00:36:10 -03:00 |
|
fickleheart
|
0fbff66e25
|
Let scripters see if player just launched from slope
|
2020-02-16 21:34:07 -06:00 |
|
fickleheart
|
c4b390bc76
|
Merge remote-tracking branch 'upstream/master' into viewroll
|
2020-02-16 21:32:57 -06:00 |
|
fickleheart
|
ae53c146e6
|
Allow SHOWTITLECARDFOR = NONE
|
2020-02-16 21:32:40 -06:00 |
|
fickleheart
|
187bd9ab23
|
Merge remote-tracking branch 'upstream/master' into titlecard-options
|
2020-02-16 21:32:27 -06:00 |
|
Steel Titanium
|
7dac10f5f9
|
Merge branch 'master' into public_next
|
2020-02-16 21:00:08 -05:00 |
|
Steel Titanium
|
847b2bde13
|
Merge remote-tracking branch 'public/next' into public_next
|
2020-02-16 20:41:17 -05:00 |
|
James R
|
472d533d79
|
Merge remote-tracking branch 'origin/next' into public_next
|
2020-02-16 17:38:03 -08:00 |
|
James R
|
e245354c80
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-16 17:35:59 -08:00 |
|
James R
|
753829c826
|
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
|
705cf9fd40
|
Revert "Let the console open in menus"
This reverts commit ef3d462eb7.
|
2020-02-16 17:14:54 -08:00 |
|
Steel Titanium
|
773ed0a056
|
Update credit at Rob's request
|
2020-02-16 20:10:30 -05:00 |
|
SteelT
|
18601c2e86
|
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
|
728e01e60d
|
Merge branch 'public_next' into mobj-shadowscale-send
|
2020-02-16 18:55:44 -05:00 |
|
Steel Titanium
|
b44358df63
|
Update file hash yet again
|
2020-02-16 18:54:51 -05:00 |
|
Steel Titanium
|
cb97aafd05
|
Fix object shadow not appearing for mid-joiners
|
2020-02-16 18:45:49 -05:00 |
|
MascaraSnake
|
512c6f24a9
|
Clean up the mess that is extracolormap_t::fog
|
2020-02-16 20:19:24 +01:00 |
|
Steel Titanium
|
3a82864ce9
|
Update comment
|
2020-02-16 11:34:02 -05:00 |
|
Steel Titanium
|
13a521d808
|
Merge remote-tracking branch 'public/next' into public_next
|
2020-02-16 11:32:43 -05:00 |
|
LJ Sonic
|
b2168aba3b
|
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
|
45ab4244fc
|
Restore this that got shifted.
|
2020-02-15 17:55:25 -05:00 |
|
Louis-Antoine
|
7b13f0a2de
|
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
|
2b678aaef0
|
New Lua functions: R_GetColorByName and R_GetNameByColor
|
2020-02-15 17:35:00 -05:00 |
|
Steel Titanium
|
2b615aa09c
|
Add prefoppoistecolor support to save cards
|
2020-02-15 17:34:21 -05:00 |
|
Jaime Passos
|
5dc0f0649e
|
Fix overtime not working
|
2020-02-15 13:07:53 -03:00 |
|
Jaime Passos
|
a98e84faa0
|
change prefix to "PLAYER"
|
2020-02-15 12:40:41 -03:00 |
|
MascaraSnake
|
e7a0fc65bd
|
Update hashes (again)
|
2020-02-15 12:44:03 +01:00 |
|
MascaraSnake
|
9dd788a90c
|
Merge remote-tracking branch 'Public/next' into public_next
|
2020-02-15 12:32:39 +01:00 |
|
MascaraSnake
|
31bce6c857
|
Merge branch 'master' into next
|
2020-02-15 12:32:09 +01:00 |
|
MascaraSnake
|
63ffe561ae
|
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
|
b332aaa69f
|
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
|
7bb7cb61ea
|
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
|
869748dfbf
|
Merge remote-tracking branch 'Public/next' into public_next
|
2020-02-15 12:25:29 +01:00 |
|
MascaraSnake
|
9bf0cfda5c
|
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 |
|