Commit graph

8434 commits

Author SHA1 Message Date
Alam Ed Arias
1f143ca9d6 use size_t to count the sprites 2019-12-27 13:20:58 -05:00
Jaime Passos
518714a51a Fix sprite rotation crashes. 2019-12-27 00:37:40 -03:00
Jaime Passos
b8e91a50a5 OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
252ac7516a Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch 2019-12-26 23:53:03 -03:00
Jaime Passos
543f80510b And the sound test 2019-12-26 23:52:42 -03:00
Jaime Passos
ed11e89fdc Same deal, but for the level platter and save select screen 2019-12-26 23:49:31 -03:00
James R
02104402ed Save the renderer 2019-12-26 18:44:02 -08:00
Jaime Passos
6de7b7eb99 Handle character select screen correctly after a renderer switch 2019-12-26 23:39:40 -03:00
Jaime Passos
a5ef201e3f PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R
d57083264e One more optimization 2019-12-26 18:23:01 -08:00
James R
bbed1a16ba e 2019-12-26 18:20:48 -08:00
James R
e3d08831f2 Make cv_renderer CV_NOLUA instead of hidden!!! 2019-12-26 18:15:52 -08:00
James R
4100e43a9d CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R
43dab49e74 A system to encode flags in the command buffer 2019-12-26 18:12:10 -08:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -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
Jaime Passos
c40cf626bf Remove W_UnlockCachedPatch calls to avoid crashing 2019-12-19 17:14:56 -03:00
James R
0b87dd3554 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
Jaime Passos
98f903b311 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-19 17:09:47 -03: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
81ed4b38fc Fix missing "-" prefix on "-software" cmdline parm 2019-12-17 18:04:05 -03:00
Jaime Passos
ed6d6e3bd7 Free PU_HWRMODELTEXTURE tag 2019-12-17 16:28:32 -03:00
Jaime Passos
11dc6801dc Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
26e67702bf Put loadgame patch loading back in M_ReadSaveStrings 2019-12-17 15:56:56 -03: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