1972 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alam Ed Arias	5d1508836e	SDL: ask for better timer under Windows	2018-01-22 17:41:08 -05:00
Alam Ed Arias	770863d332	SDL: diable skip frame	2018-01-22 17:40:50 -05:00
Alam Ed Arias	6ae667c78f	SDL2: use native SDL2 Timer API for windows	2018-01-22 17:11:07 -05:00
Alam Ed Arias	82f2f2f2f9	SDL: disable check for noreturn	2018-01-04 14:29:29 -05: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
Monster Iestyn	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
Monster Iestyn	5400beb2e3	Merge branch 'master' into next	2017-12-27 21:51:11 +00:00
Monster Iestyn	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
Steel Titanium	875446295b	Remove redundant !dedicated check	2017-12-27 16:36:57 -05:00
Alam Ed Arias	f9388eab1b	Merge branch 'master' into next	2017-12-27 15:50:31 -05:00
Monster Iestyn	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
Monster Iestyn	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
Steel Titanium	3856165623	Indentation cleanup	2017-12-27 13:18:20 -05:00
Alam Ed Arias	f397b5fc3f	Makefile: disable win_dbg for DirectDraw	2017-12-26 20:42:37 -05:00
Alam Ed Arias	a29203acd8	Disable win_dbg	2017-12-26 20:24:08 -05:00
Alam Ed Arias	e2b604fdfd	TCP: remove BADSOCKET	2017-12-26 19:56:50 -05:00
Alam Arias	97af30ae4b	SRB2: disable Smaller Type Check for MSVC	2017-12-25 00:41:05 -05:00
Monster Iestyn	6886a29e99	Merge branch 'master' into next	2017-12-24 20:06:33 +00:00
Monster Iestyn	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
toasterbabe	a1620b709e	Fix airbob sectors fucking up when below 0 z-height.	2017-12-20 21:13:24 +00:00
toasterone	ff745531b0	Merge branch 'master' into addfile-netgame-fixes	2017-12-20 20:58:45 +00:00
toasterone	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
Monster Iestyn	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
LJSonik	36ce6579b7	Merge branch 'master' into download-freeze-fix	2017-12-18 21:39:16 +01:00
Louis-Antoine	47481804da	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	57a7a3bed8	Merge branch 'master' into next	2017-12-17 22:22:57 -05:00
MonsterIestyn	47a06ffda5	Merge pull request #218 from LJSonik/resynch-fixes ... Resynch fixes	2017-12-17 21:57:25 +00:00
LJSonik	084a534f6a	Merge branch 'master' into download-freeze-fix	2017-12-17 22:48:13 +01:00
LJSonik	9c7ff6e0c3	Merge branch 'master' into resynch-fixes	2017-12-17 22:47:23 +01:00
Monster Iestyn	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
Monster Iestyn	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
Alam Ed Arias	baf227175b	Merge branch 'master' into next	2017-12-16 18:16:15 -05:00
Alam Arias	703c5322d4	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	bd86f98822	Merge branch 'master' into next	2017-12-16 16:07:31 -05:00
MonsterIestyn	2ad4e1a1e5	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	4ea5d2df01	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	b994180927	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
Steel	dbbbc1cc06	Merge branch 'master' into window_center_fix	2017-11-08 00:32:23 -05:00
Steel Titanium	c1405137ec	Extra tab space to make the compiler happy	2017-11-07 23:48:03 -05:00