toaster
bbed50b73f
List update as requested by Sal
2018-09-22 20:56:44 +01:00
toaster
6884e4aa9a
* Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar.
...
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
2018-09-22 18:22:04 +01:00
toaster
d2fc1ea230
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes
2018-09-22 15:14:21 +01:00
toaster
ba9df6d0d5
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
...
# Conflicts:
# src/info.c
2018-09-22 14:57:33 +01:00
toaster
3e23576060
One last thing - make the OpenGL level loading bar screen have the correct background colour.
2018-09-22 12:43:54 +01:00
toaster
fd247b8252
Sign compare fix via boolean cast
2018-09-22 11:59:07 +01:00
TehRealSalt
6a8fa59277
Merge branch 'master' into new-voices
2018-09-21 21:13:46 -04:00
TehRealSalt
6ecf752273
Slightly darker green backgrounds
2018-09-21 19:51:31 -04:00
Latapostrophe
428ab9896d
Did everything toaster suggested
2018-09-22 01:47:13 +02:00
TehRealSalt
fef5ec005f
Different timings
2018-09-21 19:44:14 -04:00
Latapostrophe
213911fa11
Changed thundershield sound
2018-09-22 01:15:04 +02:00
TehRealSalt
932572abf8
Address review
...
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
2018-09-21 18:40:18 -04:00
toaster
b21863afdb
Okay, seems like reducing it to 1x is enough - making it singular is overkill and means that often if the furthest one away from you is the one to yell, you'll barely hear it. At least this way you'll only hear overkill chao if you're super close to the stands and the mapper's placed way too many
2018-09-21 22:06:27 +01:00
TehRealSalt
b6e60d2a63
Minor adjustments to the endsign color back table
2018-09-21 16:54:29 -04:00
toaster
15491fa809
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/info.c
# src/k_kart.c
2018-09-21 21:05:47 +01:00
toaster
9ab42d91cb
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
...
# Conflicts:
# src/info.c
# src/m_menu.c
# src/y_inter.c
2018-09-21 20:54:38 +01:00
mazmazz
7c48360c2b
MP Jingle: A brace (Underwater restore, p_inter.c)
2018-09-21 15:53:03 -04:00
mazmazz
b4ba440c1b
MP Jingle: Fix underwater music not restoring on air bubble or shield
2018-09-21 15:44:52 -04:00
TehRealSalt
77c69f6150
Merge branch 'master' into this-is-a-sign
2018-09-21 15:40:12 -04:00
TehRealSalt
32ad050de8
Prevent signs from disappearing
2018-09-21 15:37:30 -04:00
Sal
670e9bd539
Merge branch 'sal-misc' into 'master'
...
Sal misc
See merge request KartKrew/Kart!6
2018-09-21 15:08:05 -04:00
Steel Titanium
5efb94a35b
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
7f7c5b60ae
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Latapostrophe
44e6bb8df3
Moved strlen(w_chat) out of the loop.
2018-09-21 17:03:09 +02:00
Steel
502414d609
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
ac8658fac8
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
toaster
1e57004fad
Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later.
...
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
2018-09-21 12:12:17 +01:00
Latapostrophe
ed3b69ff7f
Fix visual error related to moving the cursor on multi-line messages.
2018-09-21 12:23:00 +02:00
TehRealSalt
748028e8d5
Condense this re: wolfs
2018-09-20 22:16:04 -04:00
mazmazz
9d4ef0397c
MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it)
2018-09-20 19:05:05 -04:00
Steel Titanium
43cbb0d11e
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
13a3f197bd
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
mazmazz
fa5532b386
MP Jingle: Add fade timing hack after ending a non-looping song
2018-09-20 18:30:21 -04:00
toaster
a901e2de7e
Smaller XPM with no redundant pixels
2018-09-20 22:36:01 +01:00
mazmazz
9bfd8c4a4b
MP Jingle: Changed music_stacks from fixed array to next/prev chain
2018-09-20 17:13:52 -04:00
TehRealSalt
1dc0c8ad0d
Reeling back on this again
...
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
TehRealSalt
c3c39182fb
Address review
...
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
Sal
8fe42fbf27
Merge branch 'sonicitems' into 'master'
...
Sonic Items
See merge request KartKrew/Kart!5
2018-09-20 14:51:07 -04:00
toaster
d16021febd
:shitsfree:
2018-09-20 17:45:19 +01:00
Latapostrophe
45888ad593
Spark radius now follows players
2018-09-20 18:31:38 +02:00
mazmazz
95db2ea276
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:42:28 -04:00
mazmazz
9fd7fac3ae
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:41:40 -04:00
mazmazz
3ec85a69ff
MP Mixer X: Fix double->UINT32 cast (buildbots)
2018-09-20 08:30:31 -04:00
mazmazz
82c049e80d
MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots)
2018-09-20 08:23:29 -04:00
Digiku
46691c557d
Merge branch 'le-fof-sametagfix' into 'master'
...
Linedef Exec FOF specials: Don't stop procedure after the first matching FOF in target sector
See merge request STJr/SRB2Internal!194
2018-09-20 08:09:25 -04:00
mazmazz
65314be0ec
MP Libopenmpt: Fix UINT32->double cast (buildbots)
2018-09-20 07:42:35 -04:00
mazmazz
bde488215f
MP Libopenmpt: SDL header in load_libraries
2018-09-20 07:39:53 -04:00
mazmazz
28b456c05d
MP Libopenmpt: Separate loading into sdl/load_libraries.c
2018-09-19 23:18:06 -04:00
mazmazz
e29f8432e8
MP libopenmpt: Remove from Linux buildbots due to explicit OPENMPT=1 change
2018-09-19 23:05:46 -04:00
mazmazz
f771c12701
MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms
2018-09-19 23:03:35 -04:00
