6318 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Digiku	47a810decb	Merge branch 'EOL' into 'master' ... fix EOL on src/p_enemy.c See merge request STJr/SRB2Internal!208	2018-12-24 01:33:03 -05:00
mazmazz	e708f750a0	Remove inline from ST_drawWeaponSelect() to fix 32-bit compile ... large-function-growth limit reached	2018-12-24 01:26:22 -05:00
mazmazz	ac9cb59de9	Do not increment mainwads for music.dta	2018-12-23 23:54:26 -05:00
mazmazz	9d1bc3063f	Play flag-returned SFX for the opposing team	2018-12-23 22:57:14 -05:00
Steel Titanium	cb13ace77e	Merge branch 'master' into sdl-autograb	2018-12-23 22:35:44 -05:00
Steel Titanium	8044e2a7f6	Merge branch 'sdl-autograb-revise' into 'sdl-autograb' ... AutoGrab changes See merge request SteelTitanium/SRB2!3	2018-12-23 22:32:51 -05:00
mazmazz	ed410575d6	Only SetWindowGrab if !disable_mouse; toggle cursor visibility	2018-12-23 22:09:16 -05:00
Steel Titanium	46d1a866d8	Another attempt to lock the mouse	2018-12-23 18:54:15 -05:00
mazmazz	cb01ebebed	Merge remote-tracking branch 'public-gl/2122-version' into 2122-version	2018-12-23 18:09:54 -05:00
mazmazz	83a6f5d6ae	Merge remote-tracking branch 'public-gl/master' into 2122-version	2018-12-23 18:09:17 -05:00
mazmazz	c0a0c5ac5d	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-23 18:09:14 -05:00
Digiku	d72e3fe71c	Merge branch '2122-patch-dta-update' into '2122-version' ... Changes related to 2.1.22 patch.dta update See merge request STJr/SRB2!417	2018-12-23 18:08:38 -05:00
Digiku	8d56c2f486	Merge branch 'addons-backport' into '2122-version' ... Addons Menu backport to vanilla See merge request STJr/SRB2!384	2018-12-23 18:08:06 -05:00
Digiku	fa36b8f5a2	Merge branch 'menu-mpjoy-fix' into '2122-version' ... Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version] See merge request STJr/SRB2!420	2018-12-23 18:06:27 -05:00
mazmazz	2b8cdc0381	Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" ... This reverts commit c0c05043e6.	2018-12-23 18:04:01 -05:00
Digiku	140152c2e7	Merge branch '2122-next' into 'next' ... Revert "Merge branch 'menu-mpjoy-fix' into 'next'" See merge request STJr/SRB2!419	2018-12-23 18:00:18 -05:00
mazmazz	c0c05043e6	Revert "Merge branch 'menu-mpjoy-fix' into 'next'" ... This reverts commit b5d4bb3530, reversing changes made to 2d675750cf.	2018-12-23 17:57:50 -05:00
Digiku	b5d4bb3530	Merge branch 'menu-mpjoy-fix' into 'next' ... Menu: Fix joystick events causing the player to move during multiplayer system menu See merge request STJr/SRB2!414	2018-12-23 17:55:02 -05:00
Digiku	7a64e3d1a8	Merge branch 'SRB2-CHAT' into '2122-version' ... Chat and other multiplayer quality of life improvements. See merge request STJr/SRB2!398	2018-12-23 17:53:54 -05:00
Digiku	e23e0c9ea4	Merge branch 'execversion-filtercontrols' into '2122-version' ... Add SETCONTROL handling to config updater See merge request STJr/SRB2!410	2018-12-23 17:15:44 -05:00
Digiku	402860dc06	Merge branch 'loadconfig-defaultcontrols' into 'master' ... Reset default controls for LOADCONFIG command See merge request STJr/SRB2!403	2018-12-23 17:14:34 -05:00
Latapostrophe	b7d7472a88	Merge branch 'next' into SRB2-CHAT	2018-12-23 22:53:24 +01:00
Monster Iestyn	2d675750cf	fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c	2018-12-23 21:52:49 +00:00
mazmazz	f55623ef9c	Clear all control keys before loading defaults in LoadConfig	2018-12-23 14:59:26 -05:00
Steel Titanium	40a037f603	A more through out attempt to lock the mouse	2018-12-23 14:54:14 -05:00
mazmazz	f600c5fee0	Credits update	2018-12-23 14:41:41 -05:00
mazmazz	8f596376a9	Merge branch '2122-version' into execversion-filtercontrols	2018-12-23 14:30:24 -05:00
mazmazz	3277cf6976	Add JOY10 default to gc_centerview	2018-12-23 14:29:54 -05:00
mazmazz	dd4c7b539f	Fix joy button default override when filling keynum2 with default	2018-12-23 14:29:10 -05:00
Latapostrophe	db8e1c0393	Fix the chat being displayed in singleplayer if there are stillmessages	2018-12-23 10:50:36 +01:00
Latapostrophe	11f44f7ce9	Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT	2018-12-23 10:30:37 +01:00
Latapostrophe	809bb8a9d5	Merge branch 'SRB2-CHAT' into 'SRB2-CHAT' ... Final code fixes and minor cleanup See merge request SinnamonLat/SRB2!5	2018-12-23 04:30:20 -05:00
Latapostrophe	1b61e15b1b	Merge branch 'master' into SRB2-CHAT	2018-12-23 10:26:08 +01:00
mazmazz	3703a032f0	Buildbot fixes	2018-12-23 03:39:27 -05:00
mazmazz	7fb73cf2da	New patch.dta hash for 2.1.22	2018-12-23 03:22:32 -05:00
mazmazz	aa77038dfc	Add chat_on to non-key move event checks	2018-12-23 03:21:32 -05:00
mazmazz	6ebc41a554	Check target < MAXPLAYERS before PM	2018-12-23 02:25:58 -05:00
mazmazz	ec53032310	Fix mainwads check in d_main	2018-12-23 00:29:59 -05:00
mazmazz	31cfa255f2	Merge branch '2122-version' into 2122-patch-dta-update	2018-12-22 23:50:31 -05:00
mazmazz	e3d106d527	Merge remote-tracking branch 'public-gl/2122-version' into 2122-version	2018-12-22 23:42:25 -05:00
mazmazz	b49cf11fb6	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-22 23:41:55 -05:00
mazmazz	33434395f7	Add SRB2 Community Contributors to Special Thanks	2018-12-22 23:41:43 -05:00
mazmazz	8723eb9aa2	Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update	2018-12-22 23:34:24 -05:00
Steel Titanium	66e13cf1cc	SDL:Auto grab input	2018-12-22 23:28:59 -05:00
mazmazz	94858aedfe	Extend HU_FONTSTART to STCFN022 (from 2.2)	2018-12-22 23:20:01 -05:00
mazmazz	a9fb17dab1	Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)" ... This reverts commit 6400729034.	2018-12-22 22:40:58 -05:00
mazmazz	56320a35ce	Use TinyFont for chat arrows	2018-12-22 22:40:04 -05:00
mazmazz	6400729034	Extend HU_FONTSTART to STCFN022 (from 2.2)	2018-12-22 21:48:24 -05:00
mazmazz	e0176670f4	Correct splitscreen check in OLDCHAT	2018-12-22 21:30:39 -05:00
mazmazz	7e9411f320	Minor code cleanup, CHAT	2018-12-22 21:17:01 -05:00