James R
7ff3fb6a36
Merge branch 'seenames-fix' into 'master'
...
Fix seenames not working without a SeenPlayer hook
See merge request STJr/SRB2!799
2020-02-18 21:53:28 -05:00
James R
f39785672d
Merge branch 'setrenderneeded-fix' into 'master'
...
Clear setrenderneeded after calling VID_CheckRenderer
See merge request STJr/SRB2!793
2020-02-18 21:53:14 -05:00
James R
1bc6f2cd91
Merge branch 'startup-file-not-found' into 'master'
...
Fix the issue !678 did, but just don't exit if the file was added twice
See merge request STJr/SRB2!753
2020-02-18 21:50:11 -05:00
Jaime Passos
e98e0c785a
Merge remote-tracking branch 'origin/master' into seenames-fix
2020-02-18 19:37:55 -03:00
SteelT
8d6d574fa5
Merge branch 'ftrim-tweak-2' into 'master'
...
M_Ftrim
See merge request STJr/SRB2!798
2020-02-18 17:24:05 -05:00
James R
f51772b29d
Fix M_Ftrim
...
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
2020-02-17 19:38:14 -08:00
Jaime Passos
304806d221
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03: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
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
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
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
1c48480944
Clear setrenderneeded after calling VID_CheckRenderer
2020-02-17 00:36:10 -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
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
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
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
