Sal
4b8f46490e
Merge branch 'waypoint-helpers-tweaks' into 'master'
...
Fix Waypoint Anchors and split paths; DefaultWaypointRadius for your level headers!
See merge request KartKrew/Kart!254
2020-05-14 18:15:33 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
James R
7c9824dc56
Multiply the default radius of 384 by mobjscale, but not user set radiuses
2020-05-04 17:54:43 -07:00
James R
e2d4ddcec2
SOC: DefaultWaypointRadius in the level header picardy
2020-05-04 17:39:11 -07:00
James R
4b2c13da0c
Merge remote-tracking branch 'origin/master' into fof-things-suck
2020-04-24 20:36:30 -07:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
James R
0b3b13b3b5
Remove FOF height sorting
2020-04-15 19:16:49 -07:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
James R
89a2f8ec8d
Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height
...
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.
If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.
Set Ambush to raise the waypoint to the same z position.
2020-04-04 01:20:38 -07:00
James R
3fa22c508b
Put screenshots, movies and replays under a "media" directory
2020-03-30 17:41:48 -07:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Latapostrophe
1f5bbb2c3d
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
b7702f5ff5
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
207e68e55d
Merge branch 'gl-qol' into v1.2-frankeinstein
2020-03-10 20:34:20 +01:00
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -08:00
fickleheart
cf11f1ef6e
SUPER EXPERIMENTAL FREEZE-B-GONE
2020-03-05 22:19:39 -06:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
James
100a67f8f0
Prevent LF2_EXISTSHACK from ever getting removed
2019-11-16 16:14:54 -05:00
Latapostrophe
3361b94934
dontencoreremap flag + colormaps
2019-11-12 00:40:25 +01:00
TehRealSalt
c963a49542
Try fixing Auto causing desyncs
...
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)
Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
TehRealSalt
3d5676d4d6
atoi
2019-10-03 10:16:10 -04:00
TehRealSalt
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
Sal
8338d3e71c
Merge branch 'fortnite' into 'master'
...
Battle sudden death
See merge request KartKrew/Kart!166
2019-10-03 01:27:09 -04:00
Sal
eb7f662654
Merge branch 'genesis-wipe' into 'master'
...
Genesis-style wipes
See merge request KartKrew/Kart!164
2019-10-03 01:10:33 -04:00
TehRealSalt
06d27ae36e
Merge branch 'master' into fortnite
2019-09-27 06:36:11 -04:00
TehRealSalt
22796b7633
Merge master
2019-09-27 03:44:37 -04:00
TehRealSalt
9cb834b004
Capsule counter, map change when spawning capsules mid-game
2019-09-24 11:24:01 -04:00
TehRealSalt
e84c618da8
Rudimentary Record Attack support
2019-09-24 07:17:05 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
b8a752e40a
Merge master
2019-09-18 21:47:11 -04:00
TehRealSalt
47da526313
Use texture names instead of predesignated sky numbers
2019-09-18 19:29:28 -04:00
TehRealSalt
1ef09699d1
Functional gameplay
...
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score
Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
Latapostrophe
0505a6f0cc
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
TehRealSalt
71f35c7f5b
Add encore_towhite
2019-08-10 02:07:18 -04:00
TehRealSalt
5da84b78a2
Encore wiggle
2019-08-10 01:59:23 -04:00
TehRealSalt
aad0dbd076
Encore invert fade
2019-08-10 00:54:16 -04:00
TehRealSalt
36e4f25cc9
Uses pre-defined colormap lumps now
...
Works much faster now. I'd like to clean up this code some though
2019-08-07 02:21:04 -04:00
Latapostrophe
599cf4fc9d
encore colormaps, fixups + flat align
2019-06-13 10:14:07 +02:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Sryder
128d970bad
Turn CONS_Printf to CONS_Alert in waypoint initialisation.
2019-06-09 19:37:24 +01:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
Sryder
43936013f7
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/d_netcmd.h
# src/k_kart.c
# src/p_setup.c
2019-05-25 12:09:47 +01:00
