Commit graph

2985 commits

Author SHA1 Message Date
Digiku
77182e9278 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
95e5c76fc7 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
8d05795f65 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
47a329807a Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Monster Iestyn
50710c3f10 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
ff2ec801bc Clear all control keys before loading defaults in LoadConfig 2018-12-23 14:59:26 -05:00
Steel Titanium
c98024aaf0 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
mazmazz
4e07436276 Credits update 2018-12-23 14:41:41 -05:00
mazmazz
98b59f3f9d Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
mazmazz
d05896415e Add JOY10 default to gc_centerview 2018-12-23 14:29:54 -05:00
mazmazz
7a1094f56e Fix joy button default override when filling keynum2 with default 2018-12-23 14:29:10 -05:00
Latapostrophe
c282d546d7 Fix the chat being displayed in singleplayer if there are stillmessages 2018-12-23 10:50:36 +01:00
Latapostrophe
9129fbad3b Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-23 10:30:37 +01:00
Latapostrophe
3ac3057931 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
1b8be7f1a4 Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
mazmazz
5c75e1e5c2 Buildbot fixes 2018-12-23 03:39:27 -05:00
mazmazz
9eb90fb6e7 New patch.dta hash for 2.1.22 2018-12-23 03:22:32 -05:00
mazmazz
88a503aa76 Add chat_on to non-key move event checks 2018-12-23 03:21:32 -05:00
mazmazz
3b408b19e4 Check target < MAXPLAYERS before PM 2018-12-23 02:25:58 -05:00
mazmazz
a5887d06e1 Fix mainwads check in d_main 2018-12-23 00:29:59 -05:00
mazmazz
7b25cf8137 Merge branch '2122-version' into 2122-patch-dta-update 2018-12-22 23:50:31 -05:00
mazmazz
4fad53fe94 Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-22 23:42:25 -05:00
mazmazz
336c3d87c4 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-22 23:41:55 -05:00
mazmazz
a03acf16b4 Add SRB2 Community Contributors to Special Thanks 2018-12-22 23:41:43 -05:00
mazmazz
b7d08b9a2b Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update 2018-12-22 23:34:24 -05:00
Steel Titanium
350a6b1027 SDL:Auto grab input 2018-12-22 23:28:59 -05:00
mazmazz
7906f8dcf8 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 23:20:01 -05:00
mazmazz
fb78d462c6 Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
This reverts commit 6806c6b175.
2018-12-22 22:40:58 -05:00
mazmazz
9453a10097 Use TinyFont for chat arrows 2018-12-22 22:40:04 -05:00
mazmazz
6806c6b175 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 21:48:24 -05:00
mazmazz
0726a118dd Correct splitscreen check in OLDCHAT 2018-12-22 21:30:39 -05:00
mazmazz
3c3ddc4cc9 Minor code cleanup, CHAT 2018-12-22 21:17:01 -05:00
mazmazz
31c5b6fd66 Draw up and down arrows by string 2018-12-22 20:57:53 -05:00
mazmazz
123462672c Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
mazmazz
1c914ec5ff One more free(nodenum) 2018-12-22 20:35:12 -05:00
mazmazz
49222b1663 Fix integer overflow on for loop decrements 2018-12-22 20:18:25 -05:00
Alam Arias
a81fa9755e Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
Large room fix
2018-12-22 19:48:08 -05:00
Alam Ed Arias
59a97a01b9 Merge branch 'master' into next 2018-12-22 19:36:32 -05:00
Alam Arias
6aa648214d Merge branch 'next' into sw_largeroomfix 2018-12-22 19:34:22 -05:00
Latapostrophe
9e49a9ca5d Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Digiku
b9e37d1ed0 Merge branch 'sdl-vidmode-display-fix' into 'master'
SDL: Center window on current monitor during vidmode change

Closes #47

See merge request STJr/SRB2!415
2018-12-22 09:06:55 -05:00
Latapostrophe
09dbb6d631 Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
Latapostrophe
6065084dc2 Merge branch 'latsrb2chat' into 'SRB2-CHAT'
Fix various bugs.

See merge request SinnamonLat/SRB2!4
2018-12-22 04:37:24 -05:00
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
mazmazz
5a18d89414 Don't create movement events from joy or mouse when menu is active 2018-12-22 01:20:24 -05:00
Digiku
7136112f9c Merge branch 'menu-screenshot-fix' into 'master'
Menu screenshot fix

Closes #45

See merge request STJr/SRB2!413
2018-12-22 00:40:18 -05:00
TehRealSalt
e5c308c1d7 Don't allow non-keyboard keys to screenshot/gif in menus 2018-12-22 00:39:32 -05:00
Steel Titanium
0ea0dbef8e Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
Steel Titanium
e03b277fcb Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat 2018-12-21 20:29:33 -05:00
Monster Iestyn
d46e2ef51b Merge branch 'master' into next 2018-12-21 17:41:19 +00:00