Jaime Passos
c8f9896e2d
struct time
2019-12-26 16:25:04 -03:00
Jaime Passos
9b68e48923
Move all the thick/masked/splat stuff to the end of the file
2019-12-26 15:34:33 -03:00
Jaime Passos
08ab0664f5
ifdef this right so it works like before without the define
2019-12-26 15:27:16 -03:00
Jaime Passos
016cced4a1
R_CalculateSegDistance stuff...
2019-12-26 01:58:38 -03:00
Jaime Passos
f1eb51d247
Something in R_RenderSegLoop I thought looked off...
2019-12-26 00:55:34 -03:00
Jaime Passos
4652d6444a
Tame R_StoreWallRange
2019-12-26 00:07:04 -03:00
James R
27e251e7fc
Merge branch 'wipes2' into 'master'
...
Wipe styles cleanup
See merge request STJr/SRB2!525
2019-12-24 14:47:14 -05:00
James R
d5fdbfda6b
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
James R
cb9db74044
Merge branch 'gl_gifs' into 'master'
...
OpenGL GIF movie recording
See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
James R
d2239f5ea1
Merge branch 'hwrtexfix' into 'master'
...
Fix model texture blending
See merge request STJr/SRB2!546
2019-12-24 14:44:19 -05:00
James R
975f1e5f83
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
James R
469e5a7c9b
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
James R
699407dbb0
I'm an idiot
2019-12-24 11:14:21 -08:00
James R
7db16e230b
Merge branch 'fixsignalhandler' into 'master'
...
Handle signals correctly on linux
See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
MascaraSnake
387578832d
Merge branch 'flats-in-walls' into 'master'
...
Flats in walls
See merge request STJr/SRB2!548
2019-12-22 17:44:50 -05:00
James R
74bd973616
Merge branch 'better-deadzone' into 'master'
...
Better Deadzones
See merge request STJr/SRB2!541
2019-12-20 17:33:29 -05:00
James R
30322b338a
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
Alam Ed Arias
cdc0b9c846
Revert "Travis yflip error"
...
This reverts commit 3bf83ff717
2019-12-19 10:25:54 -05:00
Alam Ed Arias
37a264c30e
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
2019-12-19 10:24:04 -05:00
James R
17749b9e3e
-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
James R
5921e1a567
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
James R
8368449e6c
Use a random port when connecting
2019-12-18 15:34:55 -08:00
Jaime Passos
48852f5140
sike
2019-12-18 11:47:26 -03:00
James R
132dd278ca
Fix "SRB2" SOC directive, though its usefulness is debatable
2019-12-17 14:11:45 -08:00
Jaime Passos
a02ddd65f7
Avoid recreating the color LUT mid-recording-frame
2019-12-17 15:37:43 -03:00
Jaime Passos
e9c1898877
Don't use the local palette, because OpenGL mixes it into the textures themselves
2019-12-17 15:20:22 -03:00
Jaime Passos
db7242c240
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-17 15:14:22 -03:00
Jaime Passos
da81238610
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-17 15:05:16 -03:00
Jaime Passos
21ab966bee
fix menu spacing
2019-12-17 12:53:26 -03:00
Jaime Passos
c63c8041ab
allow models to change colors more than once.
2019-12-17 12:50:41 -03:00
James R
f2c27df524
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
James R
6aceb69137
Merge branch 'cmake-fixes' into 'master'
...
Various cmake adjustments
See merge request STJr/SRB2!538
2019-12-15 16:58:45 -05:00
James R
7f509c6570
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
Sryder
16489b7514
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone
2019-12-15 15:47:45 +00:00
Monster Iestyn
12a38331e8
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
Sryder
b4e8f71acb
Port the deadzone cvar stuff from kart.
...
Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
Sryder
a026bfd24c
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
Eidolon
35d262e853
[cmake] Remove srb2dd target
2019-12-15 00:47:58 -06:00
Eidolon
de12308eb8
[cmake] Use same executable names as Makefile
2019-12-15 00:39:04 -06:00
James R
9248a9b5e3
Merge branch 'ripple2' into 'master'
...
Tilted ripple
See merge request STJr/SRB2!524
2019-12-14 17:52:54 -05:00
Jaime Passos
ca3323d19b
Move position of R_PlaneRipple in the file so this looks more organised
2019-12-14 19:50:40 -03:00
Jaime Passos
96bfc1da8f
Merge remote-tracking branch 'origin/master' into ripple2
2019-12-14 19:36:54 -03:00
James R
bc939a2211
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
James R
91862da7cc
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
James R
ac35f96fba
Merge branch 'software-drawers-refactor' into 'master'
...
Optimize Software drawers
See merge request STJr/SRB2!533
2019-12-14 16:47:27 -05:00
James R
4be9f8eff7
Fix C90 error from NOHW
2019-12-14 13:30:10 -08:00
James R
e472dd5750
Oops C90
2019-12-14 12:55:11 -08:00
James R
cbf3c24297
Handle log file in parent properly
2019-12-13 16:51:49 -08:00
James R
ff73055b56
Add this back for Windoodoo because I'm an idiot
2019-12-13 15:04:31 -08:00
Jaime Passos
4f0bf05a7f
Merge remote-tracking branch 'origin/master' into software-drawers-refactor
2019-12-13 19:22:47 -03:00
