Monster Iestyn
04a8c9a283
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
Monster Iestyn
c8e3748a1c
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Alam Ed Arias
be13ab4830
Fix NONET build
2019-05-13 01:51:36 -04:00
Monster Iestyn
5d059da843
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
james
e4a1470116
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
mazmazz
e5125d0746
Chat arrow offsets
2019-01-07 22:34:48 -05:00
mazmazz
1821edeee7
Update SRB2-CHAT nickname colors to 2.2 skincolors
2019-01-07 22:26:39 -05:00
mazmazz
38ad1ec027
WIP hu_stuff merge fixes
2019-01-07 17:56:55 -05:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
bd4874aa53
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05:00
mazmazz
34964a07a8
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2018-12-24 18:51:11 -05:00
Latapostrophe
c282d546d7
Fix the chat being displayed in singleplayer if there are stillmessages
2018-12-23 10:50:36 +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
9453a10097
Use TinyFont for chat arrows
2018-12-22 22:40:04 -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
Steel Titanium
0ea0dbef8e
Fix various bugs with the chat.
2018-12-21 22:28:28 -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
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
Latapostrophe
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
Latapostrophe
34f13e9f20
merge conflict
2018-12-16 16:48:15 +01:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
72a32696a5
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
Monster Iestyn
d60ade9f95
Merge branch 'master' into hud-n-menu-tidbits
2018-08-29 21:28:11 +01:00
Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
Monster Iestyn
dc6b52a449
Add INFLIVES macro, to make it easier to find infinite lives-related code
2018-08-23 20:09:39 +01:00
Latapostrophe
a00b03b765
Fix capslock being wonky.
2018-08-19 11:25:20 +02:00
Latapostrophe
fe0b6dc600
Fix old chat detection.
2018-08-19 11:12:21 +02:00
Latapostrophe
da3fb0913b
Changed chat position,
...
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
Monster Iestyn
3e80f4a59b
Merge branch 'master' into leveltitle-tinkering
...
# Conflicts:
# src/hu_stuff.h
2018-08-10 20:03:59 +01:00
Latapostrophe
c2ff88bb62
Fixed sub 400p chat for console
2018-07-31 23:56:23 +02:00
Latapostrophe
ac8920ac7a
Repositionning chat & bugfixes
2018-07-31 15:57:19 +02:00
Latapostrophe
a4bded8e9e
SRB2chat test rework
2018-07-31 11:10:02 +02:00
Monster Iestyn
18aa5bda18
Merge branch 'master' into leveltitle-tinkering
...
# Conflicts:
# src/hu_stuff.h
# src/st_stuff.c
2018-06-14 21:26:44 +01:00
toaster
bdee4dd694
Improve retrying text presentation.
...
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
2018-06-14 14:41:14 +01:00
toaster
f080921305
* Hold the pause button to restart a record attack run!
...
* Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif
* Show powerup display in singleplayer even while holding Game Status button.
2018-06-14 00:58:28 +01:00
toaster
25ac5a9bf4
* Record attack tab-HUD tweaks.
...
* Do not subtract a life when retrying if you have infinite lives.
2018-06-13 17:52:23 +01:00