Commit graph

8489 commits

Author SHA1 Message Date
James R c415d80e19 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 d64a7defed 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 b0ffe7ed70 Update v_video.c 2019-12-12 23:30:09 -03:00
Jaime Passos 4e814cd424 FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
Jaime Passos 228b29e23b HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos ca83bafae8 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
Jaime Passos a138a3ab5f Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos 08794559f0 Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos 01399c7076 Update hw_main.c 2019-12-12 21:52:59 -03:00
Jaime Passos ff348fb60a Add missing prototype, ugh 2019-12-12 21:43:19 -03:00
Jaime Passos af3cf93683 grafik designe is m passion 2019-12-12 21:41:13 -03:00
Jaime Passos d80bfb4e94 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos 08d4a36f63 Texture blending port
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
2019-12-12 21:22:36 -03:00
Jaime Passos 6c3111d809 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
James R 55f3f27b55 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Jaime Passos 3bebfb279e Fix gr_anisotropicmode 2019-12-12 18:28:05 -03:00
Jaime Passos 58a08504c8 Make gr_spritebillboarding on by default sorry not sorry Azeon 2019-12-12 17:48:43 -03:00
Jaime Passos a4b0195430 Model lighting 2019-12-12 17:48:29 -03:00
Jaime Passos 9246526e8a Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer 2019-12-12 17:39:18 -03:00
Jaime Passos f077d17301 Save filtering mode and anisotropic mode cvars to config 2019-12-12 17:37:55 -03:00
Jaime Passos db61d1a705 Remove HWR_AddEngineCommands 2019-12-12 17:35:41 -03:00
Jaime Passos bf520b9e33 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 b7c7529e75 Don't reset the FOV 2019-12-12 17:06:04 -03:00
Jaime Passos 08e3caf9bb Remove unused cvars 2019-12-12 16:53:31 -03:00
Jaime Passos 792750ee48 Add HWD_SET_MODEL_LIGHTING state 2019-12-12 16:48:37 -03:00
Nev3r c5d8fe4752 Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection. 2019-12-12 15:04:48 +01:00
Nev3r c64a9d7ae9 Stop things from becoming Chocapic in THZ3, ACZ2, and special stages.
Temporarily revert function call order for mapthings.
2019-12-12 11:37:48 +01:00
Nev3r ec9f727e53 Move map data load procedure to separate functions. 2019-12-12 11:16:55 +01:00
Nev3r 43cbad200c Move loading functions around a bit and refactor the stage data allocation code. 2019-12-12 10:35:38 +01:00
Jaime Passos ea129f701c Fix Ploadflat closing the game with "Too many flats in level" error message 2019-12-11 22:45:47 -03:00
Tatsuru d40359ee02 Hugging now requires being in the same Z position
Don't try this at home
2019-12-11 19:13:22 -06:00
Jaime Passos e01eb19044 Sad! 2019-12-11 22:11:00 -03:00
Jaime Passos 0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
James R 6bd5246edd Merge remote-tracking branch 'dev-origin/master' 2019-12-11 16:21:18 -08:00
James R 7a59ade63d Merge branch 'garbage' into 'master'
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
2019-12-11 19:19:29 -05:00
James R 6464df9876 Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
lachwright 8a70759e0a Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Nev3r edfe053cc3 Treat warnings as errors; comment out unused function. 2019-12-11 16:37:41 +01:00
Jaime Passos be13f463f0 Update r_plane.c 2019-12-11 12:36:54 -03:00
Nev3r d34fd4b755 Epic oversight in upside-down spawn offset. 2019-12-11 15:48:44 +01:00
Jaime Passos dedd5527da Restore portal culling code that went gone by pure accident 2019-12-11 11:35:34 -03:00
Nev3r 222336ac0b Oversight, do not free the data yet vres_Free() does it already at the end. 2019-12-11 15:16:56 +01:00
Nev3r 4d3ec6db41 Merge branch 'virtres' of https://git.magicalgirl.moe/STJr/SRB2/ into virtres
# Conflicts:
#	src/p_setup.c
2019-12-11 14:44:42 +01:00
Nev3r a87a9e6ff6 Remove wrappers and dupes for map lump reading, as they are no longer used. 2019-12-11 14:40:31 +01:00
Nev3r 9952bae5ee P_MakeMapMD5() now uses virtres. 2019-12-11 14:20:08 +01:00
Nev3r 14ad3b938e Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question. 2019-12-11 14:04:09 +01:00
Nev3r 4d86dc11a6 'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter. 2019-12-11 13:54:15 +01:00
Nev3r bf5a2c68d5 P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 13:22:07 +01:00
Nev3r f7c69f0c1c P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 12:48:41 +01:00
Nev3r 854d50f479 Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears. 2019-12-11 11:44:46 +01:00