Commit graph

2168 commits

Author SHA1 Message Date
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
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
3b408b19e4 Check target < MAXPLAYERS before PM 2018-12-23 02:25:58 -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
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
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
mazmazz
c4939212dc Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -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
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
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
mazmazz
fb3fbf64bd Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz
8207f126f4 Fix 2p control menu graying out 2018-12-20 16:38:58 -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
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
91bed58e6a Merge branch 'ogl-zfighting-fix' into 'master'
OpenGL z-fighting fix [by Azeonus]

Closes #43

See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
Latapostrophe
d51b5fa676 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe
d83c3ccfff Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
mazmazz
7c5e508f40 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
ae590779f9 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
Alam Arias
69398d8910 Merge pull request #373 from monster-psychic-cat/sw_planefixes
Software plane fixes
2018-12-18 14:02:21 -05:00
Latapostrophe
cd1b929524 Merge branch 'srb2chat' into 'SRB2-CHAT'
fix my fucking code

See merge request SinnamonLat/SRB2!1
2018-12-18 11:51:18 -05:00
mazmazz
d07f44457f Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz
54abae1dde Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz
a607372283 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz
6a87980afd Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz
7c7d85bf74 Fix compile errors 2018-12-17 18:55:21 -05:00
MPC
79653dd094 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC
a28aeaf23b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe
71074ccce1 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00
Latapostrophe
be35a106c5 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01:00
Jimita
97cc111f3e Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Jimita
91037eae12 Merge branch 'master' into sw_planefixes 2018-12-17 17:45:36 -02:00
Latapostrophe
4c88271cfb 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Monster Iestyn
94b00b6b67 Merge branch 'sdl-sound-fix' into 'master'
SDL: Force use DirectSound driver to fix wrong-pitch sound effects

See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
TehRealSalt
6b1746b67b Add deprecation warning to admin 2018-12-16 16:05:18 -05:00