Commit graph

5714 commits

Author SHA1 Message Date
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
fickleheart
96b47d3065 Don't shoot asterisks off-screen on the join password screen 2019-03-06 23:34:30 -06:00
fickleheart
8a022670bd Fix freeze when trying to host with a join password already set 2019-03-06 23:32:47 -06:00
fickleheart
d013c9117c Missed an include 2019-03-06 22:45:02 -06:00
fickleheart
b696e68def Recycle oldest challenges first if all are taken 2019-03-06 22:36:13 -06:00
wolfy852
ddc296575f Fix my fuckups
Not fond of what I did in P_CanRunOnWater but it at least carries the desired effect...
2019-03-06 22:28:06 -06:00
fickleheart
9e9dcf759a Show message on incorrect password 2019-03-06 22:11:35 -06:00
fickleheart
1da3d7cc48 Fix join password not recognizing shifted characters 2019-03-06 22:07:28 -06:00
wolfy852
2850ca17df Kill SF_RUNONWATER 2019-03-06 22:02:56 -06:00
fickleheart
a1b2eaa7fc Add -remove option to joinpassword 2019-03-06 21:30:39 -06:00
wolfy852
33c85f4813 Clean up the skin_t struct 2019-03-06 21:18:01 -06:00
wolfy852
0829040f6c Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump 2019-03-06 20:13:30 -06: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
fickleheart
b9543d18b4 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Steel Titanium
b4e7e8e62f Merge branch 'master' into dontskipframes 2019-03-05 22:11:00 -05:00
Steel Titanium
a0b06044b1 Don't skip frames in software mode 2019-03-05 22:07:53 -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
Steel Titanium
3c1f0b5e3f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
Steel Titanium
c6900b6c89 Check using memcmp() 2019-03-03 22:43:21 -05:00
Steel Titanium
0b11424e3d Error if the lump is a PNG lump 2019-03-03 19:58:01 -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
Alam Arias
340d769386 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 17:33:32 -05:00
Alam Ed Arias
2eb26bc68e Fix building without BLUA support 2019-03-01 17:31:32 -05:00