55815eb829
Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff
2019-05-26 11:18:00 +02:00
59ca91a825
Fix the permanent instashield bug
2019-05-17 08:06:18 -05:00
f3f74388e6
Merge branch 'INTERNAL_netreplays' into 'v1'
...
Netreplays
See merge request KartKrew/Kart!146
2019-05-06 21:46:18 -04:00
43b55d4f7c
Merge branch 'slight-grow-improvements' into 'v1'
...
Slight grow improvements (v1.1)
See merge request KartKrew/Kart!142
2019-05-06 21:29:17 -04:00
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
071b335d57
Merge branch 'anim-fix' into 'v1'
...
Fix wheel animations
See merge request KartKrew/Kart!144
2019-05-02 09:23:22 -04:00
3d71a0aac7
Merge branch 'next-colors' into 'v1'
...
Final colors for v1.1
See merge request KartKrew/Kart!143
2019-05-02 09:23:10 -04:00
e772a750a8
Missed a spot
2019-05-02 02:52:22 -04:00
dee068a7ff
Merge branch 'respawn-flash' into 'v1'
...
Flashing tics on respawn
See merge request KartKrew/Kart!138
2019-05-02 01:39:31 -04:00
201466b1c1
Merge v1
2019-05-02 01:36:19 -04:00
f99a5a6a8b
Fix wheel animations
2019-05-02 00:44:04 -04:00
2d8461a59d
Port over double-press Grow cancel from internal
2019-05-01 23:56:12 -04:00
54af8f5fc0
Slight Grow improvements for public
...
- Using Grow while Shrunk will make you normal-size, instead of giant.
- Baked in a Shrink/Grow noise into K_RemoveGrowShrink, whenever you have either
2019-05-01 23:50:18 -04:00
9629fb3216
Modify the first shade of Byzantium
2019-04-26 22:32:31 -04:00
db2935d45a
Fix boost -> drift -> release sliptides not showing the effect when turning right
2019-04-26 19:26:22 -05:00
183e75ff53
Final v1 colors
...
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
2019-04-26 18:18:53 -04:00
85a15847e5
Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible
2019-04-22 20:18:15 -05:00
d987c8ba07
Flashing tics on respawn
2019-04-21 07:52:01 -05:00
a187656a8f
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
1f61397545
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
4f1a329ef2
Update k_kart.c
2019-04-10 03:16:46 -04:00
a4722aded8
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
2019-03-27 03:23:32 -04:00
4b7d2aea84
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
7fc1f02b07
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
af17038cfb
LAT
2019-03-17 21:44:11 -05:00
cd4fc40b9e
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
9ff8b73936
Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
...
# Conflicts:
# src/k_kart.c
# src/p_mobj.c
2019-03-11 21:59:45 -05:00
0e6083cf02
Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works
2019-03-11 18:53:23 +01:00
eec76cf4ec
Merge branch 'remove-pinvin' into 'next'
...
Kill invincibility item caps
See merge request KartKrew/Kart-Public!108
2019-03-09 22:16:25 -05:00
b621723d23
Fix boost / rocket sneakers for antigrav
2019-03-09 17:25:42 +01:00
4faaa932ec
Fix macro expansion warning Sryder got
2019-03-08 19:06:27 -05:00
87e91ebb2c
Kill invincibility item caps
...
It's a holdover from another era, our item changes have stacked up enough that we don't really need this cap anymore
2019-03-08 18:36:25 -05:00
4f8665c785
Merge branch 'colors-roundtwo' into 'next'
...
16 more colors
See merge request KartKrew/Kart-Public!101
2019-03-07 21:25:03 -05:00
c18935fbdd
Reorder colors, ensure colored names are set properly
2019-03-06 03:15:07 -05:00
4e570739fe
Make smoke opaque to reduce lag
2019-03-05 20:56:02 -05:00
36a7e88e63
Mine updates
...
- Increase gravity of super-forward throws
- Revert explosion radius change
- Nerf generic explosion stun (SPB explosion stun is identical)
2019-03-05 20:49:11 -05:00
5760e106e5
SPB updates
...
- SPB Rush odds are not affected by player count.
- Thunder Shield cannot be rolled with SPB out.
- Reticule is displayed on minimap while SPB is out.
2019-03-05 19:45:20 -05:00
ae14d967ea
Misc changes
...
- Start cooldown deactivates exactly 30 sec, instead of after 30 seconds. Barely affects gameplay but it looks slightly less of a magic number looking at the code.
- Prevent multiple Thunder Shields being out via normal means.
- Slightly loosened up the invincibility item limits -- gives more invincibility items sooner for odd player counts but doesn't affect the numbers for the game's balancing points (4P, 8P)
- Update comments
2019-03-05 17:50:43 -05:00
ea40a1b153
Merge branch 'next' into minor-item-tweaks
2019-03-05 17:18:27 -05:00
b9abd8b9bc
fix EOL in k_kart.c
2019-03-05 11:29:00 -05:00
56e8f09ae8
fixed compiling for MSVC 2017
2019-03-04 16:33:06 -05:00
c6f6783f3e
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-03 20:24:39 -06:00
b95d0ac279
16 more colors
...
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
2019-03-02 15:39:52 -05:00
c41bc51e83
Merge branch 'color-fixes' into 'next'
...
Color fixes
See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
4ecd71d026
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
f08c8d018e
Merge branch 'water-update' into 'next'
...
Water update
See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
9c14a2c58f
Merge branch 'next' into color-fixes
2019-02-27 00:09:39 -05:00
44462d0dd7
10 new colors
...
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
592ae58c79
Merge branch 'wipeout-particle-tweak' into 'next'
...
Wipeout particle tweak
See merge request KartKrew/Kart-Public!84
2019-02-26 17:50:13 -05:00
7de2cf8d39
Fix Super colors from base SRB2 giving a garbage color
2019-02-26 07:14:03 -05:00
Latapostrophe