Jaime Passos
|
93acc4254c
|
Fix R_CacheRotSprite not working with PNG lumps
|
2020-02-17 22:59:36 -03:00 |
|
James R
|
b9c2cab265
|
Don't let console open with menu keys while the menu is open
|
2020-02-17 17:10:29 -08:00 |
|
James R
|
c77e444df9
|
Draw console in the Record/NiGHTS Attack menus
(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
|
2020-02-17 16:37:29 -08:00 |
|
James R
|
2d98b3f9eb
|
Revert "Revert "Let the console open in menus""
This reverts commit 73368b0c9a.
|
2020-02-17 16:37:13 -08: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
|
e664a44f0b
|
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
|
d1aa45212d
|
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
|
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
|
256c9a20db
|
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
|
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
|
c4003109b9
|
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
|
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 |
|
James R
|
b20750f88c
|
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
|
5c050e785b
|
move hw texture used to be always below.
|
2020-02-17 01:20:00 -03:00 |
|
Sally Cochenour
|
07d355e4d3
|
FIX COLOR BUG
|
2020-02-17 01:19:28 -03: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 |
|
Steel Titanium
|
299d8b2772
|
Merge branch 'next' into the-colors-feel-so-right
|
2020-02-16 22:56:27 -05:00 |
|
Jaime Passos
|
2a0495f11b
|
Merge remote-tracking branch 'origin/next' into fix-overtime
|
2020-02-17 00:48:42 -03:00 |
|
Jaime Passos
|
1c48480944
|
Clear setrenderneeded after calling VID_CheckRenderer
|
2020-02-17 00:36:10 -03:00 |
|
fickleheart
|
598f66a997
|
Let scripters see if player just launched from slope
|
2020-02-16 21:34:07 -06:00 |
|
fickleheart
|
51ef6b3684
|
Merge remote-tracking branch 'upstream/master' into viewroll
|
2020-02-16 21:32:57 -06:00 |
|
fickleheart
|
e17467ad22
|
Allow SHOWTITLECARDFOR = NONE
|
2020-02-16 21:32:40 -06:00 |
|
fickleheart
|
427e99f222
|
Merge remote-tracking branch 'upstream/master' into titlecard-options
|
2020-02-16 21:32:27 -06: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 |
|
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 |
|