Commit graph

2996 commits

Author SHA1 Message Date
Monster Iestyn
19e93c8394 Fix missing semicolon 2018-01-12 20:05:09 +00:00
Monster Iestyn
00fe750722 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
31e27eae0e probably best if we did this instead actually 2018-01-08 14:29:47 +00:00
Monster Iestyn
a2c45dbc71 If NOT skewing FOF walls, make sure dc_texturemid reverts to using unsloped FOF topheight/bottomheight rather than actual left side top/bottom heights 2018-01-08 14:29:39 +00:00
Monster Iestyn
d05fed7173 Upper Unpegged on an FOF's control linedef now enables skewing of walls with respect to slopes
Skewing direction is decided per in-level wall by the Lower Unpegged flag on in-level linedefs themselves, since they already decide the stuff for FOF wall pegging as it is. That is unless Transfer Line is involved which moves everything to the control sector linedefs instead...
2018-01-08 14:29:30 +00:00
Alam Ed Arias
7c3c09b95d SDL: disable check for noreturn 2018-01-04 14:29:29 -05:00
Alam Ed Arias
26ce50f02c Merge branch 'master' into next 2017-12-27 19:34:28 -05:00
Alam Ed Arias
e2d257031b GIT: ignore .vs folder 2017-12-27 19:32:59 -05:00
Alam Ed Arias
31027d1a2d MSVC: set SubSystem on DLLs to Windows 2017-12-27 19:32:38 -05:00
Monster Iestyn
83a8a77beb 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
Monster Iestyn
adf57fd5a5 Merge branch 'master' into next 2017-12-27 21:51:11 +00:00
Monster Iestyn
a9bc7158d6 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
Steel Titanium
875446295b Remove redundant !dedicated check 2017-12-27 16:36:57 -05:00
Alam Ed Arias
c7ca071c19 Merge branch 'master' into next 2017-12-27 15:50:31 -05:00
Monster Iestyn
a1b2c6129d 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
Monster Iestyn
3af72ec79d Merge branch 'airbob-fix-backport' into 'next'
Airbob fix backport

See merge request STJr/SRB2!219
2017-12-27 15:46:39 -05:00
Steel Titanium
3856165623 Indentation cleanup 2017-12-27 13:18:20 -05:00
Alam Ed Arias
def0c12279 Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00
Alam Ed Arias
f1968e5145 Disable win_dbg 2017-12-26 20:24:08 -05:00
Alam Ed Arias
faf88cf2e5 TCP: remove BADSOCKET 2017-12-26 19:56:50 -05:00
Alam Arias
7688aecd31 SRB2: disable Smaller Type Check for MSVC 2017-12-25 00:41:05 -05:00
Monster Iestyn
342326bdd6 Merge branch 'master' into next 2017-12-24 20:06:33 +00:00
Monster Iestyn
90093268a9 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
toasterbabe
edf7483a4c Fix airbob sectors fucking up when below 0 z-height. 2017-12-20 21:13:24 +00:00
toasterone
893f4ed322 Merge branch 'master' into addfile-netgame-fixes 2017-12-20 20:58:45 +00:00
toasterone
da3eba505c 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
Monster Iestyn
caf56a04eb 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
LJSonik
c8a68a43ec Merge branch 'master' into download-freeze-fix 2017-12-18 21:39:16 +01:00
Louis-Antoine
824d963f58 Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix 2017-12-18 21:38:10 +01:00
Louis-Antoine
c8e9e779e7 Add a short comment to explain the newplayernum hack 2017-12-18 21:35:02 +01:00
Alam Ed Arias
e12d6f041b Merge branch 'master' into next 2017-12-17 22:22:57 -05:00
MonsterIestyn
2c9d31bf54 Merge pull request #218 from LJSonik/resynch-fixes
Resynch fixes
2017-12-17 21:57:25 +00:00
LJSonik
93b0eda442 Merge branch 'master' into download-freeze-fix 2017-12-17 22:48:13 +01:00
LJSonik
e0e6853317 Merge branch 'master' into resynch-fixes 2017-12-17 22:47:23 +01:00
Monster Iestyn
fe8786b8ff 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
Monster Iestyn
cad5dc21c4 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
Alam Ed Arias
2931f14ff8 Merge branch 'master' into next 2017-12-16 18:16:15 -05:00
Alam Arias
e314ff930d Merge pull request #212 from SteelTitanium/window_center_fix
Fix for window being offcenter
2017-12-16 18:15:00 -05:00
Alam Ed Arias
825ae325c1 Merge branch 'master' into next 2017-12-16 16:07:31 -05:00
MonsterIestyn
9a0dccda71 Merge pull request #219 from LJSonik/net-archive-fix
Fix missing lua_pop in ArchiveExtVars
2017-12-16 20:57:46 +00:00
Louis-Antoine
a9c580c906 Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix 2017-12-15 22:06:03 +01:00
Louis-Antoine
beb9b0f103 Return for both players and mobjs if they've got an empty table, instead of just mobjs 2017-12-15 22:02:34 +01:00
LJSonik
fb7859cf5b Merge branch 'master' into net-archive-fix 2017-12-15 20:07:44 +01:00
Louis-Antoine
0b836a9841 Fix missing lua_pop in ArchiveExtVars 2017-12-15 16:31:27 +01:00
Monster Iestyn
ac3fef15eb Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this 2017-12-13 19:07:02 +00:00
Louis-Antoine
4e89c03b0f Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à$%@ 2017-12-12 23:08:18 +01:00
Louis-Antoine
16b8265c6e F stands for Fun. You want more Fun, don't you? 2017-12-12 22:48:08 +01:00
Steel Titanium
e61549d81f Opps, forgot to change this. 2017-11-08 14:50:27 -05:00
Steel Titanium
55c86f3e15 Successful attempt at restarting the music 2017-11-08 14:48:05 -05:00
Monster Iestyn
7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00