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
19e08584a3
add support for maps-in-WADs-in-pk3s to P_NetArchiveWorld as well
2018-01-10 15:24:24 +00:00
9c13cee9f0
Hack up support for pk3s in Custom FOF setup, fix stray ! preventing blockmap from loading
2018-01-09 22:22:10 +00:00
db23cfc916
Same has been done for REJECT now
2018-01-09 21:33:10 +00:00
2d98da3bcb
Added support for loading BLOCKMAP lumps from MAPXX.wad maps in /Maps/ in PK3s
2018-01-09 19:43:59 +00:00
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
03020036d4
Merge branch 'master' into file-loading-cleanup
2018-01-04 20:17:19 +00:00
b0d0738fb6
P_AddWadFile: Remove useless firstmapname param, clean up map searching code
2018-01-04 20:15:44 +00:00
f9a0ef517d
Use playersprite_t
2018-01-04 14:49:26 -05:00
5cce6101cc
Merge branch 'public_next' into private
2018-01-04 14:32:27 -05:00
82f2f2f2f9
SDL: disable check for noreturn
2018-01-04 14:29:29 -05:00
30549addf3
Undo signed mess
2018-01-04 14:26:16 -05:00
29d605a104
clarify this comment a little better
2018-01-04 15:17:32 +00:00
6590d97338
clean up CM_LZF code in W_ReadLumpHeaderPwad
2018-01-04 15:14:53 +00:00
8d07e2f8be
Merge branch 'master' into file-loading-cleanup
2018-01-02 18:46:02 +00:00
75abd428fc
MSVC2015: fixup
2018-01-02 13:22:10 -05:00
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
1ab5273400
Merge branch 'master' into next
2017-12-27 19:34:28 -05:00
98d6619c36
GIT: ignore .vs folder
2017-12-27 19:32:59 -05:00
f647989433
MSVC: set SubSystem on DLLs to Windows
2017-12-27 19:32:38 -05:00
d937f6fc8b
Merge branch '2.1.20-preparation' into 'next'
...
2.1.20 preparation
See merge request STJr/SRB2!215
2017-12-27 16:53:43 -05:00
5400beb2e3
Merge branch 'master' into next
2017-12-27 21:51:11 +00:00
afcdb5cd1e
Merge branch 'restartaudio' into 'master'
...
Add command to restart the audio system
Closes #27
See merge request STJr/SRB2!214
2017-12-27 16:47:50 -05:00
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
f9388eab1b
Merge branch 'master' into next
2017-12-27 15:50:31 -05:00
fa507ee939
Merge branch 'respawnspecials-mobjtype-hotfix' into 'next'
...
P_RespawnSpecials mobj type hotfix
See merge request STJr/SRB2!217
2017-12-27 15:47:44 -05:00
a87eec89ff
Merge branch 'airbob-fix-backport' into 'next'
...
Airbob fix backport
See merge request STJr/SRB2!219
2017-12-27 15:46:39 -05:00
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
f397b5fc3f
Makefile: disable win_dbg for DirectDraw
2017-12-26 20:42:37 -05:00
a29203acd8
Disable win_dbg
2017-12-26 20:24:08 -05:00
e2b604fdfd
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
97af30ae4b
SRB2: disable Smaller Type Check for MSVC
2017-12-25 00:41:05 -05:00
6886a29e99
Merge branch 'master' into next
2017-12-24 20:06:33 +00:00
69be3f34bf
Merge branch 'addfile-netgame-fixes' into 'master'
...
"addfile" console command netgame fixes
See merge request STJr/SRB2!218
2017-12-24 15:05:03 -05:00
a1620b709e
Fix airbob sectors fucking up when below 0 z-height.
2017-12-20 21:13:24 +00:00
ff745531b0
Merge branch 'master' into addfile-netgame-fixes
2017-12-20 20:58:45 +00:00
6ef3465d7d
Merge pull request #216 from LJSonik/download-freeze-fix
...
Fix Master Server requests and player joins stopping file downloading
2017-12-20 20:52:34 +00:00
d576453b56
Command_Addfile: add "too many files" and already-loaded checks and respective error messages
...
No more shall the server be kicked from their own servers for re-adding a wad by accident!
2017-12-18 21:17:37 +00:00
36ce6579b7
Merge branch 'master' into download-freeze-fix
2017-12-18 21:39:16 +01:00
47481804da
Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix
2017-12-18 21:38:10 +01:00
c8e9e779e7
Add a short comment to explain the newplayernum hack
2017-12-18 21:35:02 +01:00
57a7a3bed8
Merge branch 'master' into next
2017-12-17 22:22:57 -05:00
47a06ffda5
Merge pull request #218 from LJSonik/resynch-fixes
...
Resynch fixes
2017-12-17 21:57:25 +00:00
084a534f6a
Merge branch 'master' into download-freeze-fix
2017-12-17 22:48:13 +01:00
9c7ff6e0c3
Merge branch 'master' into resynch-fixes
2017-12-17 22:47:23 +01:00
c7cd64583d
Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case
2017-12-17 20:59:24 +00:00
ec10367856
Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console.
...
This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
2017-12-17 20:57:45 +00:00
baf227175b
Merge branch 'master' into next
2017-12-16 18:16:15 -05:00
703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix
...
Fix for window being offcenter
2017-12-16 18:15:00 -05:00
bd86f98822
Merge branch 'master' into next
2017-12-16 16:07:31 -05:00
Monster Iestyn