Commit graph

16729 commits

Author SHA1 Message Date
Sally Coolatta
a19ce98350 Fix positions tying at 2nd place 2020-11-02 05:15:45 -05:00
Sally Coolatta
e478d542a0 Emeralds are on ranking 2020-11-02 04:23:31 -05:00
Sally Coolatta
4a9a438270 Dummy out wanted system
- Remove WANTED hud item
- Person in 1st place is the bonus points giver
- Sort players by Emeralds > Bumpers > Points
2020-11-02 03:51:16 -05:00
Sally Coolatta
0f492f4300 Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink 2020-11-02 02:04:02 -05:00
Sally Coolatta
7304dff3e5 Don't let karma players pick anything up 2020-11-02 02:03:50 -05:00
James R
6370919e05 Pick up emeralds from below 2020-11-01 22:34:14 -08:00
James R
896b29f002 Replace special handling for picking up items from below with MF_PICKUPFROMBELOW 2020-11-01 22:33:42 -08:00
Sally Coolatta
2745ea2938 Drop emeralds in front of the hurt player, instead of to their left 2020-11-02 01:22:41 -05:00
Sally Coolatta
56dc08ed88 Shitty temp emeralds hud 2020-11-02 01:09:38 -05:00
Sally Coolatta
7bff7931ed Sort wanted players by bumpers & emeralds first 2020-11-02 01:09:14 -05:00
Sally Coolatta
ea14d6bb1c Use Super Emerald collect sound instead for now 2020-11-02 00:51:47 -05:00
Sally Coolatta
961ff69241 You can drop Chaos Emeralds 2020-11-02 00:41:41 -05:00
Sally Coolatta
a011278dd4 Slight tweaks to item spawn location 2020-11-01 23:46:26 -05:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
76e0102b3f Fix paper items not being removed after shrunk 2020-10-30 21:13:36 -07:00
James R
46b1b6db1c Double paper item height 2020-10-30 21:13:31 -07:00
James R
4bdd3c809f Major brother moment 2020-10-30 20:54:21 -07:00
Sally Coolatta
84f027d244 Item table changes
- Mine: 4 -> 6
- Thunder Shield: 0 -> 4
- Bubble Shield: 0 -> 1
- Sneaker x3: 0 -> 1
- Banana x10: 0 -> 1

2 of the 3 shields added, included some items that normally only appeared for Karma items, and makes Mines much more common
2020-10-30 23:09:29 -04:00
Sally Coolatta
619402666a Better Jawz
- More friction in Battle
- Throwables take your momz (has been bothering me for an eternity)
2020-10-30 22:57:42 -04:00
James R
6864705b67 Fix fuckup 2020-10-30 19:00:37 -07:00
James R
cb941050e2 Paper item hitbox extends just as far below 2020-10-28 23:48:16 -07:00
James R
4d8447dc1c Revert "Eliminate karma players at overtime"
This reverts commit 714f04c930.
2020-10-28 23:30:37 -07:00
James R
918b4a2039 Revert "this is stupid"
This reverts commit 3200842519.
2020-10-28 23:30:34 -07:00
James R
8ae579d672 Merge branch 'master' into paper-items-i-hate-my-life 2020-10-28 22:36:08 -07:00
James R
c609dffdab Stupid P_MapStart crash because of flicky teleport before map load 2020-10-28 22:35:31 -07:00
James R
81b8abed53 Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life 2020-10-28 21:51:28 -07:00
Sal
1aef75bff3 Merge branch 'model-texture-fix' into 'master'
Model texture fix

Closes #97 and #100

See merge request KartKrew/Kart!325
2020-10-28 16:31:19 -04:00
Sally Coolatta
01d5c9a95b Put back in the improvements to HWR_CreateBlendedTexture
Fixes colors being darker, and creates blend textures faster
2020-10-28 16:20:11 -04:00
Sally Coolatta
bac7de9b0f Merge branch 'master' into model-texture-fix 2020-10-28 15:58:00 -04:00
Sal
a0621b92f9 Merge branch 'anchors-on-slopes' into 'master'
Offset slope anchors from regular slopes

See merge request KartKrew/Kart!319
2020-10-28 15:50:30 -04:00
Sal
8b20a94202 Merge branch 'additive-transmap' into 'master'
Additive and Subtractive Translation Maps

See merge request KartKrew/Kart!323
2020-10-28 15:50:22 -04:00
Sally Coolatta
a253a6cedd Remove rogue line making this function do nothing 2020-10-28 15:41:32 -04:00
Sally Coolatta
646fd15b02 Remove these 2 calls to HWR_UnlockCachedPatch
From what I can tell, this is not in SRB2 master or next. I'm uncertain about this, but Jeck has had zero crashes with this.
2020-10-28 15:16:05 -04:00
James R
faefe23d88 Merge branch 'music-changes' into 'master'
Load multiple musicdef, use music.pk3

See merge request KartKrew/Kart!324
2020-10-28 01:16:49 -04:00
James R
f5329f25bf Use music.pk3 2020-10-27 17:20:57 -07:00
James R
7199bba3b2 Update musicdef conversion utility 2020-10-27 15:51:36 -07:00
James R
d896fee2e5 Load multiple musicdef lumps from a single wad 2020-10-27 15:45:10 -07:00
James R
e7051737d7 Use 2.2's musicdef parser 2020-10-27 15:00:31 -07:00
Sally Coolatta
3200842519 this is stupid 2020-10-27 01:27:51 -04:00
Sally Coolatta
714f04c930 Eliminate karma players at overtime 2020-10-27 01:09:51 -04:00
Sally Coolatta
63c84567c5 Spawn an item right at 0:00.00, instead of at 0:04.00 2020-10-27 00:23:46 -04:00
Sally Coolatta
f8e52ae6a0 Increase radius of floating items 2020-10-27 00:22:33 -04:00
Sally Coolatta
a2a947db62 bruh
thanks jart
2020-10-27 00:19:11 -04:00
James R
de936f4c7f Don't reset drift off springs
Hopefully nothing requires drift reset from here.
2020-10-26 20:49:39 -07:00
Sally Coolatta
ddee6257e7 Move to P_RunThinkers 2020-10-26 23:46:56 -04:00
James R
d19c96ee17 Revert step down changes 2020-10-26 20:20:04 -07:00
James R
2ae394b8e3 Fix opengl splitscreen 2020-10-26 19:51:42 -07:00
Sally Coolatta
16e08d4388 Don't run P_RespawnBattleBoxes 2020-10-26 22:33:14 -04:00
Sally Coolatta
b83f9afecb Merge branch 'master' into battle-rethink 2020-10-26 22:22:40 -04:00
Sal
96a5eadc84 Merge branch 'the-scary-22-merge' into 'master'
The scary 22 merge

Closes #19, #80, #69, #94, #61, #64, #6, #27, #46, #47, #45, #43, #37, and #72

See merge request KartKrew/Kart!321
2020-10-26 22:21:01 -04:00