Monster Iestyn
df95e2175f
Merge branch 'master' into hardcoding-time-again
2018-02-13 21:21:30 +00:00
Monster Iestyn
e98a11afd0
Merge branch 'file-loading-cleanup' into 'master'
...
File loading cleanup
See merge request STJr/SRB2Internal!129
2018-02-13 16:18:55 -05:00
Monster Iestyn
49b8fd6d67
Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps
2018-02-13 21:12:42 +00:00
Monster Iestyn
8556a05668
Fix SOC/Lua loading messages to display full names or even display at all (for PK3s at least), and otherwise some cleanup of existing code for the messages.
...
Also, I moved lua_lumploading on/offing to LUA_LoadFile.
2018-02-09 22:43:08 +00:00
Monster Iestyn
f12530a39f
Merge branch 'master' into hardcoding-time-again
2018-02-08 20:33:17 +00:00
Monster Iestyn
b533d36143
Merge branch 'master' into file-loading-cleanup
2018-02-08 20:32:59 +00:00
Monster Iestyn
b1695de124
Merge branch 'public_next'
2018-02-08 20:31:53 +00:00
Monster Iestyn
c42c70cb34
Merge branch 'playdemo-custom-home-fix' into 'next'
...
Fix for "playdemo" not working with custom home paths
See merge request STJr/SRB2!221
2018-02-08 15:29:39 -05:00
Monster Iestyn
b898dc397d
Merge branch 'lua-archive-crash-hotfixes' into 'next'
...
Hotfix for "LUA PANIC" crash when joining a netgame
See merge request STJr/SRB2!222
2018-02-08 15:29:20 -05:00
Monster Iestyn
fbceca1312
Merge branch 'general-sky-fixes' into 'master'
...
General sky fixes
See merge request STJr/SRB2Internal!132
2018-02-08 13:41:57 -05:00
Monster Iestyn
fbd4ce1d47
optimised R_ExpandPlane too
2018-02-07 18:11:32 +00:00
Monster Iestyn
efe9204f78
Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this)
...
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
2018-02-07 17:46:01 +00:00
Monster Iestyn
493af49a00
Correct backwards skies for OpenGL too
2018-02-03 21:39:36 +00:00
Monster Iestyn
33a538383f
Added proper support for upside-down thok barriers, in both renderers
...
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
2018-02-03 19:48:18 +00:00
Monster Iestyn
0dc867c05e
Cleanup of the code I've tweaked for skies, added SLOPEPARAMS macro to R_StoreWallRange for use in getting seg end z positions
2018-02-03 18:30:49 +00:00
Monster Iestyn
ecf2eed37f
Pushing all my work to make OpenGL consistent with my changes to software's sky so far
2018-02-01 22:04:04 +00:00
Monster Iestyn
9e4c985d70
some cleanup of software's seg rendering code, moved Red's polyobject plane hack to R_StoreWallRange since it doesn't actually need to be done every column draw
...
(I suspect polyobject planes don't actually need the minx/maxx hacks anymore, but I haven't the time to test that tonight nor is this branch really suited for it anyway)
2018-01-29 22:05:04 +00:00
Monster Iestyn
7d150485c9
More sky fixes for software:
...
* Thok barriers with slopes now render fine in software
* The solid "sky walls" between different-height thok barriers adjacent to each other are gone. Forever.
2018-01-28 22:08:58 +00:00
Monster Iestyn
5c70d6e6ca
Fix skies in software being displayed backwards
...
(I'll get round to OpenGL later)
2018-01-27 19:29:41 +00:00
Monster Iestyn
f6c740840a
Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane
...
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way
I also updated or added comments to some places of the sky drawing code and related where useful
2018-01-27 19:18:17 +00:00
Monster Iestyn
c0bb511c1f
Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree
...
This concludes hardcoding of scenery items for THZ
2018-01-22 18:41:14 +00:00
Monster Iestyn
0f99fdadd1
Merge branch 'next' into lua-archive-crash-hotfixes
2018-01-20 21:33:03 +00:00
Monster Iestyn
fa3998e942
Some fixes to prevent bad table key types causing Lua panic errors for joining players in netgames:
...
* ArchiveTables: print an error if invalid key, to alert script author potentially
* UnArchiveTables: if the key is found to be nil after reading key and value, print an error and don't set them in the table
2018-01-20 21:18:16 +00:00
Monster Iestyn
82ac8b6a1c
Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox
2018-01-19 17:56:18 +00:00
Monster Iestyn
0ef7aff5c0
Prevent SV_SpawnPlayer from being able to freeze the game if gametic is 0. Additionally add a sanity check to prevent the loop going on more than necessary anyway
...
This commit fixes -playdemo and -timedemo params for command line, allowing them to actually work again
2018-01-16 15:21:49 +00:00
Monster Iestyn
87aa9175a1
Merge branch 'master' into hardcoding-time-again
2018-01-13 17:49:44 +00:00
Monster Iestyn
f1b8e122a2
Fix missing semicolon
2018-01-12 20:05:09 +00:00
Monster Iestyn
602701d6dd
G_DoPlayDemo: prepend srb2home to the demo name (if an external file) so that demos in custom home paths can be loaded
2018-01-11 16:55:42 +00:00
Monster Iestyn
ddf82949bf
W_IsLumpWad: check if the file is a PK3, so it can bail out if it isn't
2018-01-10 19:13:29 +00:00
Monster Iestyn
0c89853425
created W_IsLumpWad as a shortcut for the "is the lump a WAD" checking in the code getting map data lumps
2018-01-10 16:51:23 +00:00
Monster Iestyn
19e08584a3
add support for maps-in-WADs-in-pk3s to P_NetArchiveWorld as well
2018-01-10 15:24:24 +00:00
Monster Iestyn
9c13cee9f0
Hack up support for pk3s in Custom FOF setup, fix stray ! preventing blockmap from loading
2018-01-09 22:22:10 +00:00
Monster Iestyn
db23cfc916
Same has been done for REJECT now
2018-01-09 21:33:10 +00:00
Monster Iestyn
2d98da3bcb
Added support for loading BLOCKMAP lumps from MAPXX.wad maps in /Maps/ in PK3s
2018-01-09 19:43:59 +00:00
Monster Iestyn
0e8db59f4b
P_AddWadFile: for both WADs and pk3s, if a sound is found to replace an existing sound, don't go on looking for more with the same name (since there shouldn't be any)
2018-01-04 21:06:26 +00:00
Monster Iestyn
03020036d4
Merge branch 'master' into file-loading-cleanup
2018-01-04 20:17:19 +00:00
Monster Iestyn
b0d0738fb6
P_AddWadFile: Remove useless firstmapname param, clean up map searching code
2018-01-04 20:15:44 +00:00
Alam Ed Arias
f9a0ef517d
Use playersprite_t
2018-01-04 14:49:26 -05:00
Alam Ed Arias
5cce6101cc
Merge branch 'public_next' into private
2018-01-04 14:32:27 -05:00
Alam Ed Arias
82f2f2f2f9
SDL: disable check for noreturn
2018-01-04 14:29:29 -05:00
Alam Ed Arias
30549addf3
Undo signed mess
2018-01-04 14:26:16 -05:00
Monster Iestyn
29d605a104
clarify this comment a little better
2018-01-04 15:17:32 +00:00
Monster Iestyn
6590d97338
clean up CM_LZF code in W_ReadLumpHeaderPwad
2018-01-04 15:14:53 +00:00
Monster Iestyn
8d07e2f8be
Merge branch 'master' into file-loading-cleanup
2018-01-02 18:46:02 +00:00
Monster Iestyn
2e3eade637
Merge branch 'master' into hardcoding-time-again
2018-01-02 18:36:42 +00:00
Alam Ed Arias
75abd428fc
MSVC2015: fixup
2018-01-02 13:22:10 -05:00
Monster Iestyn
61176ee736
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
# src/win32/win_vid.c
2018-01-02 17:32:24 +00:00
Alam Ed Arias
1ab5273400
Merge branch 'master' into next
2017-12-27 19:34:28 -05:00
Alam Ed Arias
98d6619c36
GIT: ignore .vs folder
2017-12-27 19:32:59 -05:00
Alam Ed Arias
f647989433
MSVC: set SubSystem on DLLs to Windows
2017-12-27 19:32:38 -05:00
