Jaime Ita Passos
0a4a988a33
Free GPU textures when adding a file
2020-11-22 18:23:35 -03:00
Jaime Ita Passos
82b11c224a
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
James R
01e232ac3b
Fix one last instance of printing address diff
2020-11-14 16:18:54 -08:00
Nev3r
003f46c18e
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
c22dbe1d2e
rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro.
2020-11-10 12:22:55 +01:00
Nev3r
f94d9825b4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
4f5d6f6197
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
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
LJ Sonic
ebfa4aafbc
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
8a616fb265
P_WriteThings: use map name in file name
2020-11-01 19:40:59 -08:00
James R
481c178a15
The lump is not needed for P_WriteThings
...
(cherry picked from commit 972b0c084e )
2020-11-01 19:37:54 -08:00
James R
972b0c084e
The lump is not needed for P_WriteThings
2020-11-01 19:31:10 -08:00
James R
8f68a21f2f
Fix many instances of G_BuildMapName
...
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
James R
a669724217
Kill alreadyExists, check for map replacement by going through the level headers and using W_CheckNumForMapPwad
2020-10-31 18:49:50 -07:00
James R
37c345c7eb
Map lump names can be anything, map number is dynamically allocated
2020-10-30 20:10:31 -07:00
Monster Iestyn
41d8bc8020
Fix seg->length and flength not being set at all for UDMF maps
2020-10-28 19:36:03 +00:00
Nev3r
df6a903592
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
fd3189a5f6
Fix music resetting after reloading the gamestate
2020-10-27 20:22:15 +01:00
Sally Coolatta
afbbfc9b1f
Fix cvars
...
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Louis-Antoine
ddec491b0b
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
b9c9660629
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
ab9c85f76a
Make record attack's quick retry more consistent.
2020-10-14 17:39:23 +02:00
Jaime Passos
b4b4738c94
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
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
sphere
a627c0b013
Only set MV_MP in multiplayer or a netgame.
2020-10-06 19:06:06 +02:00
sphere
be761714f6
Don't count demo playback as visiting a level.
2020-10-06 16:49:53 +02:00
Sally Coolatta
dc4acfca93
Use args[1] for Battle capsules speed
2020-09-27 06:36:40 -04:00
Sally Coolatta
a951521ebb
Use args for bot hints
2020-09-27 06:32:01 -04:00
Sally Coolatta
586bb71b4b
Move around the args
2020-09-27 05:58:36 -04:00
Sally Coolatta
728d4a9435
Fixes to Battle Mode capsules
2020-09-27 04:51:08 -04:00
Sally Coolatta
72672d68cf
UDMF support for waypoints
...
Changes:
- "waypoint ID" is now tag (previously angle)
- "next waypoint ID" is now angle (previously Z height)
- Z height is Z height
- Radius is controlled by args[0]
- "is finish line" is controlled by args[1]
- Waypoint parameters linedef, riser things, and anchor things will not do anything in UDMF mode
- Non-UDMF maps are unaffected
2020-09-27 03:58:41 -04:00
Sally Coolatta
c3e7e51d89
More proper method of setting mapobjectscale in non-UDMF maps
...
(I did the same change for UDMF too but it may be wrong; I don't have a test map for it though so I guess we'll see later)
2020-09-27 03:18:21 -04:00
Sally Coolatta
e1dcf80f8d
Fixed waypoints using bad Z height in non-UDMF maps
2020-09-27 02:48:03 -04:00
James R
3cad7398f0
Fix slope spawning; let polyobjects spawn again
...
Move P_SpawnMapThings before P_SpawnSpecialsThatRequireObjects.
Do not remove special from lines with ML_NETONLY or ML_NONET until after
slopes are spawned.
2020-09-25 13:35:56 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
0d573b514e
Stupid polyobjects require things to be spawned >:(
2020-09-24 15:10:07 -07:00
James R
388d56a5f8
Search FOF target sectors for slope anchors
...
Requires spawning fake floors before slopes, and therefore before things,
basically before everything. Hopefully nothing breaks!
2020-09-24 01:56:38 -07:00
toaster
87c10047a5
A bunch of serious heavy lifting to fix title cards and closely related.
...
* Fix the title card fade's one-frame invalid memory read.
* Disable a redundant gamestate-activated wipe, which A) horribly broke Encore wipes, B) made normal map transitions take longer than they should, and C) held on the one glitchy title card wipe frame to make the game look more broken than it was.
* Fix Encore wipes being broken by the merge.
* Disable (not remove; may want to use later) the :nick: patch draw attempts from the title card drawer.
* Re-add zonettl support to the title card drawer.
* Move the title card drawer in front of the fade (Looks better for if we showcase 2.2 merge footage before creating a better title card).
2020-09-22 18:27:47 +01:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
98c6b54994
Improved memory management for patches
2020-09-07 02:23:07 -03:00
Sally Coolatta
54c487feff
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
James R
3f8edd38a5
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
Sally Coolatta
3b8066a28e
Merge branch 'next' into discord-rpc-support
2020-08-23 05:32:32 -04:00
FlykeSpice
2d9ec1687c
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00