1dc080e8cd
Merge remote-tracking branch 'origin/master' into rscache
2020-02-18 19:38:19 -03:00
802bd4040f
Merge branch 'ftrim-tweak-2' into 'master'
...
M_Ftrim
See merge request STJr/SRB2!798
2020-02-18 17:24:05 -05:00
e3ba369ae4
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
b3933c7842
Fix R_CacheRotSprite not working with PNG lumps
2020-02-17 22:59:36 -03:00
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
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
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
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
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
7dac10f5f9
Merge branch 'master' into public_next
2020-02-16 21:00:08 -05:00
847b2bde13
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 20:41:17 -05:00
472d533d79
Merge remote-tracking branch 'origin/next' into public_next
2020-02-16 17:38:03 -08:00
e245354c80
Merge remote-tracking branch 'origin/master' into next
2020-02-16 17:35:59 -08:00
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
705cf9fd40
Revert "Let the console open in menus"
...
This reverts commit ef3d462eb7
2020-02-16 17:14:54 -08:00
773ed0a056
Update credit at Rob's request
2020-02-16 20:10:30 -05:00
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
728e01e60d
Merge branch 'public_next' into mobj-shadowscale-send
2020-02-16 18:55:44 -05:00
b44358df63
Update file hash yet again
2020-02-16 18:54:51 -05:00
cb97aafd05
Fix object shadow not appearing for mid-joiners
2020-02-16 18:45:49 -05:00
3a82864ce9
Update comment
2020-02-16 11:34:02 -05:00
13a521d808
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 11:32:43 -05:00
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
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
a98e84faa0
change prefix to "PLAYER"
2020-02-15 12:40:41 -03:00
e7a0fc65bd
Update hashes (again)
2020-02-15 12:44:03 +01:00
9dd788a90c
Merge remote-tracking branch 'Public/next' into public_next
2020-02-15 12:32:39 +01:00
31bce6c857
Merge branch 'master' into next
2020-02-15 12:32:09 +01:00
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
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
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
869748dfbf
Merge remote-tracking branch 'Public/next' into public_next
2020-02-15 12:25:29 +01:00
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
fff638f46a
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
ba92db412a
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
841094976b
Add flag name variant of SF_NONIGHTSROTATION to S_SKIN
2020-02-12 18:02:36 -08:00
2fc7e56951
Cast Moment
2020-02-12 13:59:08 -03:00
7bc58c4c0e
Add MAXTOL
2020-02-12 13:41:30 -03:00
c827a72aab
Merge remote-tracking branch 'origin/next' into tolfix
2020-02-12 13:03:16 -03:00
d3e5cbffba
comment
2020-02-12 08:54:20 -05:00
b7a6773ff5
Don't error when checking patch.valid on invalid patches
2020-02-11 23:25:01 -06:00
d8793ce579
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
ae2041d686
Remove extra tokens if we got all 7 emeroods
2020-02-11 19:36:09 -08:00
6b8195dbc1
player model prefix
2020-02-11 23:54:39 -03:00
c44442ef7c
Merge remote-tracking branch 'public/next' into public_next
2020-02-11 20:43:26 -05:00
0993b71355
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
9f7bfd901b
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
cb7a77fe2a
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 23:38:31 +01:00
8c932e4a6d
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
4d5e14a847
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 22:27:50 +01:00
Jaime Passos