03a3b02301
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
75a5142aad
Merge branch 'wipes2' into 'master'
...
Wipe styles cleanup
See merge request STJr/SRB2!525
2019-12-24 14:47:14 -05:00
f077413f31
Merge branch 'soc-srb2-fix' into 'master'
...
The "SRB2" directive, for warning if a SOC isn't compatible
See merge request STJr/SRB2!551
2019-12-24 14:44:55 -05:00
e0a20a733c
Merge branch 'gl_gifs' into 'master'
...
OpenGL GIF movie recording
See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
3f339384c8
Merge branch 'hwrtexfix' into 'master'
...
Fix model texture blending
See merge request STJr/SRB2!546
2019-12-24 14:44:19 -05:00
1df31f2e98
Merge branch 'soundtest-fix' into 'master'
...
Init MUSICDEFs regardless of music state
See merge request STJr/SRB2!532
2019-12-24 14:44:08 -05:00
be063c454a
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
9d28351b5c
I'm an idiot
2019-12-24 11:14:21 -08:00
9defd997c3
Merge branch 'fixsignalhandler' into 'master'
...
Handle signals correctly on linux
See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
1e13604007
Merge branch 'flats-in-walls' into 'master'
...
Flats in walls
See merge request STJr/SRB2!548
2019-12-22 17:44:50 -05:00
2ed5617c5f
Merge branch 'better-deadzone' into 'master'
...
Better Deadzones
See merge request STJr/SRB2!541
2019-12-20 17:33:29 -05:00
c50fe1874d
Merge branch 'random-port' into 'master'
...
Choose a random port as a client
See merge request STJr/SRB2!554
2019-12-20 17:33:12 -05:00
4e349cbd0f
Remove W_UnlockCachedPatch calls to avoid crashing
2019-12-19 17:14:56 -03:00
77747c66df
Fix switching to software
...
Would show a black screen for me on Linux. My suspsicion is that
some things are not initialized with just VID_CheckRenderer.
2019-12-19 17:13:23 -03:00
5c8604aeb7
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-19 17:09:47 -03:00
1771c7c8ce
Revert "Travis yflip error"
...
This reverts commit 2a9a2c0f02
2019-12-19 10:25:54 -05:00
a66fd274a1
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
2019-12-19 10:24:04 -05:00
843d9b9f0a
-clientport (it's back!) and -serverport, which is an alias to -port
...
If you ever need to, you can change the client port number.
2019-12-18 15:47:47 -08:00
4e32101289
Use a pointer for port_name
...
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
2019-12-18 15:43:29 -08:00
f584b61c93
Use a random port when connecting
2019-12-18 15:34:55 -08:00
1b81232d32
sike
2019-12-18 11:47:26 -03:00
d1b944121a
Fix "SRB2" SOC directive, though its usefulness is debatable
2019-12-17 14:11:45 -08:00
79daafd893
Fix missing "-" prefix on "-software" cmdline parm
2019-12-17 18:04:05 -03:00
53885e5ac0
Free PU_HWRMODELTEXTURE tag
2019-12-17 16:28:32 -03:00
e359f802fd
Update comments
2019-12-17 16:14:26 -03:00
cc54163210
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
a0971d0756
Put loadgame patch loading back in M_ReadSaveStrings
2019-12-17 15:56:56 -03:00
c3f0e6aa44
Avoid recreating the color LUT mid-recording-frame
2019-12-17 15:37:43 -03:00
0af71fafc5
Don't use the local palette, because OpenGL mixes it into the textures themselves
2019-12-17 15:20:22 -03:00
3d08664de4
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-17 15:14:22 -03:00
141d0376a5
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-17 15:05:16 -03:00
7e55dd31f5
fix menu spacing
2019-12-17 12:53:26 -03:00
369563ad92
allow models to change colors more than once.
2019-12-17 12:50:41 -03:00
53c7df4818
Merge branch 'map-command-no-mapheaderinfo' into 'master'
...
Let the map command warp to maps without a level header
See merge request STJr/SRB2!528
2019-12-15 16:59:03 -05:00
adc87640d9
Merge branch 'cmake-fixes' into 'master'
...
Various cmake adjustments
See merge request STJr/SRB2!538
2019-12-15 16:58:45 -05:00
00e2c420f6
Merge branch 'dont-be-mean-to-tails-plz' into 'master'
...
Don't be mean to Tails plz (Pandora's Box Super cheat fix)
See merge request STJr/SRB2!540
2019-12-15 16:58:24 -05:00
a093c76cfb
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone
2019-12-15 15:47:45 +00:00
eb179e4d6a
Remove anti-Tails restriction for the Allow super Pandora's Box cheat.
...
Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!
2019-12-15 15:40:56 +00:00
76d59330f7
Port the deadzone cvar stuff from kart.
...
Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
b17bf5d836
Use Scaled Radial Deadzones, instead of Axial deadzones.
...
Additionally fixes some weird padscale 0 stuff that was flipped.
This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
d63ad82dc5
[cmake] Remove srb2dd target
2019-12-15 00:47:58 -06:00
11f5911943
[cmake] Use same executable names as Makefile
2019-12-15 00:39:04 -06:00
4daf9666a2
Merge branch 'ripple2' into 'master'
...
Tilted ripple
See merge request STJr/SRB2!524
2019-12-14 17:52:54 -05:00
4d87bcca13
Move position of R_PlaneRipple in the file so this looks more organised
2019-12-14 19:50:40 -03:00
871ebef332
Merge remote-tracking branch 'origin/master' into ripple2
2019-12-14 19:36:54 -03:00
14674223e8
Merge branch 'opengl-is-a-bad-renderer' into 'master'
...
OpenGL fixes
See merge request STJr/SRB2!519
2019-12-14 16:48:50 -05:00
64eb89fc56
Merge branch 'portalcullsector' into 'master'
...
Restore portal culling code that went gone by pure accident
See merge request STJr/SRB2!523
2019-12-14 16:47:51 -05:00
e5714db75c
Merge branch 'software-drawers-refactor' into 'master'
...
Optimize Software drawers
See merge request STJr/SRB2!533
2019-12-14 16:47:27 -05:00
c1d54007e4
Fix C90 error from NOHW
2019-12-14 13:30:10 -08:00
2a22adaa60
Oops C90
2019-12-14 12:55:11 -08:00
Jaime Passos