James R
|
4da57653eb
|
Merge branch 'spawn_z_refactor' into 'next'
(UDMF prereq.) Spawn Z refactor
See merge request STJr/SRB2!536
|
2019-12-16 23:21:07 -05:00 |
|
James R
|
4f33476fc0
|
Merge branch 'fix-sector-lines' into 'next'
Fix sector.lines in Lua
See merge request STJr/SRB2!542
|
2019-12-16 23:05:52 -05:00 |
|
Steel Titanium
|
0e371774c8
|
Fix crash on mapload when removing Dragonbomber with Lua
|
2019-12-16 21:25:41 -05:00 |
|
Tatsuru
|
0ab31b3de0
|
Let Lua toggle Match/CTF team scores HUD element
|
2019-12-16 17:58:00 -03:00 |
|
Monster Iestyn
|
46f431616c
|
Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean
|
2019-12-16 20:26:19 +00:00 |
|
Monster Iestyn
|
f028bb0219
|
Fix numoflines calculations in sectorlines_* functions by first typecasting seclines (the sector.lines address) to size_t before doing any math on it, then (after the math) typecast the result to size_t * and dereference it.
And yes, this time I tested it to make sure it works :)
|
2019-12-16 17:46:27 +00:00 |
|
Monster Iestyn
|
130794cc4d
|
Merge branch 'master' into next
|
2019-12-16 15:41:47 +00:00 |
|
James R
|
53c7df4818
|
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
|
adc87640d9
|
Merge branch 'cmake-fixes' into 'master'
Various cmake adjustments
See merge request STJr/SRB2!538
|
2019-12-15 16:58:45 -05:00 |
|
MascaraSnake
|
230006553d
|
Set mapthing z in OP_CreateNewMapThing
|
2019-12-15 21:43:50 +01:00 |
|
Monster Iestyn
|
eb179e4d6a
|
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 |
|
GoldenTails
|
23b3f5a649
|
Fix a divide by zero crash when mindash and maxdash were the same.
Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.
|
2019-12-15 04:09:56 -06:00 |
|
MascaraSnake
|
8a6e244e60
|
SpawnEmeraldHunt() -> P_SpawnEmeraldHunt()
|
2019-12-15 09:49:54 +01:00 |
|
Eidolon
|
d63ad82dc5
|
[cmake] Remove srb2dd target
|
2019-12-15 00:47:58 -06:00 |
|
Eidolon
|
11f5911943
|
[cmake] Use same executable names as Makefile
|
2019-12-15 00:39:04 -06:00 |
|
James R
|
1123b5debd
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-14 15:28:25 -08:00 |
|
MascaraSnake
|
bcfd9fe504
|
Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?
|
2019-12-15 00:22:17 +01:00 |
|
Jaime Passos
|
4d87bcca13
|
Move position of R_PlaneRipple in the file so this looks more organised
|
2019-12-14 19:50:40 -03:00 |
|
Jaime Passos
|
871ebef332
|
Merge remote-tracking branch 'origin/master' into ripple2
|
2019-12-14 19:36:54 -03:00 |
|
James R
|
14674223e8
|
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
|
b121bc2b3b
|
Merge branch 'fix-shield-hover' into 'next'
Stop characters from being able to activate their abilities when doing a shield ability!
See merge request STJr/SRB2!522
|
2019-12-14 16:48:12 -05:00 |
|
James R
|
64eb89fc56
|
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
|
e5714db75c
|
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
|
65a17a8f09
|
Merge branch 'customexitvars-rework' into 'next'
Rework G_SetCustomExitVars to allow skipstats 2
See merge request STJr/SRB2!534
|
2019-12-14 16:47:18 -05:00 |
|
Steel Titanium
|
b3d678a252
|
Merge branch 'master' into next
|
2019-12-14 16:44:56 -05:00 |
|
James R
|
c1d54007e4
|
Fix C90 error from NOHW
|
2019-12-14 13:30:10 -08:00 |
|
James R
|
2a22adaa60
|
Oops C90
|
2019-12-14 12:55:11 -08:00 |
|
Jaime Passos
|
4c13190b48
|
Merge remote-tracking branch 'origin/master' into software-drawers-refactor
|
2019-12-13 19:22:47 -03:00 |
|
Jaime Passos
|
7f092b884b
|
Initialise the variable, obviously
|
2019-12-13 19:04:36 -03:00 |
|
Jaime Passos
|
a27a225a81
|
Remove SPANDRAWFUNC_MMX, as it's not needed anymore.
|
2019-12-13 19:02:36 -03:00 |
|
Steel Titanium
|
ad776e560c
|
Rework G_SetCustomExitVars to allow skipstats 2
|
2019-12-13 16:36:33 -05:00 |
|
Jaime Passos
|
6720279969
|
Separate non-powers-of-two draw routines into its own file
|
2019-12-13 13:11:56 -03:00 |
|
Jaime Passos
|
fa58c1fb26
|
stuff
|
2019-12-13 12:26:47 -03: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
|
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 |
|
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
|
e91a689478
|
Merge branch 'master' into opengl-is-a-bad-renderer
|
2019-12-08 12:50:45 -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 |
|
James R
|
cadaecbfcf
|
memset this or the stupid masterserver (used to) show garbage bytes
Also for security I guess...
|
2019-12-07 15:47:18 -08:00 |
|
Jaime Passos
|
69c08f93bb
|
Update d_main.c
|
2019-12-07 11:55:53 -03:00 |
|
MascaraSnake
|
79b04c5872
|
One more asset hash change
|
2019-12-07 14:17:26 +01:00 |
|
toaster
|
0bd1399c52
|
Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.
|
2019-12-07 10:22:10 +00:00 |
|