Commit graph

2329 commits

Author SHA1 Message Date
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
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
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
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
Alam Arias
5765b3e034 Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
Monster Iestyn
d46e2ef51b Merge branch 'master' into next 2018-12-21 17:41:19 +00: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
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
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
mazmazz
e6954eae30 Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua 2018-12-20 10:56:36 -05:00
Digiku
12fc077e01 Merge branch 'lua-nextmapoverride' into 'next'
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel

See merge request STJr/SRB2!396
2018-12-20 10:55:30 -05:00
mazmazz
e7cc04a46e Reset default controls for LOADCONFIG command 2018-12-20 10:13:43 -05:00
mazmazz
92eb63d8b5 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz
8a6031ba01 Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
Digiku
f70a023bce Merge branch 'version-string-develop' into 'master'
Add DEVELOP build flag to version string

See merge request STJr/SRB2!401
2018-12-20 02:28:21 -05:00
mazmazz
861805ca0f Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz
436c49e38b Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz
1e731416d0 Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz
119b7cb469 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku
bf5a27477e Merge branch 'pk3-stray-blockmap-msg' into 'master'
Comment out stray PK3 blockmap message

See merge request STJr/SRB2!399
2018-12-20 01:11:44 -05:00
mazmazz
8fb1453633 Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku
6e196b3ed7 Merge branch 'using-offsetof' into 'next'
Use the `offsetof` function

See merge request STJr/SRB2!394
2018-12-19 21:53:37 -05:00
Alam Ed Arias
718f16426e Merge branch 'master' into next 2018-12-19 13:20:54 -05:00