76e0ff6dc7
Merge branch 'waypastpoint' into 'master'
...
Ghetto waypoint improvements
See merge request KartKrew/Kart!21
2018-10-02 18:20:17 -04:00
033667a0ee
Merge branch 'keysmash' into 'master'
...
(Mic)key('s Dick) Smasher
See merge request KartKrew/Kart!18
2018-10-01 14:58:31 -04:00
005e3ce514
Merge branch 'hack_the_de_damnit' into 'master'
...
Fix dehacked list incongruence
See merge request KartKrew/Kart!20
2018-09-29 16:52:41 -04:00
5322caa435
Merge branch 'invert_dynamic_slopes' into 'master'
...
Flip dynamic slope toggle
See merge request KartKrew/Kart!17
2018-09-29 16:51:35 -04:00
ab59504be0
Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit
2018-09-29 20:28:27 +01:00
1be13e8e2d
Fix dehacked list incongruence.
2018-09-29 16:43:00 +01:00
2c1db167da
Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again.
...
Also, sounds.
2018-09-29 16:18:16 +01:00
8ccaa1fcee
Flip dynamic slope toggle.
2018-09-28 12:58:07 +01:00
eb4a967d8e
Merge branch 'minimap_in_demos' into 'master'
...
Show minimap in demo playback
See merge request KartKrew/Kart!16
2018-09-23 18:14:09 -04:00
b964c1c49a
Merge branch 'thundershield-hell' into 'master'
...
Thundershield hell
See merge request KartKrew/Kart!14
2018-09-23 18:08:59 -04:00
c9e994ae07
smoll to tiny
2018-09-23 23:07:38 +01:00
c0a16be662
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
...
# Conflicts:
# src/info.c
# src/info.h
# src/sounds.c
# src/sounds.h
2018-09-23 23:07:16 +01:00
9c10a85596
Merge branch 'itemdrop' into 'master'
...
Itemdrop
See merge request KartKrew/Kart!11
2018-09-23 17:51:28 -04:00
de91eb9793
You're right, this works fine
2018-09-23 22:34:59 +01:00
a1ad4d79d0
Turns out `Playing()` evaluates to false when playing back demos. Who knew?
2018-09-23 19:58:15 +01:00
8bc1a217fe
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-09-23 12:58:06 -04:00
d2d6e67f48
Forgot I did this optimisation! Updated for the new colours.
2018-09-23 16:39:07 +01:00
73116f2b60
The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with `#ifdef`ing.
2018-09-23 16:13:58 +01:00
fa65cbb43e
Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up.
2018-09-23 13:34:49 +01:00
c5e16f183e
Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders).
...
Also, correct a minor copypaste failure in one of the I_Errors' messages.
2018-09-23 13:23:03 +01:00
2e158f2c21
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 13:22:00 +01:00
659810cd81
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
2018-09-23 11:47:29 +01:00
8ff0e976c2
Merge branch 'new-voices' into 'master'
...
New voices
See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
c63518e0b2
Doing this looks more appealing to me
2018-09-22 20:15:12 -04:00
8a06e78ab6
Quick fix for other player's win/lose not playing
2018-09-22 20:14:32 -04:00
9c361f8a19
Merge branch 'this-is-a-sign' into 'master'
...
End sign on finish
See merge request KartKrew/Kart!13
2018-09-22 20:11:05 -04:00
bb1aaf9d54
New sparkles
2018-09-22 19:55:26 -04:00
ad8d674e5e
Set nogravity on landing
...
Means you can't have a finishline that moves up and down, but eh, thinking this might help the fallback measure disappearing
2018-09-22 19:03:38 -04:00
a3b40c7577
Better particle spread
2018-09-22 19:00:30 -04:00
487e114fee
raceexittime var
2018-09-22 18:59:26 -04:00
d7f8d4507a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/sounds.c
# src/sounds.h
2018-09-22 23:11:14 +01:00
6cc7f97d8a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu
...
# Conflicts:
# src/m_menu.c
2018-09-22 23:00:46 +01:00
7256e99b12
Merge branch 'master' into this-is-a-sign
2018-09-22 17:58:35 -04:00
5f78807ef0
Merge branch 'encore' into 'master'
...
Encore
See merge request KartKrew/Kart!7
2018-09-22 17:52:33 -04:00
81249a084a
Merge branch 'shitsfree' into 'master'
...
:shitsfree:
See merge request KartKrew/Kart!12
2018-09-22 17:24:11 -04:00
be36d8ed84
Merge branch 'icon_update' into 'master'
...
Icon Update
See merge request KartKrew/Kart!9
2018-09-22 17:19:02 -04:00
09b30c660c
Merge branch 'chat-changes' into 'master'
...
Chat changes
See merge request KartKrew/Kart!10
2018-09-22 17:14:04 -04:00
f20710fbb4
Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops.
2018-09-22 21:05:20 +01:00
81c04480f9
List update as requested by Sal
2018-09-22 20:56:44 +01:00
3a76605772
* 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
1f2ee32a83
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes
2018-09-22 15:14:21 +01:00
e63d4740ec
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
4fd4deff8a
One last thing - make the OpenGL level loading bar screen have the correct background colour.
2018-09-22 12:43:54 +01:00
84c2a8c28f
Sign compare fix via boolean cast
2018-09-22 11:59:07 +01:00
e9d4fae5b9
Merge branch 'master' into new-voices
2018-09-21 21:13:46 -04:00
0e39bf2821
Slightly darker green backgrounds
2018-09-21 19:51:31 -04:00
f8c9ef9431
Did everything toaster suggested
2018-09-22 01:47:13 +02:00
dd6b63f9da
Different timings
2018-09-21 19:44:14 -04:00
23090e82b5
Changed thundershield sound
2018-09-22 01:15:04 +02:00
3fa7f4e7b4
Address review
...
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
2018-09-21 18:40:18 -04:00
Sryder