Alam Ed Arias
1e76cb8a88
Merge branch 'master' into next
2018-03-14 14:29:42 -04:00
Alam Ed Arias
93e143e26f
Merge remote-tracking branch 'public/master'
2018-03-14 14:26:07 -04:00
colette
1151f4bba3
Merge branch 'credits_update' into 'master'
...
Credits update
See merge request STJr/SRB2!231
2018-03-14 12:56:27 -04:00
toasterbabe
5f4fa843c2
i suck at the alphabet!
2018-03-14 16:55:33 +00:00
toasterbabe
cb0511a912
oh yeah this guy's name needs changing too
2018-03-14 16:49:10 +00:00
toasterbabe
429a293a1b
down with cis
2018-03-14 16:47:19 +00:00
MonsterIestyn
632c7dd5ce
Merge pull request #239 from LJSonik/net-archive-fix
...
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:13:12 +00:00
Louis-Antoine
dc02ef886f
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:40:34 +01:00
Monster Iestyn
651e773c7e
Merge branch 'master' into next
2018-03-08 19:35:51 +00:00
Monster Iestyn
9a1a29508e
Merge branch 'download-filename-trunc-fix' into 'master'
...
Download filename trunc fix
See merge request STJr/SRB2!230
2018-03-08 14:33:57 -05:00
Monster Iestyn
3f61a1608d
shrunk buffer from 32 to 28 so that all of "Downloading "extremely...longname.wad"" can fit on screen at once.
2018-03-06 20:52:55 +00:00
Monster Iestyn
b060d98c28
replace the 3 strncpys with a snprintf
2018-03-06 20:20:27 +00:00
Monster Iestyn
426983ff11
rewrite download file screen code:
...
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name
note: I haven't actually tested if this works or compiles yet, I haven't the time right now
2018-03-05 22:24:03 +00:00
Monster Iestyn
ced141d596
Merge branch 'master' into next
2018-03-04 19:10:01 +00:00
Monster Iestyn
f25eb1705a
Merge branch 'linux-limbo' into 'master'
...
Linux limbo
See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
8b586690a8
Merge branch 'soc-sanitizing' into 'next'
...
SOC sanitizing
See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
Monster Iestyn
084e718414
Merge branch 'console-key-breakfast' into 'master'
...
Console key breakfast
See merge request STJr/SRB2!226
2018-03-04 14:06:40 -05:00
Monster Iestyn
39949392ca
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
Monster Iestyn
a4637a6dec
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
Monster Iestyn
ce78df03d0
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
Monster Iestyn
628f9921a8
removing stupid dumb useless code fish
2018-02-21 22:45:51 +00:00
Monster Iestyn
bef710aa8f
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
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b
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
Louis-Antoine
64a108e24a
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
Monster Iestyn
fb6c96de00
Merge branch 'stopleakingnames' into 'master'
...
Stop leaking names via metadata.
See merge request STJr/SRB2!223
2018-02-08 16:14:15 -05:00
Monster Iestyn
6f491daa94
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
a550ff6692
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
toasterbabe
c444a460a3
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
toasterbabe
e03e97edc8
Stop leaking names.
2018-01-30 21:25:28 +00:00
Monster Iestyn
bf849ffba2
Merge branch 'next' into lua-archive-crash-hotfixes
2018-01-20 21:33:03 +00:00
Monster Iestyn
7dd919f3f8
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
6067e94dc2
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
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
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
