stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-04 02:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
8355 commits 174 branches 41 tags 203 MiB
Commit graph

8355 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
14f4fa2e9c Merge branch 'tatsuru-amyhugfix' into 'next' 
Make Amy only hug players at the same Z height

See merge request STJr/SRB2!521
 2019-12-13 01:58:32 -05:00
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
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
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
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
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