TehRealSalt
f0cf1bb39b
Merge branch 'rings' of https://git.magicalgirl.moe/KartKrew/Kart into rings
2019-03-10 06:15:30 -04:00
TehRealSalt
523e46b3fb
Finally animate the spinning ring
2019-03-10 06:15:26 -04:00
Sryder
662bee1b4e
Roulette Code: Electric Boogaloo
2019-03-10 00:04:09 +00:00
Sryder
60d2b6e37d
Item roulette code proves once again to be one of the most fragile pieces of code I've seen
...
I assume we just need to move these other places to match the super ring ID moving.
2019-03-09 23:54:40 +00:00
TehRealSalt
8c79e57f89
Don't lose rings with a shield on hit
2019-03-09 16:39:43 -05:00
TehRealSalt
955e5d9c80
Nope, disable ring respawn again
2019-03-09 16:21:51 -05:00
TehRealSalt
d6d5d44153
Fix misc mistakes
2019-03-09 16:05:39 -05:00
TehRealSalt
db8f23561d
Minor (but important!) polishing
...
- Thunder Shield now attracts rings
- Colorize the ring counter at max yellow
- Rings in the collecting animation are considered for determining if you can't pick up rings anymore, preventing a LOT of rings being deleted from the map over time.
- Flung rings don't lose speed over time anymore
- Flund rings last way longer
- Using rings is much less touchy (holding the button from before an item roulette will let you continue using them until you let go, using certain items won't make you use a couple rings afterwards)
- 0 rings is now counted as debt when getting hit, making debt easier to get out of (getting hit by a spike now would put you at -2 instead of -5)
- Move Super Ring toward the end of the item (so I don't have to modify gfx.kart to fix dropped items)
2019-03-09 04:33:46 -05:00
TehRealSalt
4a68f98dc2
double ring hitbox, buff ring boost to 20% top speed increase
2019-03-08 20:33:44 -05:00
TehRealSalt
9b66e419f1
Fix bad merge errors
2019-03-08 18:34:03 -05:00
TehRealSalt
40c89dd9b8
Comment here for clarity
2019-03-07 21:33:01 -05:00
TehRealSalt
2c080cbd14
Wrong order here
2019-03-07 21:32:16 -05:00
TehRealSalt
74a757ad69
Merge remote-tracking branch 'kartpublic/next' into rings
2019-03-07 21:31:45 -05:00
Sal
897331a289
Merge branch 'colors-roundtwo' into 'next'
...
16 more colors
See merge request KartKrew/Kart-Public!101
2019-03-07 21:25:03 -05:00
Sal
6db91223cf
Merge branch 'minor-item-tweaks' into 'next'
...
Assorted item tweaks
See merge request KartKrew/Kart-Public!85
2019-03-07 21:24:51 -05:00
TehRealSalt
6803e68420
Fix up item order of operations, spilled rings carry some momentum, don't pick up rings in spinout/wipeout
2019-03-07 21:23:28 -05:00
TehRealSalt
32ecf05f4b
Fix HUD being off by a pixel
2019-03-07 19:37:00 -05:00
TehRealSalt
40da3594c8
Mashing in record attack is now 100% chance for rings
...
and also rings persist through death, and you start with 5
2019-03-07 19:18:20 -05:00
TehRealSalt
129268121d
Added rings.
2019-03-07 17:11:31 -05:00
wolfy852
17d7c536de
Merge branch 'master' into next
2019-03-07 00:23:17 -06:00
wolfs
fb4bb47b9f
Merge branch 'longdouble' into 'next'
...
Use long double suffix
See merge request KartKrew/Kart-Public!98
2019-03-07 01:19:31 -05:00
wolfs
a80548b2a2
Merge branch 'archiveworld-sigsegv-fix' into 'master'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame
See merge request KartKrew/Kart-Public!99
2019-03-07 01:18:38 -05:00
Sally Cochenour
5d0fbc2af0
Reorder colors, ensure colored names are set properly
2019-03-06 03:15:07 -05:00
Sally Cochenour
b10d0f74c9
Fix floating lob items
2019-03-06 01:53:52 -05:00
Sally Cochenour
354a90330f
Put eggbox sniping behind an #if
...
On second thought, the old method is "sneakier"
2019-03-05 22:06:47 -05:00
Sally Cochenour
75a2ed7534
Add banana snipe sound effect to eggboxes & sinks
2019-03-05 22:02:41 -05:00
Sally Cochenour
2f9719f80e
uncommited change...
...
💢
2019-03-05 21:25:37 -05:00
Sally Cochenour
5dbdc903ba
Make smoke opaque to reduce lag
2019-03-05 20:56:02 -05:00
Sally Cochenour
a2f0935bee
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
Sally Cochenour
32a509beb1
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
Sally Cochenour
19812c8a2f
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
Sally Cochenour
b785eda252
Merge branch 'next' into minor-item-tweaks
2019-03-05 17:18:27 -05:00
James R
99d2af5669
Check that lumps are okay
2019-03-04 22:13:22 -08:00
James R
e55a778a81
Merge remote-tracking branch 'origin/next' into longdouble
2019-03-04 18:51:11 -08:00
Alam Arias
9a8e13af5c
Merge branch 'master' into next
2019-03-04 17:17:13 -05:00
Alam Arias
58b4b8b9e7
Merge remote-tracking branch 'upstream/master'
2019-03-04 17:16:37 -05:00
Alam Ed Arias
ca407e2be7
CircleCi: we need SSH for buildbot
2019-03-04 16:51:39 -05:00
Alam Ed Arias
9dbdc6a3a5
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
Alam Ed Arias
4b0e8db4c1
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
Alam Arias
aaccb4edff
fixed compiling for MSVC 2017
2019-03-04 16:33:06 -05:00
James R
ca861ba0c5
Use long double suffix
2019-03-02 15:56:44 -08:00
Alam Arias
635a38091e
Merge branch 'master' into next
2019-03-02 18:41:58 -05:00
Alam Arias
32d579be4e
Do not error about array bounds, some GCC versions's reporting is broken
2019-03-02 18:39:53 -05:00
Alam Arias
350664996e
Just do not warn about unsuffixed float constants
2019-03-02 18:39:10 -05:00
Sal
ae6bfe115d
Merge branch 'upstream-merge' into 'master'
...
Upstream merge of master
See merge request KartKrew/Kart-Public!96
2019-03-02 17:32:16 -05:00
Sally Cochenour
d638d47fad
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
Alam Arias
b9b14fb9a3
fixup merged mess for NO-LUA mess
2019-03-02 13:32:47 -05:00
Alam Arias
4eb655569e
Merge remote-tracking branch 'origin/master' into upstream-merge
2019-03-02 13:27:10 -05:00
Alam Arias
c82fd8acd7
Exported SDL_icon.xpm as srb2icon.png
2019-03-02 13:26:17 -05:00
Sal
333805ea95
Merge branch 'no_lua' into 'master'
...
be able to compile without blua support
See merge request KartKrew/Kart-Public!97
2019-03-02 10:08:20 -05:00