Jaime Passos
07afd7520f
Only initialise OpenGL if you actually intend to use it.
2020-02-17 01:12:53 -03:00
Jaime Passos
6c5db5f462
Missing comment
2020-02-17 01:08:55 -03:00
Jaime Passos
cca3665525
Fallback to Software if the renderer version doesn't match
2020-02-17 01:08:41 -03:00
Jaime Passos
b6089ccdaf
Fix -OGLlib
2020-02-17 01:08:15 -03: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
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
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
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
MascaraSnake
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
James R
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
James R
841094976b
Add flag name variant of SF_NONIGHTSROTATION to S_SKIN
2020-02-12 18:02:36 -08:00
colette
d3e5cbffba
comment
2020-02-12 08:54:20 -05:00
fickleheart
b7a6773ff5
Don't error when checking patch.valid on invalid patches
2020-02-11 23:25:01 -06:00
Jaime Passos
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
James R
ae2041d686
Remove extra tokens if we got all 7 emeroods
2020-02-11 19:36:09 -08:00
Steel Titanium
c44442ef7c
Merge remote-tracking branch 'public/next' into public_next
2020-02-11 20:43:26 -05:00
James R
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
GoldenTails
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
MascaraSnake
cb7a77fe2a
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 23:38:31 +01:00
MascaraSnake
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
MascaraSnake
4d5e14a847
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 22:27:50 +01:00
MascaraSnake
9498c5ba8e
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
d9a78c502c
Merge branch 'defuse-minecarts' into 'next'
...
Defuse minecarts
See merge request STJr/SRB2!776
2020-02-11 13:22:10 -05:00
lachwright
aeab33ee03
Defuse minecarts
2020-02-12 01:41:11 +08:00
lachwright
248a80cac4
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
c417ffae4c
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
MascaraSnake
be67719a2a
Merge remote-tracking branch 'Public/2.2.1-prep' into public_next
2020-02-10 22:47:22 +01:00
MascaraSnake
8618589acc
Merge remote-tracking branch 'Public/next' into public_next
2020-02-10 22:44:15 +01:00
fickleheart
a63e9fe002
Improvements to polyobjects carrying things:
...
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
actual problem :]
2020-02-10 00:07:25 -06:00
Steel Titanium
4281de3b89
Update file hashes
2020-02-09 21:29:46 -05:00
Steel Titanium
13e5911de7
Merge branch 'next' into 2.2.1-prep
2020-02-09 20:30:48 -05:00
