538d0de949
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into openglquickfixes
2018-03-06 16:11:05 +00:00
16e60aada9
Merge branch 'linux-limbo' into 'master'
...
Linux limbo
See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
9843d60e13
Merge branch 'console-key-breakfast' into 'master'
...
Console key breakfast
See merge request STJr/SRB2!226
2018-03-04 14:06:40 -05:00
4a0305eec8
more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL
2018-02-23 20:40:19 +00:00
1216c9da18
Use __linux__ instead of LINUX/LINUX64
...
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
2018-02-23 20:21:16 +00:00
6e21059713
Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open
2018-02-23 20:08:02 +00:00
fb3e78c020
Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder
2018-02-20 17:06:03 +00:00
4cbe2e1622
Merge pull request #231 from LJSonik/net-command-leak-fix
...
Fix net commands not always being freed
2018-02-14 10:28:32 -05:00
c7320f9f82
Don't allocate memory for net commands already executed, as it would cause them to be never freed
2018-02-14 15:09:52 +01:00
fe2fd432e8
Merge branch 'stopleakingnames' into 'master'
...
Stop leaking names via metadata.
See merge request STJr/SRB2!223
2018-02-08 16:14:15 -05:00
5adfdf9516
cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this.
2018-01-30 22:48:53 +00:00
8090ea4ed0
Stop leaking names.
2018-01-30 21:25:28 +00:00
82f2f2f2f9
SDL: disable check for noreturn
2018-01-04 14:29:29 -05: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
2ad4e1a1e5
Merge pull request #219 from LJSonik/net-archive-fix
...
Fix missing lua_pop in ArchiveExtVars
2017-12-16 20:57:46 +00:00
4ea5d2df01
Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix
2017-12-15 22:06:03 +01:00
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
b994180927
Merge branch 'master' into net-archive-fix
2017-12-15 20:07:44 +01:00
Sryder