mazmazz
aa22941d2c
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
TehRealSalt
40093a9213
Merge branch 'master' into rings
2019-03-12 01:27:11 -04:00
fickleheart
e536252a8a
Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
...
# Conflicts:
# src/k_kart.c
# src/p_mobj.c
2019-03-11 21:59:45 -05:00
fickleheart
5c4c0a5ff6
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fickleheart
e316963e1a
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
wolfs
f4947820e4
Merge branch 'maxskins-bump' into 'next'
...
Bump MAXSKINS to 128 + Clean up skin struct
See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
wolfy852
d0fe0abc9c
Remove disableSpeedAdjust
2019-03-11 17:23:41 -05:00
James R
b91701c948
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
TehRealSalt
6aa55bdbe2
Merge remote-tracking branch 'kartpublic/next' into fortnite
2019-03-11 13:49:12 -04:00
TehRealSalt
0f4fd73533
Try out boost stacking
2019-03-11 12:00:39 -04:00
TehRealSalt
74a757ad69
Merge remote-tracking branch 'kartpublic/next' into rings
2019-03-07 21:31:45 -05:00
TehRealSalt
40da3594c8
Mashing in record attack is now 100% chance for rings
...
and also rings persist through death, and you start with 5
2019-03-07 19:18:20 -05: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
wolfy852
33c85f4813
Clean up the skin_t struct
2019-03-06 21:18:01 -06:00
James R
92d463d422
Check that G_FindView actually found a view
2019-03-06 18:06:16 -08: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
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
fickleheart
8d6c6823f3
Maintain compat for record attack replays
2019-03-03 20:41:20 -06:00
fickleheart
2cecd2faf3
Cleanup :3c
2019-03-03 20:25:22 -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
Sally Cochenour
22cfbd8fd1
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
Alam Arias
c170be0051
signed and unsigned compare
2019-02-22 21:13:00 -05:00
Alam Arias
e741c3a0d6
if you going to use abs(), you need to work in signed types
2019-02-22 21:04:53 -05:00
Sally Cochenour
12dd8e49c0
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
Sally Cochenour
c257c83ff1
Add parentheses 2: Move parentheses
2019-02-22 19:11:50 -05:00
Sally Cochenour
a13d177a44
Add parentheses
2019-02-22 19:07:54 -05:00
Sal
5f4e52b4d8
Merge branch 'expose-splitscreen' into 'next'
...
Expose splitscreenplayer in player_t
See merge request KartKrew/Kart-Public!74
2019-02-22 19:04:48 -05:00
James R
f8928300ec
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
Sal
3980968707
Merge branch 'cherrypicks-from-netreplays' into 'next'
...
Misc fixes
See merge request KartKrew/Kart-Public!76
2019-02-22 18:45:44 -05:00
James
4f9109501e
Hyu b gone
2019-02-19 23:15:31 -05:00
fickleheart
a5a98eec2f
Fix count limiter not always working right for titledemo netreplays
2019-02-19 17:33:02 -06:00
fickleheart
9fac26c200
Fix cmd latency occasionally jumping to max
2019-02-19 08:05:35 -06:00
fickleheart
ae3348e24d
Allow viewing karma bombs during replays
2019-02-18 21:23:05 -06:00
fickleheart
6821297bce
Improve replay resyncing code
...
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
2019-02-18 21:10:23 -06:00
fickleheart
b731e63d76
Remove debug print
2019-02-18 20:54:37 -06:00
fickleheart
97a663745a
Use generic resync message for RNG desyncs
2019-02-18 20:51:02 -06:00
Latapostrophe
2b47818d66
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01:00
fickleheart
0b92743244
Support netreplays in titledemos
...
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
fickleheart
786e8875ae
Whoops, saving the wrong file list
2019-02-17 11:52:23 -06:00
fickleheart
ed16a35795
Don't force loading files for replays
2019-02-17 10:04:48 -06:00
fickleheart
20b83c84ef
Merge remote-tracking branch 'remotes/james/netreplays-autoaddons' into new_netreplays
2019-02-17 08:52:21 -06:00
james
76f2df2c40
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
fickleheart
63d07acc38
Fix duplicated player views from ResetViews
2019-02-16 22:24:37 -06:00
fickleheart
fb8ca7c760
Fix replays crashing upon completion
2019-02-16 22:19:05 -06:00
fickleheart
53fa9299c1
Fix views getting automatically changed in netreplays
2019-02-16 22:06:47 -06:00
fickleheart
5a5264e5dd
Fix multiplayer ghosts crashing the game sometimes
2019-02-16 21:55:08 -06:00