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

730 commits

Author SHA1 Message Date
Nev3r 4d716cb170 Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway). 2020-12-01 19:44:58 +01:00
Nev3r c8ae28bbaf Follow GZDoom's convention for stringargs. 2020-12-01 18:35:24 +01:00
Jaime Ita Passos 2e21168395 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Jaime Ita Passos 0645c642d2 Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos 5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
James R d3199ac779 Fix one last instance of printing address diff 2020-11-14 16:18:54 -08:00
Nev3r 2c8a99f25a Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r 95a61a226b rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Nev3r fb9432ae57 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R bbd003976b Merge branch 'write-thingies' into 'next' 
The lump is not needed for P_WriteThings

See merge request STJr/SRB2!1231
 2020-11-08 20:35:51 -05:00
LJ Sonic 9b151ca45c Merge branch 'resend-gamestate' into 'next' 
Resend gamestate when resynching

See merge request STJr/SRB2!829
 2020-11-07 13:14:32 -05:00
James R 37931fc253 The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Monster Iestyn 5241b83f97 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Nev3r c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Louis-Antoine 804ad44e89 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00
Louis-Antoine 50d2c95470 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate 2020-10-24 16:21:44 +02:00
Jaime Passos 70ada935ec Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures. 
Probably fixes a random annoying crash around that function.
(I was also suspecting renderer switching was doing other slightly weird stuff.)
 2020-10-15 14:31:16 -03:00
sphere a2ff89f007 Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
Jaime Passos cc97e22e2f Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
Jaime Passos 6e5f71dd45 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
sphere f210316d8a Only set MV_MP in multiplayer or a netgame. 2020-10-06 19:06:06 +02:00
sphere 48ca58f580 Don't count demo playback as visiting a level. 2020-10-06 16:49:53 +02:00
SteelT a033f482be Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
Jaime Passos dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Jaime Passos 92c4993d67 Introduce Doom patch format into picture formats 
Fixes sprite rotation
 2020-08-15 21:52:01 -03:00
Jaime Passos 9b426b474c Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Jaime Passos 8863e13fde Rename R_CheckIfPatch 2020-08-15 20:14:36 -03:00
Nev3r b15c760dc2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
Jaime Passos 78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
Louis-Antoine 9dd5c11322 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
 2020-08-13 13:53:10 +02:00
James R a808294c0c Merge branch 'kill-cd-support' into 'next' 
Kill CD support

See merge request STJr/SRB2!1102
 2020-08-09 20:48:25 -04:00
James R 8394bf6055 Merge branch 'opengl-skydome-fixes' into 'next' 
Move the sky dome code out of r_opengl.c, fix issues with shaders

See merge request STJr/SRB2!1071
 2020-08-09 20:45:01 -04:00
Steel Titanium dff0e87e03 Kill CD support 2020-08-07 17:06:19 -04:00
Nev3r c65ada7dd7 Merge branch 'next' into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
 2020-07-29 13:55:14 +02:00
Nev3r 6dfe236602 Merge branch 'udmf-next' into 'next' 
Merge udmf-next into next

See merge request STJr/SRB2!1075
 2020-07-28 14:03:59 -04:00
Jaime Passos ca060a4372 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
Steel Titanium 05ac0fc7ea Fix muspostbossname sometimes returning garbage. 2020-07-19 13:47:33 -04:00
Jaime Passos 48a6652973 Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
toaster 0a625d3e19 Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from. 2020-07-12 19:00:58 +01:00
Nev3r 9f06903d72 What the fuck was I thinking? 
Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.
 2020-07-11 11:01:05 +02:00
Nev3r ad55f5f872 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
Nev3r 710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Jaime Passos 7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Nev3r fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos 4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
LJ Sonic 17616967d3 Merge branch 'levelflat_name' into 'next' 
Use levelflat->name instead of flatname

See merge request STJr/SRB2!1024
 2020-07-04 08:46:04 -04:00
SteelT 186335c2ac Merge branch 'na-char-replays' into 'next' 
Add support for saving/loading per-skin NiGHTS replays

See merge request STJr/SRB2!1025
 2020-07-03 14:51:05 -04:00
Nev3r ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
Steel Titanium 3f3ff0688b Add support for saving/loading per-skin NiGHTS replays 2020-06-28 16:59:36 -04:00