Commit graph

3004 commits

Author SHA1 Message Date
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
Latapostrophe
08c2975cf6 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
932daaee22 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
8e40bdb59d Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz
c4939212dc Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
mazmazz
77402df2e6 Skip setting control if keynum is -1 (for KEY_PAUSE) handling 2018-12-20 18:27:44 -05:00
Digiku
cb81503f8e Merge branch '2122-credits-update' into 'next'
Add sirjuddington and CodeImp to Special Thanks credits

See merge request STJr/SRB2!409
2018-12-20 18:06:08 -05:00
Digiku
3ebb6f91f3 Merge branch '2122-execversion' into '2122-version'
EXECVERSION adjustments (config updater)

See merge request STJr/SRB2!408
2018-12-20 18:01:48 -05:00
mazmazz
4e055bd383 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz
a4ddad6824 Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
mazmazz
495ea70a74 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00
mazmazz
8e2d8ee797 Merge branch '2122-version' into 2122-execversion 2018-12-20 17:14:53 -05:00
Digiku
7920dbe4a8 Merge branch 'float_equal' into 'master'
Clear Float equal warnings

See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Jimita
2b28d30109 Merge branch 'next' into sw_largeroomfix 2018-12-20 19:58:16 -02:00
Jimita
97e57203d6 Merge branch 'next' into sw_largeroomfix 2018-12-20 19:57:38 -02:00
Digiku
b6ff4b8930 Merge branch 'camera-backport' into 'next'
Suggestion: 2.2 camera changes backport

See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
Digiku
2b365bd7ce Merge branch 'jump-spin-axes' into 'next'
Feature: Jump/Spin axes

See merge request STJr/SRB2!389
2018-12-20 16:57:05 -05:00
Digiku
2cff6dc078 Merge branch 'joy-jump-defaults' into 'next'
Assign joy button defaults for 1 and 2 player

See merge request STJr/SRB2!400
2018-12-20 16:56:09 -05:00
Digiku
6a62edcae4 Merge branch 'menu-2pcontrols-fix' into 'master'
Fix 2p control menu graying out

See merge request STJr/SRB2!407
2018-12-20 16:54:52 -05:00
Jimita
32ff0dcd71 Merge branch 'next' into sw_largeroomfix 2018-12-20 19:53:24 -02:00
Digiku
f674a77a8e Merge branch 'cmake-dllpath-fix' into 'master'
Update CMake paths for Windows DLLs

See merge request STJr/SRB2!406
2018-12-20 16:53:06 -05:00
MPC
b584e95cdb bland 2018-12-20 18:52:51 -03:00
mazmazz
fb3fbf64bd Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz
e54086038f Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
mazmazz
8207f126f4 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz
2cd851652a Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
Monster Iestyn
ef90aa7920 Merge branch 'lua-fof-flat-names-fix' into 'next'
Lua FOF flat names fix

See merge request STJr/SRB2!405
2018-12-20 15:48:04 -05:00
MPC
8d42a47fdd change implementation of square root 2018-12-20 17:37:06 -03:00
Jimita
70ce880248 Update r_segs.c 2018-12-20 16:15:19 -03:00
Jimita
b8b2fbb816 Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
Monster Iestyn
f7698de3ea fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn
c22df14771 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00