lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8407 commits 1 branch 29 tags 122 MiB
Commit graph

8407 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nev3r d2cbdd4fb1 Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now. 2019-12-11 11:10:31 +01:00
Nev3r 584348b91e Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead. 2019-12-11 10:13:52 +01:00
GoldenTails 07316fc5bd Stop characters from being able to activate their abilities when doing a shield ability! 
Fixes #61.
 2019-12-10 23:55:52 -06:00
Jaime Passos f51253a0a8 Tilted water 2019-12-10 17:01:19 -03:00
Nev3r ca6a7ffbb3 Fix NiGHTS bumpers height. 2019-12-10 18:53:49 +01:00
Steel Titanium 9ab00049dc appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Nev3r 8466dc5813 Move mobj spawn Z calculating to a separate function. 2019-12-10 18:03:15 +01:00
Nev3r 3dfa526eea Separate Emerald Hunt emerald spawning into another function. 2019-12-10 14:21:08 +01:00
Nev3r 6fe6db8e18 Removed seemingly redundant (and incorrect) mapthing Z load code. 
The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.
 2019-12-09 14:05:22 +01:00
Nev3r 8ea7dd418a Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function. 2019-12-09 13:26:31 +01:00
Jaime Passos 4d83db5bb2 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos 5c02bc59db Speed up level loading 
Don't flush every texture just because the palette MAY have changed
 2019-12-08 22:28:13 -03:00
Jaime Passos c6769e7220 Die 2019-12-08 22:12:56 -03:00
Jaime Passos 7f58002e12 Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos 25464c867a Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias 14ecb240c4 Merge branch 'public_next' into private 2019-12-08 12:56:37 -05:00
Alam Ed Arias e91a689478 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias 2d68eac528 Merge branch 'buildbot' into 'master' 
Fix All the buidlbot issues

See merge request STJr/SRB2!520
 2019-12-08 12:49:26 -05:00
Alam Ed Arias d8eccc2921 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias 1d0cd586ba P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias 623629b04a OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias 35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos d74f2a003b HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly 
(done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)
 2019-12-08 04:40:29 -03:00
Jaime Passos 4c808cb7e2 Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading 2019-12-08 04:32:25 -03:00
Jaime Passos d8a804febc LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos cc12496e9c Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos ce61b17117 Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos 964978a337 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos bc60a0a887 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos 40b862967d Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos e9e0683d5e Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
James R d5816d44f3 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00