vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,930 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

2930 Commits

Author SHA1 Message Date
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
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 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 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 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 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
mazmazz a66a2021ba Draw up and down arrows by string 2018-12-22 20:57:53 -05:00
mazmazz fb3722a6f3 Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
mazmazz 0f0e30924f One more free(nodenum) 2018-12-22 20:35:12 -05:00
mazmazz 5badc11159 Fix integer overflow on for loop decrements 2018-12-22 20:18:25 -05:00
Alam Arias c5ec1e30a4
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix 
Large room fix
 2018-12-22 19:48:08 -05:00
Alam Ed Arias 4265be776c Merge branch 'master' into next 2018-12-22 19:36:32 -05:00
Alam Arias 194f9ea8c0
Merge branch 'next' into sw_largeroomfix 2018-12-22 19:34:22 -05:00
Latapostrophe c7060aa5ad 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 974a8e3e2b 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 619dd9d08a 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 b1ccfa1f46 Merge branch 'latsrb2chat' into 'SRB2-CHAT' 
Fix various bugs.

See merge request SinnamonLat/SRB2!4
 2018-12-22 04:37:24 -05:00
mazmazz 8707b2f40a Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
mazmazz cb619e0353 Don't create movement events from joy or mouse when menu is active 2018-12-22 01:20:24 -05:00
Digiku 66dc5a8712 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 1291d35e08 Don't allow non-keyboard keys to screenshot/gif in menus 2018-12-22 00:39:32 -05:00
Steel Titanium 10521d161c Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
Steel Titanium e42bcd5b68 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat 2018-12-21 20:29:33 -05:00
Monster Iestyn a72d79da54 Merge branch 'master' into next 2018-12-21 17:41:19 +00:00
Latapostrophe d6c99a0133 Merge branch 'SRB2-CHAT-FLOAT-FIX' into 'SRB2-CHAT' 
Adjust vid.width floating point comparson for CHAT

See merge request SinnamonLat/SRB2!3
 2018-12-21 11:51:24 -05:00
Digiku cd8a147c95 Merge branch '2122-credits-update-2' into 'next' 
Re-order Special Thanks -- groups first, then names in ABC order

See merge request STJr/SRB2!411
 2018-12-21 11:41:41 -05:00
mazmazz 90832938c9 Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz 06ff171e19 Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00