colette
4cbc4b1835
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
fickleheart
12750e06e3
Fix improperly-resolved merge conflict
2019-03-09 21:08:29 -06:00
Alam Arias
6560740234
Merge branch 'next' into ping-stuff-take2
2019-03-09 22:02:11 -05:00
Alam Arias
f251bd6d19
Merge branch 'master' into next
2019-03-09 22:00:25 -05:00
Alam Arias
28d101ac1a
Please do not go past the doomdata_t space
2019-03-09 21:57:59 -05:00
Alam Arias
f17185289b
Merge branch 'master' into ping-stuff-take2
2019-03-09 20:40:50 -05:00
Alam Arias
fd7f09b124
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:38:36 -05:00
Alam Ed Arias
a2c1b63864
partly Revert "TravisCI: remove WFLAGS"
...
This reverts commit a22c9a999e
2019-03-09 20:36:44 -05:00
Alam Ed Arias
a22c9a999e
TravisCI: remove WFLAGS
2019-03-09 20:17:14 -05:00
Alam Arias
afaa620f6b
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:13:41 -05:00
Alam Ed Arias
d386febf56
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
Alam Arias
ef603143c9
fix VCHELP
2019-03-09 18:09:38 -05:00
Alam Arias
18233eba23
Merge branch 'master' into ping-stuff-take2
2019-03-09 18:05:30 -05:00
Latapostrophe
dca6d8094a
Change default showping from Warning to Always
2019-03-09 22:01:52 +01:00
TehRealSalt
ff32e84b09
Fix macro expansion warning Sryder got
2019-03-08 19:06:27 -05:00
TehRealSalt
c9aab2579b
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
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
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
Alam Arias
47c32fa785
fixed compiling without blua support
2019-03-01 17:46:19 -05:00
