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
Alam Arias
03783a589d
fix EOL in k_kart.c
2019-03-05 11:29:00 -05:00
James R
6949781ca2
Do not record replays when dedicated
2019-03-04 22:26:05 -08: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 Ed Arias
216644906b
Merge branch 'netreplays-errors' into 'new_netreplays'
...
Try to fix compiler errors
See merge request KartKrew/Kart-Public!90
2019-03-04 20:46:26 -05:00
Alam Arias
95c2967f35
more unsigned mess
2019-03-04 20:35:13 -05:00
Alam Arias
8b5f25caa0
the READ/WRITE marcos do not need ;
2019-03-04 20:27:01 -05:00
Alam Arias
c209e211ae
Fixed comparing unsigned/signed mess
2019-03-04 20:26:44 -05:00
Alam Arias
c68cfbdda0
Avoid ‘ncs’ being used uninitialized
2019-03-04 20:09:20 -05:00
Alam Arias
55d07235a4
do not overshadow demorecording
2019-03-04 19:16:46 -05:00
Alam Arias
bcebe2fcc2
Fixup max() mess
2019-03-04 19:10:43 -05:00
Alam Arias
e93a721ca1
Fixup unsigned mess
2019-03-04 19:07:34 -05:00
Alam Arias
95bb74c748
Merge branch 'master' into new_netreplays
2019-03-04 18:50:58 -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
James R
45236434af
Remove always true expression
2019-03-03 20:08:28 -08:00
James R
cb12da81c1
Use correct signedness in comparison
2019-03-03 20:02:49 -08:00
Steel Titanium
3c1f0b5e3f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
James R
50c42609a2
Merge remote-tracking branch 'origin/new_netreplays' into netreplays-errors
2019-03-03 19:53:25 -08:00
Steel Titanium
c6900b6c89
Check using memcmp()
2019-03-03 22:43:21 -05:00
fickleheart
eae568f03c
Merge remote-tracking branch 'remotes/netreplays/docs' into new_netreplays
2019-03-03 21:06:53 -06:00
fickleheart
8d6c6823f3
Maintain compat for record attack replays
2019-03-03 20:41:20 -06:00
fickleheart
3918d5e177
Fix missing argument in G_AdjustView call
2019-03-03 20:33:59 -06:00
fickleheart
18f34bc182
Merge remote-tracking branch 'remotes/netreplays/double-cmp-fix' into new_netreplays
2019-03-03 20:29:52 -06:00
fickleheart
68025a17e0
Merge remote-tracking branch 'remotes/netreplays/view-by-raceplace' into new_netreplays
2019-03-03 20:29:46 -06:00
fickleheart
1ca30c6a90
Merge remote-tracking branch 'remotes/netreplays/setviews-command' into new_netreplays
2019-03-03 20:29:40 -06:00
fickleheart
60c2cb2bb0
Merge remote-tracking branch 'remotes/netreplays/jitter-fix' into new_netreplays
2019-03-03 20:29:35 -06:00
fickleheart
2cecd2faf3
Cleanup :3c
2019-03-03 20:25:22 -06:00
fickleheart
843bc6bc1b
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-03 20:24:39 -06:00
fickleheart
fcbe62bbe2
Assign a server player in replays for Lua purposes
...
Unfortunately this doesn't seem to help sync much. It
at least prevents constant Lua errors I guess....
2019-03-03 20:24:35 -06: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
