wolfy852
b19d9f69f1
Merge remote-tracking branch 'remotes/pub/next' into followme
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
2019-03-08 02:34:04 -06: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
Alam Arias
d464ab5ac5
fixup SOC changes for C 89 mode
2019-03-07 17:34:46 -05:00
Alam Arias
5418bdef01
Always compile in GNU C89 mode
2019-03-07 17:31:13 -05:00
Alam Arias
24f7ea2ce1
Merge remote-tracking branch 'origin/master' into followme
2019-03-07 17:29:47 -05:00
Latapostrophe
e2c72c08cd
Fix map load crash and other additions / clean ups
2019-03-07 23:10:07 +01: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
Alam Arias
5475eba690
reorder file loads
2019-03-06 11:36:56 -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
Latapostrophe
9fa80c3f57
Merge branch 'followme' of git.magicalgirl.moe:KartKrew/Kart-Public into followme
2019-03-05 12:24:28 +01:00
Latapostrophe
3d5f2e4e67
I'm an idiot. Fix very dumb crash caused by lazy copypaste when trying to apply fallback state on followers
2019-03-05 12:23:23 +01: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
c4c744d27a
Merge branch 'next' into followme
2019-03-04 17:17:35 -05: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
Latapostrophe
169ec43eec
add some Lua support, hit confirm animations and fix some stuff
2019-03-04 21:35:58 +01:00
Latapostrophe
3aadc5ac1b
when you change the documentation but forget to update the code to go along
2019-03-03 21:16:56 +01:00
Latapostrophe
d410143ab0
good grief I'm an idiot
2019-03-03 21:16:02 +01:00
Latapostrophe
d8576b0bbc
Add more customization options & fix some dumb things
2019-03-03 21:12:21 +01:00
Alam Arias
2967638cf3
remove whitespaces
2019-03-02 19:49:21 -05:00
Alam Arias
6071b78cf3
fixed compiling for MSVC
2019-03-02 18:57:52 -05:00
James R
ca861ba0c5
Use long double suffix
2019-03-02 15:56:44 -08:00
Alam Arias
980ab4dc77
follower_frame should be unsigned
2019-03-02 18:48:00 -05:00
Alam Arias
2ff308251c
Merge branch 'next' into followme
2019-03-02 18:42:21 -05: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
Latapostrophe
c3151039b2
leftover comment from earlier experiment
2019-03-02 22:40:58 +01:00
Latapostrophe
b5b1ca6e26
Fix splitscreen, offline and death
2019-03-02 22:39:42 +01: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
