Commit graph

8320 commits

Author SHA1 Message Date
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
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
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
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
Jaime Passos
4f0bf05a7f Merge remote-tracking branch 'origin/master' into software-drawers-refactor 2019-12-13 19:22:47 -03:00
Jaime Passos
b776352e8e Initialise the variable, obviously 2019-12-13 19:04:36 -03:00
Jaime Passos
ea52225869 Remove SPANDRAWFUNC_MMX, as it's not needed anymore. 2019-12-13 19:02:36 -03:00
Jaime Passos
b47cc01f50 Separate non-powers-of-two draw routines into its own file 2019-12-13 13:11:56 -03:00
Jaime Passos
9a5876f9d3 stuff 2019-12-13 12:26:47 -03:00
James R
1e1597cafd Merge branch 'dashmode-shader' into 'master'
Add TC_DASHMODE color shader

See merge request STJr/SRB2!526
2019-12-13 01:58:18 -05:00
James R
abe4568d4e Merge branch 'toomanyflats-fix' into 'master'
Fix Ploadflat closing the game with "Too many flats in level" error message

See merge request STJr/SRB2!529
2019-12-13 01:57:55 -05:00
Jaime Passos
efba75ae01 Update v_video.c 2019-12-12 23:30:09 -03:00
Jaime Passos
00521d865a FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
Jaime Passos
748f08ef3c HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos
aa10c6c733 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
Jaime Passos
27873ff7bc Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos
7a753b701f Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos
3f0cc9a211 Update hw_main.c 2019-12-12 21:52:59 -03:00
Jaime Passos
749dc9b37b Add missing prototype, ugh 2019-12-12 21:43:19 -03:00
Jaime Passos
9e55402932 grafik designe is m passion 2019-12-12 21:41:13 -03:00
Jaime Passos
1bf3c14c16 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos
9560d43063 Texture blending port
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
2019-12-12 21:22:36 -03:00
Jaime Passos
529e5fdc52 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
James R
ae73e8f4e0 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Jaime Passos
33c73b5648 Fix gr_anisotropicmode 2019-12-12 18:28:05 -03:00
Jaime Passos
22dc9b5de8 Make gr_spritebillboarding on by default sorry not sorry Azeon 2019-12-12 17:48:43 -03:00
Jaime Passos
b376fd0d1f Model lighting 2019-12-12 17:48:29 -03:00
Jaime Passos
209361ef1b Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer 2019-12-12 17:39:18 -03:00
Jaime Passos
fcb738bc27 Save filtering mode and anisotropic mode cvars to config 2019-12-12 17:37:55 -03:00
Jaime Passos
a8f2318ea5 Remove HWR_AddEngineCommands 2019-12-12 17:35:41 -03:00
Jaime Passos
b093a38ecd Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!! 2019-12-12 17:30:19 -03:00
Jaime Passos
7f6099e186 Don't reset the FOV 2019-12-12 17:06:04 -03:00
Jaime Passos
ba64007e80 Remove unused cvars 2019-12-12 16:53:31 -03:00
Jaime Passos
9a93017a7b Add HWD_SET_MODEL_LIGHTING state 2019-12-12 16:48:37 -03:00
Jaime Passos
51c7074247 Fix Ploadflat closing the game with "Too many flats in level" error message 2019-12-11 22:45:47 -03:00
James R
d46bd4e8f1 Merge remote-tracking branch 'dev-origin/master' 2019-12-11 16:21:18 -08:00
James R
112ac631ef Merge branch 'garbage' into 'master'
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
2019-12-11 19:19:29 -05:00
James R
66524a1e3f Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
lachwright
fa52f69c21 Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00