Sryder
07ecfbc1d7
Fix compile warnings.
2019-03-10 23:51:52 +00:00
fickleheart
c65ff70faf
Deduplicate character shifting code
2019-03-10 18:09:15 -05:00
fickleheart
c0ea785900
Remove unnecessary padding byte from stored challenge answers
2019-03-10 17:54:17 -05:00
fickleheart
0e58653727
Make sure we don't write kartspeed beyond SV_SPEEDMASK
2019-03-10 17:43:39 -05:00
fickleheart
048ce8496f
Make noises on the password entry screen
2019-03-10 17:36:16 -05:00
fickleheart
4a8d682b43
Draw a padlock on-screen!
2019-03-10 17:25:55 -05:00
fickleheart
f70163cfb9
Show notice of a password-protected server on the join screen
2019-03-10 17:00:27 -05:00
fickleheart
693da54d94
Properly close the connection on the server's side...
2019-03-10 16:22:03 -05:00
fickleheart
0c6f3c58e6
Update packettypenames
2019-03-10 16:06:46 -05:00
fickleheart
a834ada9ce
Merge remote-tracking branch 'remotes/upstream/next' into join-passwords
2019-03-10 15:54:06 -05:00
fickleheart
be79b4beec
Fix dehacked color list being wrong
2019-03-10 15:48:55 -05:00
fickleheart
82f3d2cdb8
Skip password check if node is already in-game? idk
2019-03-10 15:48:11 -05:00
fickleheart
bafa4cee7b
Improve stability when joining netgames maybe
2019-03-10 12:50:24 -05:00
fickleheart
426f4192be
Merge remote-tracking branch 'remotes/upstream/next' into join-passwords
2019-03-10 12:35:07 -05:00
colette
ef0130f951
Merge branch 'dontskipframes' into 'master'
...
Don't skip frames in software mode
See merge request KartKrew/Kart-Public!103
2019-03-10 13:29:10 -04:00
colette
8bed922a52
Merge branch 'thunder-fixes' into 'next'
...
Thunder shield-related changes
See merge request KartKrew/Kart-Public!110
2019-03-10 03:51:33 -04:00
fickleheart
ce81504410
Try a partial disconnect instead
2019-03-09 23:56:13 -06:00
fickleheart
386360ff43
Properly close and reopen the client connection for password challenges
2019-03-09 23:36:11 -06:00
wolfy852
499dcc6bdb
Kill all skin flags but SF_HIRES
2019-03-09 23:18:55 -06:00
fickleheart
3e1570c59d
Revert "Move HandleConnect to the same place as other packets"
...
This reverts commit 6bba2f16c0
.
2019-03-09 22:17:16 -06:00
colette
eec76cf4ec
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
416b723567
Fix improperly-resolved merge conflict
2019-03-09 21:08:29 -06:00
Alam Arias
d58cb1aae3
Merge branch 'next' into ping-stuff-take2
2019-03-09 22:02:11 -05:00
Alam Arias
50d0bf54e0
Merge branch 'master' into next
2019-03-09 22:00:25 -05:00
Alam Arias
cbe785d854
Please do not go past the doomdata_t space
2019-03-09 21:57:59 -05:00
fickleheart
766d4eec27
bah
2019-03-09 20:23:49 -06:00
Alam Arias
4bccc7a69f
Merge branch 'master' into ping-stuff-take2
2019-03-09 20:40:50 -05:00
Alam Ed Arias
08784ce58d
Merge branch 'master' into next
2019-03-09 20:37:17 -05:00
Alam Arias
6fb950002c
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:13:41 -05:00
Alam Ed Arias
60ca6ae06b
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
fickleheart
814c48805c
Disable stacking thunder shields
2019-03-09 17:28:05 -06:00
fickleheart
84631b1393
Make P_NukeEnemies (including K_DoThunderShield) scale by mapscale
2019-03-09 17:24:20 -06:00
Alam Arias
1410c515cb
Merge branch 'next' into join-passwords
2019-03-09 18:19:44 -05:00
Alam Arias
035ad5822c
c is only for chat_in
2019-03-09 18:18:14 -05:00
Alam Arias
5500e4c2df
fix VCHELP
2019-03-09 18:09:38 -05:00
fickleheart
d804dc3a34
Fix password auto-hiding if you type into it
2019-03-09 17:06:44 -06:00
Alam Arias
b1ec0442da
Merge branch 'master' into ping-stuff-take2
2019-03-09 18:05:30 -05:00
fickleheart
3bb014ea42
Make password toggle only affect password fields
2019-03-09 17:03:52 -06:00
fickleheart
ad3a32f500
Handle capslock in just one place...?
2019-03-09 16:55:18 -06:00
fickleheart
7c7034a229
More...
2019-03-09 16:49:23 -06:00
fickleheart
5f0c4271d7
Use consts in place of some 16s
2019-03-09 16:46:55 -06:00
fickleheart
e4d99605eb
Nudge lock over a tad
2019-03-09 15:27:23 -06:00
fickleheart
870a800d89
Toggle showing password with tab
2019-03-09 15:14:08 -06:00
Latapostrophe
b17c4e562e
Change default showping from Warning to Always
2019-03-09 22:01:52 +01:00
fickleheart
1b6035e322
Add join password to server host menu
2019-03-09 15:00:48 -06:00
fickleheart
d5691b9289
Show kartspeed and password status on server browser
2019-03-09 14:30:04 -06:00
fickleheart
2954b68e12
Check password and etc before downloading files
2019-03-09 13:30:22 -06:00
fickleheart
6bba2f16c0
Move HandleConnect to the same place as other packets
2019-03-09 12:01:47 -06:00
Latapostrophe
b621723d23
Fix boost / rocket sneakers for antigrav
2019-03-09 17:25:42 +01:00
TehRealSalt
4faaa932ec
Fix macro expansion warning Sryder got
2019-03-08 19:06:27 -05:00
Steel Titanium
77649ef6d1
Always return false instead.
2019-03-08 18:51:55 -05:00
TehRealSalt
87e91ebb2c
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
4f8665c785
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
fd92612382
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
Steel Titanium
0e2cefe251
Properly comment out the function
2019-03-07 18:52:27 -05:00
Steel Titanium
7731fe8c24
Fix unused function error
2019-03-07 18:20:57 -05:00
Steel Titanium
3acf674b8a
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public into dontskipframes
2019-03-07 18:13:16 -05:00
wolfy852
4e0518a85a
Merge branch 'master' into next
2019-03-07 00:23:17 -06:00
fickleheart
18dba65f17
Don't shoot asterisks off-screen on the join password screen
2019-03-06 23:34:30 -06:00
fickleheart
ddf2db8a36
Fix freeze when trying to host with a join password already set
2019-03-06 23:32:47 -06:00
fickleheart
0ed74b3066
Missed an include
2019-03-06 22:45:02 -06:00
fickleheart
219b240bcf
Recycle oldest challenges first if all are taken
2019-03-06 22:36:13 -06:00
wolfy852
a181cd24cd
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
bc46c3540f
Show message on incorrect password
2019-03-06 22:11:35 -06:00
fickleheart
52b743a18f
Fix join password not recognizing shifted characters
2019-03-06 22:07:28 -06:00
wolfy852
87d60eef86
Kill SF_RUNONWATER
2019-03-06 22:02:56 -06:00
fickleheart
b5c4866706
Add -remove option to joinpassword
2019-03-06 21:30:39 -06:00
wolfy852
75661f44d7
Clean up the skin_t struct
2019-03-06 21:18:01 -06:00
wolfy852
3873635629
Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump
2019-03-06 20:13:30 -06:00
James R
a858967762
Check that G_FindView actually found a view
2019-03-06 18:06:16 -08:00
Sally Cochenour
c18935fbdd
Reorder colors, ensure colored names are set properly
2019-03-06 03:15:07 -05:00
Sally Cochenour
f5fe073627
Fix floating lob items
2019-03-06 01:53:52 -05:00
fickleheart
264454ca70
hblurgle spburgle this code sucks
2019-03-05 22:27:25 -06:00
Steel Titanium
dc1786203d
Merge branch 'master' into dontskipframes
2019-03-05 22:11:00 -05:00
Steel Titanium
0f51f3b7e3
Don't skip frames in software mode
2019-03-05 22:07:53 -05:00
Sally Cochenour
f230e0d644
Put eggbox sniping behind an #if
...
On second thought, the old method is "sneakier"
2019-03-05 22:06:47 -05:00
Sally Cochenour
171ca1670e
Add banana snipe sound effect to eggboxes & sinks
2019-03-05 22:02:41 -05:00
Sally Cochenour
a3e00bdb0e
uncommited change...
...
💢
2019-03-05 21:25:37 -05:00
Sally Cochenour
4e570739fe
Make smoke opaque to reduce lag
2019-03-05 20:56:02 -05:00
Sally Cochenour
36a7e88e63
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
5760e106e5
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
Steel Titanium
ab4669978a
Allow names to be used with forceskin
2019-03-05 19:04:15 -05:00
Sally Cochenour
ae14d967ea
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
ea40a1b153
Merge branch 'next' into minor-item-tweaks
2019-03-05 17:18:27 -05:00
Alam Arias
b9abd8b9bc
fix EOL in k_kart.c
2019-03-05 11:29:00 -05:00
James R
af19a2c29d
Do not record replays when dedicated
2019-03-04 22:26:05 -08:00
James R
f57335deef
Check that lumps are okay
2019-03-04 22:13:22 -08:00
James R
62820bb4bf
Merge remote-tracking branch 'origin/next' into longdouble
2019-03-04 18:51:11 -08:00
Alam Ed Arias
0bf3834174
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
6b5f00eade
more unsigned mess
2019-03-04 20:35:13 -05:00
Alam Arias
71d0dfb046
the READ/WRITE marcos do not need ;
2019-03-04 20:27:01 -05:00
Alam Arias
dff82fffff
Fixed comparing unsigned/signed mess
2019-03-04 20:26:44 -05:00
Alam Arias
489ca12bd3
Avoid ‘ncs’ being used uninitialized
2019-03-04 20:09:20 -05:00
Alam Arias
3a4ed07e02
do not overshadow demorecording
2019-03-04 19:16:46 -05:00
Alam Arias
1bdd1506d9
Fixup max() mess
2019-03-04 19:10:43 -05:00
Alam Arias
db3d8eee50
Fixup unsigned mess
2019-03-04 19:07:34 -05:00
Alam Arias
618f8b1267
Merge branch 'master' into new_netreplays
2019-03-04 18:50:58 -05:00
Alam Arias
515fb9adad
Merge branch 'master' into next
2019-03-04 17:17:13 -05:00
Alam Arias
5537c62271
Merge remote-tracking branch 'upstream/master'
2019-03-04 17:16:37 -05:00
Alam Ed Arias
747995ae6a
Merge branch 'master' into next
2019-03-04 17:15:04 -05:00
Alam Ed Arias
67e246cd53
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
Alam Ed Arias
145ccfd405
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
Alam Arias
56e8f09ae8
fixed compiling for MSVC 2017
2019-03-04 16:33:06 -05:00
James R
d93b9b5eba
Remove always true expression
2019-03-03 20:08:28 -08:00
James R
89ea7f548e
Use correct signedness in comparison
2019-03-03 20:02:49 -08:00
Steel Titanium
9542a47f7f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
James R
705ee9980f
Merge remote-tracking branch 'origin/new_netreplays' into netreplays-errors
2019-03-03 19:53:25 -08:00
Steel Titanium
15323328c5
Check using memcmp()
2019-03-03 22:43:21 -05:00
fickleheart
353ea7d671
Merge remote-tracking branch 'remotes/netreplays/docs' into new_netreplays
2019-03-03 21:06:53 -06:00
fickleheart
61893c613c
Maintain compat for record attack replays
2019-03-03 20:41:20 -06:00
fickleheart
272ba600e2
Fix missing argument in G_AdjustView call
2019-03-03 20:33:59 -06:00
fickleheart
4b2938a540
Merge remote-tracking branch 'remotes/netreplays/double-cmp-fix' into new_netreplays
2019-03-03 20:29:52 -06:00
fickleheart
38d672620d
Merge remote-tracking branch 'remotes/netreplays/view-by-raceplace' into new_netreplays
2019-03-03 20:29:46 -06:00
fickleheart
56269cb62b
Merge remote-tracking branch 'remotes/netreplays/setviews-command' into new_netreplays
2019-03-03 20:29:40 -06:00
fickleheart
f83e02e3db
Merge remote-tracking branch 'remotes/netreplays/jitter-fix' into new_netreplays
2019-03-03 20:29:35 -06:00
fickleheart
ebd688f32f
Cleanup :3c
2019-03-03 20:25:22 -06:00
fickleheart
c6f6783f3e
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-03 20:24:39 -06:00
fickleheart
d560fef930
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
3d5d02fc15
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
James R
f0a0666223
Use long double suffix
2019-03-02 15:56:44 -08:00
Alam Arias
233033f213
Merge branch 'master' into next
2019-03-02 18:41:58 -05:00
Alam Arias
0d584a3145
Do not error about array bounds, some GCC versions's reporting is broken
2019-03-02 18:39:53 -05:00
Alam Arias
b9eb5c399b
Just do not warn about unsuffixed float constants
2019-03-02 18:39:10 -05:00
Sally Cochenour
b95d0ac279
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
d4f05e5be9
fixup merged mess for NO-LUA mess
2019-03-02 13:32:47 -05:00
Alam Arias
c56cae4d28
Merge remote-tracking branch 'origin/master' into upstream-merge
2019-03-02 13:27:10 -05:00
Alam Arias
24ae6107cf
Exported SDL_icon.xpm as srb2icon.png
2019-03-02 13:26:17 -05:00
Alam Arias
2657eb998e
fixed compiling without blua support
2019-03-01 17:46:19 -05:00
Alam Arias
ae368a3e0f
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 17:33:32 -05:00
Alam Ed Arias
c2618fd987
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
Alam Ed Arias
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
008b0bf560
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
Monster Iestyn
67e721e983
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Alam Arias
3d8e25e440
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:10:57 -05:00
Monster Iestyn
4459ecdd90
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
Sal
9210ab8497
Merge branch 'higher-maxnetnodes' into 'next'
...
Upped MAXNETNODES
See merge request KartKrew/Kart-Public!94
2019-03-01 06:29:52 -05:00
wolfy852
8e51cb18ba
Merge branch 'master' into next
2019-03-01 00:13:47 -06:00
wolfy852
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
wolfy852
cbb3145236
Stop Linux servers from hanging every 34 hours
...
This drastically increases the amount of time Linux servers can stay up for before hanging.
2019-02-28 18:51:57 -06:00
Alam Ed Arias
7cd60a544a
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
wolfs
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Sal
c41bc51e83
Merge branch 'color-fixes' into 'next'
...
Color fixes
See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
Steel Titanium
fa990e8603
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
e71977fe6a
Merge branch 'next' into banip-command
2019-02-27 16:03:01 -05:00
Steel Titanium
15b27bb7d7
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Steel Titanium
5975d3fb30
Add some parentheses
2019-02-27 15:55:39 -05:00
Steel Titanium
3b9c4fff52
Upped MAXNETNODES
2019-02-27 15:43:29 -05:00
Monster Iestyn
0340eb0b99
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Monster Iestyn
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
Sally Cochenour
135190616a
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:32:52 -05:00
Sal
60ae6a6470
Merge branch 'hyuu-fix' into 'next'
...
Fix Hyudoro being tangible to Jawz and Orbinauts
See merge request KartKrew/Kart-Public!79
2019-02-27 01:31:52 -05:00
Sally Cochenour
4f01202bb5
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:22:38 -05:00
Sally Cochenour
c6be0c24d1
Merge branch 'master' into next
2019-02-27 01:22:18 -05:00
Sally Cochenour
4ecd71d026
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
Sal
f08c8d018e
Merge branch 'water-update' into 'next'
...
Water update
See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
Sally Cochenour
9c14a2c58f
Merge branch 'next' into color-fixes
2019-02-27 00:09:39 -05:00
Sally Cochenour
44462d0dd7
10 new colors
...
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
Sally Cochenour
84251d003d
Merge branch 'next' into compiler-garbage
2019-02-26 18:09:26 -05:00
Sal
592ae58c79
Merge branch 'wipeout-particle-tweak' into 'next'
...
Wipeout particle tweak
See merge request KartKrew/Kart-Public!84
2019-02-26 17:50:13 -05:00
Sal
ea0a87d49c
Merge branch 'clang-fix' into 'next'
...
use fixed_t so abs() would work
See merge request KartKrew/Kart-Public!86
2019-02-26 17:49:28 -05:00
Sally Cochenour
22434949e5
Extend pingtable by 1 for the servermaxping entry
2019-02-26 17:44:35 -05:00
Sally Cochenour
1d3adb0491
Remove mixed declaration that triggers ERRORMODE on my setup
2019-02-26 17:33:10 -05:00
Monster Iestyn
a25f4b8194
Make sure that B_CheckRespawn can be called even if Tails is dead
2019-02-26 21:14:22 +00:00
Sally Cochenour
7de2cf8d39
Fix Super colors from base SRB2 giving a garbage color
2019-02-26 07:14:03 -05:00
Sally Cochenour
a993cffb69
Modify a few colors
...
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
James R
286866d2b6
d'oh
2019-02-24 17:59:13 -08:00
James R
e35f65eee2
Try to fix compiler errors
2019-02-24 17:47:33 -08:00
fickleheart
1499a47541
Change OGL splitscreen hack to match software behavior
2019-02-24 12:26:46 -06:00
fickleheart
9d30a0f2bc
Adjust FOV change for 2p
2019-02-24 11:59:21 -06:00
fickleheart
4143c31176
Add field-of-view support in software mode
2019-02-23 10:31:37 -06:00
fickleheart
d6b9a75230
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
Sally Cochenour
c543c35b91
Revert this minor change
2019-02-22 22:50:13 -05:00
Sally Cochenour
f91eb68b70
Update item table
...
Not looking forward to testing...
2019-02-22 22:49:27 -05:00
Alam Arias
d5a4759121
signed and unsigned compare
2019-02-22 21:13:00 -05:00
Alam Arias
cec79dee87
if you going to use abs(), you need to work in signed types
2019-02-22 21:04:53 -05:00
Sally Cochenour
014466cc67
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
Sal
5e9a11d467
Merge branch 'ping-stuff-take2' into 'next'
...
Ping improvements
See merge request KartKrew/Kart-Public!68
2019-02-22 19:13:49 -05:00
wolfy852
d9759df874
I don't think these old interfaces even compile but let's not kill them off
2019-02-22 18:13:22 -06:00
Sally Cochenour
b2d4ec501c
Add parentheses 2: Move parentheses
2019-02-22 19:11:50 -05:00
Sally Cochenour
df503c7f19
Add parentheses
2019-02-22 19:07:54 -05:00
Sal
6152657885
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
0eb30bceb7
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
Sal
2389bfd4cc
Merge branch 'item-odds-fixup' into 'next'
...
Simulate fractional precision on item odds
See merge request KartKrew/Kart-Public!70
2019-02-22 18:53:28 -05:00
Sal
0320b17f80
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request KartKrew/Kart-Public!73
2019-02-22 18:49:41 -05:00
Sal
447100a9ab
Merge branch 'cherrypicks-from-netreplays' into 'next'
...
Misc fixes
See merge request KartKrew/Kart-Public!76
2019-02-22 18:45:44 -05:00
Sally Cochenour
6b6fba841c
Banana snipe sfx
2019-02-22 18:43:10 -05:00
James R
04980044a1
I am pretty dumb
2019-02-21 22:54:09 -08:00
Alam Ed Arias
e36193e44e
Merge branch 'hide-error-devmode' into 'next'
...
Show line number on error, also hide under devmode
See merge request STJr/SRB2!458
2019-02-21 23:05:09 -05:00
Alam Arias
f454157af9
Merge branch 'master' into next
2019-02-21 22:54:29 -05:00
Alam Arias
8db5bda230
Merge remote-tracking branch 'upstream/master'
2019-02-21 22:50:58 -05:00
Alam Ed Arias
2f8eadd211
Merge branch 'master' into next
2019-02-21 22:42:26 -05:00
Steel Titanium
bfbb83df23
Save when quitting the game.
...
Also use default reason if not custom reason is given.
2019-02-21 19:48:15 -05:00
Steel Titanium
bf2f6ebc09
Save ban list right after banning.
2019-02-21 19:47:00 -05:00
Steel Titanium
c9d90f7688
Add command to ban an IP address.
2019-02-21 19:44:18 -05:00
Steel Titanium
c1deea0714
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
Sally Cochenour
a6dd439e99
Grow cancel
...
Needs item table changes to make it less OP
2019-02-21 17:04:58 -05:00
James R
1b2813b9d5
Document the playdemo command
2019-02-20 19:25:56 -08:00
james
c32d7f6745
Add race placement criteria to view command
2019-02-20 19:13:32 -08:00
james
fc8dc63f95
Add setviews command
2019-02-20 19:05:40 -08:00
James R
0e1d7ec6c6
Remove jitters in view command
2019-02-20 18:58:17 -08:00
wolfy852
84755ec171
Handle things in a more sensible way
2019-02-20 19:04:18 -06:00
wolfy852
23f1974117
Bump MAXSKINS to 128
...
Can't believe people actually need this now.
2019-02-20 18:55:53 -06:00
Steel Titanium
2d34df535d
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into banip-command
2019-02-20 17:59:12 -05:00
James
38ad726e55
Modify momz underwater for lots of things in k_kart.c
2019-02-19 23:38:16 -05:00
fickleheart
879d3aa1a8
Hold on, this works.
2019-02-19 22:21:07 -06:00
wolfy852
f34ed24132
Correct an oversight
2019-02-19 22:20:18 -06:00
James
09c3fd4329
Hyu b gone
2019-02-19 23:15:31 -05:00
wolfy852
4970df47e1
Merge branch 'next' into file-exploit-fix
2019-02-19 22:13:03 -06:00
James
68b8ec8162
Wipeout particles come from back wheels
2019-02-19 23:01:19 -05:00
wolfy852
df1a22d5fd
Fix Hyudoro being tangible to Jawz and Orbinauts
2019-02-19 21:27:14 -06:00
James
ca87cfbf01
Water skipping speed requirements are stricter
2019-02-19 21:57:56 -05:00
Steel Titanium
0913a623fb
Some small changes.
2019-02-19 21:22:35 -05:00
James
ff57b4bc22
Missed a line
2019-02-19 20:29:53 -05:00
fickleheart
d2c708ba93
Maybe this is a better way to work around the DrawMasked crash...
2019-02-19 19:27:08 -06:00
fickleheart
766ceabf91
Maybe this is a better way to work around the DrawMasked crash...
2019-02-19 19:26:32 -06:00
James
f822eb94cf
Reduce explosion radius, lives forever, longer startup
2019-02-19 20:19:01 -05:00
wolfy852
30d37ce4ca
...remove this forgotten comment too while I'm at it.
2019-02-19 18:54:24 -06:00
wolfy852
1fb65c72ff
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06:00
James
2f4d3eb087
Mines can be punted
...
Setting behind leaves a longer startup animation window so that it can be punted more easily
2019-02-19 18:38:54 -05:00
fickleheart
7a80195ed7
Fix count limiter not always working right for titledemo netreplays
2019-02-19 17:33:02 -06:00
Sal
66c4354115
Merge branch 'make-bumpcode-perfecter' into 'next'
...
Make bumpcode perfecter
See merge request KartKrew/Kart-Public!77
2019-02-19 18:09:30 -05:00
fickleheart
a59a1c53b0
Add check to all of the friction stuff
2019-02-19 17:05:04 -06:00
fickleheart
8988927d16
Only apply friction changes on the ground
2019-02-19 16:46:48 -06:00
Alam Arias
ed3f9e2464
Merge branch 'master' into next
2019-02-19 17:21:13 -05:00
Sal
ee57ab9afe
Merge branch 'shrink-removed-checks' into 'next'
...
Add some P_MobjWasRemoved checks around code that shrink touches
See merge request KartKrew/Kart-Public!72
2019-02-19 17:14:08 -05:00
Sal
eabe8fbadd
Merge branch 'lua-archive' into 'next'
...
Fix dedicated server extra lua variables not being synched for joiners
See merge request KartKrew/Kart-Public!75
2019-02-19 17:10:52 -05:00
Sal
d85dcd073a
Merge branch 'latency-tweaks' into 'next'
...
Fix cmd latency occasionally jumping to max
See merge request KartKrew/Kart-Public!78
2019-02-19 17:05:45 -05:00
fickleheart
580e12a32a
Add null check too
2019-02-19 16:04:23 -06:00
James
4480a1c55a
Merge branch 'master' into minor-item-tweaks
2019-02-19 16:20:32 -05:00
fickleheart
9c5ae02755
Fix cmd latency occasionally jumping to max
2019-02-19 08:05:35 -06:00
fickleheart
838ed005d2
Remove debugging print
2019-02-18 23:39:08 -06:00
fickleheart
caf7888eed
Fix players sometimes snapping backwards on landing after spikeball hits
2019-02-18 23:35:24 -06:00
fickleheart
9c1749d269
Make extra sure we launch in the correct direction
2019-02-18 23:35:01 -06:00
fickleheart
a4c8388f3b
Fix bumps sometimes shooting off stupidly fast
2019-02-18 22:36:26 -06:00
fickleheart
324108d120
Force intermission to 10 seconds on replays
2019-02-18 21:33:15 -06:00
fickleheart
188552e069
Allow viewing karma bombs during replays
2019-02-18 21:23:05 -06:00
fickleheart
a4ac2b000f
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
9eb669a061
Crash fix I think (CHERRY PICK INTO BASE)
2019-02-18 21:09:22 -06:00
fickleheart
9da5b9ae6a
Crash fix I think (CHERRY PICK INTO BASE)
2019-02-18 21:08:11 -06:00
fickleheart
96972c9ae9
Remove debug print
2019-02-18 20:54:37 -06:00
fickleheart
0d31981dc2
For now, only use netreplays on the title if available
2019-02-18 20:52:21 -06:00
fickleheart
a2b5b76b98
Let titledemos play while game is unfocused
2019-02-18 20:51:28 -06:00
fickleheart
3a3b623e34
Use generic resync message for RNG desyncs
2019-02-18 20:51:02 -06:00
Latapostrophe
86a9168e86
Fix dedicated server extra lua variables not being synched for joiners
2019-02-18 22:19:28 +01:00
Latapostrophe
91ce3617ef
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01:00
james
c74b05eadc
Remove extra whitespace
2019-02-17 23:09:52 -08:00
Steel Titanium
a2316389d2
Save when quitting the game.
...
Also use default reason if not custom reason is given.
2019-02-18 02:04:58 -05:00
Steel Titanium
6915605444
Save ban list right after banning.
2019-02-18 01:03:39 -05:00
Steel Titanium
f39bd03e10
Add command to ban an IP address.
2019-02-18 00:58:08 -05:00
James
4c3871cb6d
Some items have 30 sec cooldown on match start
2019-02-18 00:23:40 -05:00
James
1bce9d281d
Shrink timer is consistent 20sec
2019-02-18 00:17:58 -05:00
fickleheart
6f3b10313f
Add some P_MobjWasRemoved checks around code that shrink touches
...
It's the only place in the vanilla game where K_DropItems
is called that isn't from a direct collision with the player
it's being called on. It's also a syncfail that doesn't happen
anywhere else, and I saw my sync state appear to get slightly
corrupted when it happened. Let's see if this fixes anything...
2019-02-17 22:09:37 -06:00
wolfy852
b9264821a2
Merge branch 'upsidedown-brain' into next
...
# Conflicts:
# src/k_kart.c
# src/k_kart.h
2019-02-17 20:45:12 -06:00
james
46edc1e330
Create the correct dummy function
2019-02-17 15:50:42 -08:00
Latapostrophe
54ae277bff
Expose battlefullscreen and battlecomebacktimer huds to lua
2019-02-17 23:39:00 +01:00
fickleheart
c260e27cd9
Support netreplays in titledemos
...
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
fickleheart
a6dff0a324
Whoops, saving the wrong file list
2019-02-17 11:52:23 -06:00
fickleheart
d1d270c09d
Don't force loading files for replays
2019-02-17 10:04:48 -06:00
fickleheart
ed7afc4267
Missed a ResetView line
2019-02-17 10:03:34 -06:00
fickleheart
28b4d4a152
Merge remote-tracking branch 'remotes/james/netreplays-autoaddons' into new_netreplays
2019-02-17 08:52:21 -06:00
james
1785adffc2
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
fickleheart
a6bc581520
Fix duplicated player views from ResetViews
2019-02-16 22:24:37 -06:00
fickleheart
c00abd1683
Remove unnecessary ResetViews call
2019-02-16 22:19:17 -06:00
fickleheart
b6cc96ad68
Fix replays crashing upon completion
2019-02-16 22:19:05 -06:00
fickleheart
1c5e525db1
Fix views getting automatically changed in netreplays
2019-02-16 22:06:47 -06:00
fickleheart
3bd47b3beb
Fix multiplayer ghosts crashing the game sometimes
2019-02-16 21:55:08 -06:00
fickleheart
be353c9260
Reset views away from spectators
2019-02-16 21:07:11 -06:00
fickleheart
6e44952d50
Fuck you
2019-02-16 20:53:15 -06:00
fickleheart
7a7ea255bf
Merge remote-tracking branch 'remotes/james/netreplays-viewcommand' into new_netreplays
...
# Conflicts:
# src/g_game.c
2019-02-16 20:20:11 -06:00
fickleheart
276373123e
Add cvar for netreplay saving options
2019-02-16 18:29:51 -06:00
james
9d85c2e064
Actually support no apng patch
2019-02-16 14:39:33 -08:00
james
7e77e0c429
Support libpng without the apng patch and fix mingw (?) compiler errors
2019-02-16 14:20:55 -08:00
fickleheart
35be2e0be6
Don't prevent exiting games while recording at all
2019-02-16 16:16:35 -06:00
fickleheart
450efc3180
Merge remote-tracking branch 'remotes/james/netreplays-responder-fix' into new_netreplays
2019-02-16 15:50:46 -06:00
fickleheart
fcfce0bd49
Double default replay size
2019-02-16 15:49:54 -06:00
fickleheart
ca401aac8a
Try to keep the RNG seed in sync
2019-02-16 14:24:00 -06:00
fickleheart
b006ac447f
Remove debug-related code
2019-02-16 13:58:32 -06:00
fickleheart
e7488f8d76
Backwards compat for old replays
2019-02-16 13:49:31 -06:00
fickleheart
4bea570143
Resync items and bumpers in replays
2019-02-16 13:42:21 -06:00
fickleheart
08296d372d
???
2019-02-16 13:10:58 -06:00
fickleheart
78adae109a
[WIP, CRASHES] Save ghost data in netreplays
2019-02-16 12:42:24 -06:00
fickleheart
1fa32a4b9d
Improve replay resyncing code
...
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
2019-02-16 11:52:35 -06:00
fickleheart
e2b392805a
Simulate fractional precision on item odds
...
This notably prevents some items from disappearing
completely above 8 players in netgames.
2019-02-16 10:33:18 -06:00
wolfy852
82dbf45fa4
Fix compiler warnings
2019-02-16 08:32:14 -06:00
wolfy852
04fe5de985
Incomplete: Split files added with -file into their own array
...
Compiles with no errors but the game errors on launch. With no files added, it gives "W_InitMultipleFiles: no files found". With files loaded via -file it gives "W_GetNumForName: PLAYPAL not found!"
2019-02-16 08:16:56 -06:00
wolfs
32d1f75199
Merge branch 'fix-battle-boost' into 'next'
...
Set flashing tics to 0 after boosting
See merge request KartKrew/Kart-Public!67
2019-02-16 08:31:08 -05:00
wolfy852
76893f4644
Don't kill flashing tics for floor boosts
2019-02-16 07:03:56 -06:00
Latapostrophe
24516cbf84
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
wolfy852
c370a86f48
Set flashing tics to 0 after boosting
2019-02-16 06:37:09 -06:00
wolfs
97aeb13db3
Merge branch 'fix-offroad' into 'next'
...
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts
See merge request KartKrew/Kart-Public!62
2019-02-16 07:02:13 -05:00
wolfy852
fc6086cfd8
Merge branch 'master' into next
2019-02-16 06:00:31 -06:00
wolfs
c170d01edf
Merge branch 'disable-soundsystem' into 'master'
...
Do not start sound system when disabled
See merge request KartKrew/Kart-Public!58
2019-02-16 06:24:12 -05:00
Latapostrophe
a119d1cddd
Lower default ping timeout + Fix chat arrows being missing while we're at it
2019-02-16 12:19:03 +01:00
wolfs
da3772134a
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-16 06:18:22 -05:00
wolfs
5ff03d38f5
Merge branch 'fix_nonet' into 'master'
...
Fix NONET
See merge request KartKrew/Kart-Public!60
2019-02-16 06:11:43 -05:00
wolfs
abb3e8e4e3
Merge branch 'fix-no_lua' into 'master'
...
Fix NO_LUA
See merge request KartKrew/Kart-Public!66
2019-02-16 06:10:03 -05:00
Latapostrophe
95bbb0d833
Remove debug stuff
2019-02-15 21:10:18 -06:00
Latapostrophe
7abf8e0f11
Forgot to change this back from testing
2019-02-15 21:08:56 -06:00
wolfy852
07e56e550e
New visuals for ping and fps display alike [REDO]
2019-02-15 21:08:08 -06:00
Latapostrophe
3349b9b196
forgot to remove this print
2019-02-15 20:53:18 -06:00
wolfy852
6054901c62
Ping kick changes + other quality of life improvements [REDO]
2019-02-15 20:51:44 -06:00
james
c95928b46f
I shouldn't be surprised
2019-02-15 17:30:27 -08:00
Steel Titanium
bcd5176ad1
Update project files
2019-02-14 21:32:57 -05:00
Steel Titanium
de9e25d5b3
Add missing ifdefs
2019-02-14 20:59:07 -05:00
James R
462e4fb863
Add support for an optional file list embeded in demos
...
Ghosts are also supported. The playback function can read demos without this
file list--it is a flag.
2019-02-14 14:02:47 -08:00
james
1b604273d4
Wait for HU_Responder and friends to finish eating before viewpoint control
2019-02-13 20:21:09 -08:00
james
97aeb27eda
Fix "Return to title" doing NOTHING during recording
2019-02-13 20:20:31 -08:00
james
fb4cd26aed
Support splitscreen views in netreplays with less than four players
...
The first view is also not changed if there are no players to view.
2019-02-13 16:22:32 -08:00
wolfy852
3a3dd42b89
Add pogospring to itemenabled
2019-02-13 05:37:13 -06:00
james
4a2d187472
view command: match names case-insensitively
2019-02-12 19:16:36 -08:00
james
9eec83da95
Support CMake for apng
2019-02-12 17:01:27 -08:00
james
329c2ebdc8
Update copyright year
2019-02-11 16:01:02 -08:00
james
b43e6a7199
Support libpng versions prior to 1.6 and 1.5
...
Tested confirmed for...
1.5.30
1.4.22
1.2.59
2019-02-11 15:47:48 -08:00
Steel Titanium
76724c9c13
Show line number on error, also hide under devmode
2019-02-11 16:39:58 -05:00
Monster Iestyn
e6cb47e2f2
Merge branch 'fix_skins_overflow' into 'next'
...
Fix skin overflow error
See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
james
79736e40aa
Support aPNG in new versions of libpng
...
A known issue: iTXt cannot be written (yet). I may do something about that.
For now, this is likely good enough. Who cares about the extra text anyway?
2019-02-10 23:52:02 -08:00
wolfy852
1ba39672d4
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts
2019-02-10 22:55:27 -06:00
james
b331b51178
Use less confusing player sorting key names
2019-02-09 18:10:54 -08:00
toaster
f0d536b7ee
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
James R
55430e3068
Open a new connection before we check socket errors
...
And somehow this applies if you use `addfile` after having added the server.
Some claim that there are other cases too.
2019-02-09 07:50:26 +00:00
fickleheart
dd75c1621c
Fix compile warnings
2019-02-06 21:03:05 -06:00
fickleheart
6da810a994
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2019-02-06 20:47:35 -06:00
fickleheart
e140127180
Format for better consistency with the codebase
2019-02-06 20:25:45 -06:00
fickleheart
61bb44463f
Fix views not setting properly when adding multiple at once
2019-02-06 20:25:27 -06:00
fickleheart
f10237ea3d
Merge remote-tracking branch 'remotes/james/netreplays-scoreshud' into new_netreplays
2019-02-06 19:48:57 -06:00
james
dd45cfc757
Do not start sound system when disabled
2019-02-06 17:24:13 -08:00
toaster
970a8ee89d
Fix off-by-one errors in item odds, and add a little assert to make an assumption in this function that was being violated more explicit.
2019-02-06 13:28:21 +00:00
Sally Cochenour
1c3fe3ce83
Kill me
2019-02-06 01:31:42 -05:00
Sally Cochenour
094ca5241a
Merge branch 'next'
2019-02-05 22:02:08 -05:00
Sally Cochenour
276e2d3335
Merge branch 'next'
2019-02-05 21:10:55 -05:00
Sal
8a5d740c85
Merge branch 'whitespace' into 'next'
...
Clean up Whitespace
See merge request KartKrew/Kart-Public!56
2019-02-05 19:03:02 -05:00
Alam Arias
dc5024f94c
remove whitespaces
2019-02-05 15:42:37 -05:00
Alam Arias
cc363086f9
fixup EOL in kart files
2019-02-05 15:36:30 -05:00
james
bbd2d84642
Show scores but not "Player 1" in netreplays
2019-02-04 21:23:48 -08:00
james
3a8d7af712
Restrict viewn command to netreplays
2019-02-04 20:48:48 -08:00
james
6dc04ab957
Bleh old stuff
2019-02-04 20:29:52 -08:00
james
8f47b55d29
Do not round player numbers in range
...
(fickle's suggestion.)
2019-02-04 20:16:54 -08:00
james
e52641d15a
Expose G_ResetView and amend G_ResetViews
...
(fickle's suggestion.)
2019-02-04 20:13:30 -08:00
Sally Cochenour
9a2e65c61c
Merge branch 'next' into version-prep
2019-02-04 22:22:24 -05:00
Sally Cochenour
8e41f09c59
why does this trigger ERRORMODE now?!
2019-02-04 22:22:12 -05:00
Sally Cochenour
75b0dd3c1b
Update patch.kart hash
2019-02-04 22:02:34 -05:00
Sally Cochenour
f46eab6b8a
Update version
2019-02-04 22:00:36 -05:00
james
ac9356a02b
Automatically load splits up to new viewpoint
...
Basically, you can start viewing your third split and the second one views
another!
2019-02-04 17:58:55 -08:00
james
67d6ee3b12
Shut up when our "new" viewpoint is just the same
...
Also actually correct for new splits.
2019-02-04 17:54:41 -08:00
Sryder
3b61cba1a7
The string that got away from my memory
2019-02-04 22:02:40 +00:00
Sryder
76ea671763
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout
2019-02-04 21:55:19 +00:00
Sryder
caba5cb02e
P_NetKeepAlive should also be here because it potentially pauses mid-game!
2019-02-04 21:54:10 +00:00
Sal
b36f73ee46
Merge branch 'ingame-player-cap' into 'next'
...
"In-game player" cap
See merge request KartKrew/Kart-Public!48
2019-02-04 15:44:50 -05:00
James R
ee8948d627
Add support for changing viewpoint via console
...
This isn't just a shameless console-empowerement. More precise "spying" can
benefit everybody. But especially in net-replays, this is almost necessary.
2019-02-04 03:09:40 -08:00
Sally Cochenour
fd529f9363
fickle suggestions
2019-02-03 23:23:41 -05:00
Sally Cochenour
26accf087e
Instant lookback
...
Still weird snap but this is as good as it'll get short of throwing away all of the camera code
2019-02-03 23:13:42 -05:00
toaster
55bb82eae8
Change order of operations so that fullscreen stuff is done in front of minimap, to match other two/three players in 3/4p.
2019-02-03 23:50:02 +00:00
toaster
503e4f977f
Show WANTED and minimap in battle splits even when p1 is nuked.
2019-02-03 23:37:19 +00:00
toaster
068ee93422
gotta break a few eggboxes to fix a crash
2019-02-03 23:09:09 +00:00
Sally Cochenour
98af218d2c
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
Sally Cochenour
a6ac6ecdc5
Missed this
2019-02-03 17:15:33 -05:00
Sally Cochenour
59730c5db6
In-game player cap & spectator queue
...
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
fickleheart
7aa83635ae
Record net replays to replay/online/
2019-02-03 14:29:54 -06:00
fickleheart
fe7c6c7f83
Add support for encore and battle replays
2019-02-03 13:55:29 -06:00
Sryder
dff5cb049f
rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does
2019-02-02 21:53:27 +00:00
Sryder
1bf584c079
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout
2019-02-02 21:51:49 +00:00
toaster
06b3e265f5
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
fickleheart
ce59b705a4
Play generic intermission music after netreplays
...
Mostly because I kept cycling to other people after the
top half finished and always got the lose music as a
result lol
2019-02-02 10:54:24 -06:00
Sal
3f283fd2a9
Merge branch 'flying-sharks-suck' into 'next'
...
Flying sharks suck
See merge request KartKrew/Kart-Public!46
2019-02-02 01:45:42 -05:00
Sally Cochenour
d9f16d2aaf
Offroad code cleanup
2019-02-02 01:43:32 -05:00
fickleheart
c407f811af
Fix map name not showing right on replay intermission
2019-02-02 00:24:15 -06:00
Sally Cochenour
6a14d79cf0
Offroad spark fix & sink
2019-02-02 00:58:51 -05:00
fickleheart
71d1d10ef6
Play intermission after net replays
2019-02-01 21:06:52 -06:00
fickleheart
e76e3f2281
something
2019-02-01 20:50:33 -06:00
fickleheart
28b9c5fc7d
Fix P3 getting the wrong split flags in 3p splitscreen
2019-02-01 20:20:14 -06:00
fickleheart
ba07224a8f
Make replays single-view by default unless requested
2019-02-01 20:19:52 -06:00
fickleheart
3724d02e3b
Allow changing all players' viewpoints in replays
2019-02-01 19:53:52 -06:00
fickleheart
4de79f13af
Refactor view changes a bit
2019-02-01 19:46:58 -06:00
fickleheart
0ab690bc60
Draw player names in netreplays
2019-02-01 19:28:05 -06:00
toaster
b332a3e163
Tweak incorrect capitalisation.
2019-02-01 18:51:15 -05:00
wolfy852
85f3be5889
Comment out type
2019-02-01 15:45:53 -06:00
wolfy852
b5b4e1fcc8
Skip over type
...
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
fickleheart
09eef5f6b1
Make the join sync hack a little more robust
2019-02-01 07:50:42 -06:00
fickleheart
7f7dd0097b
wip replay viewpoint stuff heck im tired zzz good night
2019-02-01 01:32:35 -06:00
fickleheart
43c4917e96
Tack on a timestamp to replay filenames
2019-02-01 01:01:14 -06:00
fickleheart
e5be5e80ba
Make joins/quits/enters/spectates sync in replays
...
I'm not 100% sure on joins. That P_RandomByte() call
looks ugly. It'll probably be a source of trouble.
2019-02-01 00:44:35 -06:00
wolfy852
7c18d130f2
Fix replay weirdness
...
Sryder's Pleasure Castle ghost tries to return to England with this line.
2019-01-31 23:21:00 -06:00
fickleheart
6a131f368f
Fix replay split breaking with less than four viewpoints
2019-01-31 23:03:44 -06:00
wolfy852
9ddea94590
Potentially fix 64-bit builds crashing on certain replays
2019-01-31 19:15:28 -06:00
fickleheart
0c11562209
4p split views test
2019-01-31 00:00:28 -06:00
Sally Cochenour
34b027e8ba
Shift around flashing bump stuff
2019-01-30 15:57:46 -05:00
Sally Cochenour
9984f0e217
Reorganize these checks
2019-01-30 15:43:45 -05:00
Sally Cochenour
f3644505be
Increase target cone for Race
2019-01-30 15:41:15 -05:00
Sally Cochenour
3cb468aec8
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
Sally Cochenour
a3cd131017
Don't bump while flashing
2019-01-30 15:02:24 -05:00
Sally Cochenour
9d51ef8e82
Play hit confirm sound for shields
2019-01-30 14:42:24 -05:00
Sally Cochenour
a81546177d
Speed updates based on number of orbiting items
2019-01-30 14:24:04 -05:00
Sryder
e63b6aee00
Fix Connection Timeouts during Wipes
...
Keep the connection alive with a specific packet to say we haven't timed out
2019-01-30 19:18:51 +00:00
Sally Cochenour
bc4832aa40
Slower orbit, always have 1 orbit item deploy behind you, and higher gravity for Orbinaut/Jawz
2019-01-30 14:14:24 -05:00
Latapostrophe
4c19c36fbb
Small optimization + item throwing + battle stuff
2019-01-30 15:25:41 +01:00
Sally Cochenour
c1fde7bfb7
Thin the rest of this screen's stuff too
2019-01-30 01:21:20 -05:00
Sal
51fa9b7359
Merge branch 'item-experiment' into 'next'
...
Item experiment
See merge request KartKrew/Kart-Public!39
2019-01-30 01:19:16 -05:00
Sal
cf06f108ed
Merge branch 'majormods' into 'next'
...
Allow playing in Record Attack with minor add-ons
See merge request KartKrew/Kart-Public!31
2019-01-29 23:19:57 -05:00
Sal
036c1ee929
Merge branch 'expose-serversort' into 'master'
...
Expose serversort to console
See merge request KartKrew/Kart-Public!43
2019-01-29 23:16:43 -05:00
Sally Cochenour
70a70b8a97
Merge branch 'master' into offroad-stuff
2019-01-29 20:22:15 -05:00
Sally Cochenour
eda13915a8
Merge branch 'next' into offroad-stuff
2019-01-29 20:22:11 -05:00
Latapostrophe
4261e0b61a
Start of a fix for antigrav
2019-01-30 00:30:48 +01:00
Sally Cochenour
9e8b038719
Merge branch 'master' into item-experiment
2019-01-29 15:07:04 -05:00
Sally Cochenour
fc512318bd
Merge branch 'next' into item-experiment
2019-01-29 15:06:58 -05:00
Steel Titanium
e118ec9399
Remove CV_HIDEN flag for serversort
2019-01-29 13:27:43 -05:00
Sally Cochenour
1e61cc6152
Better cpusleep
...
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -05:00
Sally Cochenour
80d1c303e3
Reduce frequency of Eggman items, give some of those points to Orbinaut or Banana
2019-01-28 12:47:23 -05:00
toaster
d3bf1d55ef
You will never have Lua consoleplayer.
...
(This is a quick, cheap hack to make splitscreen not almost impossible to support in major mods like Wipezones.)
2019-01-28 17:28:15 +00:00
toaster
ada4ce622f
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution?
...
* Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...)
* Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error.
* Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
Sally Cochenour
38ca2ab98a
Sparks can't be started in offroad
2019-01-27 23:25:03 -05:00
Sally Cochenour
0ef442c004
Change offroad leniency from 1 second to 0.5 seconds, don't make friction more forgiving in offroad
2019-01-27 23:18:40 -05:00
Sally Cochenour
5518a19945
Wipeout slowdown in offroad is static
2019-01-27 22:28:44 -05:00
Sally Cochenour
c53144ecd6
Wipeout slowdown is x2 strength
2019-01-27 21:58:44 -05:00
Sally Cochenour
8a97b28936
Wipeout slowdown timer is set to 20 tics if below, instead of adding up per bump.
2019-01-27 21:58:17 -05:00
Sally Cochenour
dd2b895e80
Remove offroad leniency bias
...
Everyone now has flat, equal 1-second leniency
2019-01-27 21:57:18 -05:00
fickleheart
e13e6c5c9b
Fix replay viewer discarding aim keys
2019-01-27 20:36:13 -06:00
Sally Cochenour
e9887b2675
Apply to TAB rankings too
2019-01-27 21:11:49 -05:00
fickleheart
d05a3a59c4
Write respawn command usage to replays
2019-01-27 19:30:20 -06:00
fickleheart
f7e12165ba
Write extra data before cmds
...
This will probably nip a possible issue
with player cmds getting read/wrote inconsistently
if a player joins or leaves.
2019-01-27 19:10:25 -06:00
fickleheart
49caebd2db
Fix crashing at the end of netreplays
2019-01-27 19:09:29 -06:00
fickleheart
c6248faa30
Write skin/color/name changes to replay
2019-01-27 19:07:30 -06:00
fickleheart
314b2769a9
Fix invalid numlaps value being written when set to map default
2019-01-27 17:58:13 -06:00
fickleheart
3a467889ae
Fix spectators spawning as players in netreplays
2019-01-27 17:48:39 -06:00
fickleheart
cf6e3a45d7
Reset oldcmd when recording netreplays
2019-01-27 17:09:25 -06:00
Sally Cochenour
1f90a04623
Thin names for 9+ player intermission
2019-01-27 17:52:53 -05:00
Sally Cochenour
55c6ab2581
Scale number of allowed invuln items w/ player count
...
0-5 players: 1 invincibility/grow allowed out at once
6-9 players: 2 invincibilities (how it was before)
10-13 players: 3 invincibilities
14+ players: 4 invincibilites
2019-01-27 17:51:46 -05:00
fickleheart
3cec3d9658
broken spectator stuff?
2019-01-27 16:23:34 -06:00
fickleheart
26770c5103
[HACK] Save correct lap count on netreplays
2019-01-27 15:45:42 -06:00
fickleheart
ab226c1e39
Move where multiplayer replays are started
...
This particularly allows a server to record the
first map after startup as a replay. Players
joining mid-map can no longer record replays tho
2019-01-27 15:45:08 -06:00
fickleheart
894db0c6fd
Store cmd.latency in replays
2019-01-27 15:09:58 -06:00
fickleheart
83738a20b7
Fix players spawning in the wrong spots when watching replays
2019-01-27 14:34:22 -06:00
fickleheart
6dcc4de979
Separate oldtic for each player
2019-01-27 14:34:19 -06:00
fickleheart
74c37ed06c
Record all players' ticcmds in multiplayer
2019-01-27 14:34:01 -06:00
fickleheart
712dfdc3d1
Fix compile errors
2019-01-27 14:33:57 -06:00
fickleheart
1fb34ab65d
lol test net replay stuff
2019-01-27 14:33:54 -06:00
fickleheart
c9444116dd
I don't wanna deal with ghosts right now
2019-01-27 14:33:51 -06:00
fickleheart
dee45fdf62
Store initial player data in net replay
2019-01-27 14:33:45 -06:00
fickleheart
1f72df4edb
Start with some strange multiplayer replay init stuff
...
Mostly just disabling the parts of the replay that assume
a single player, right now.
# Conflicts:
# src/g_game.c
2019-01-27 14:33:38 -06:00
Sally Cochenour
e0f7ab6ad4
Merge branch 'master' into item-experiment
2019-01-27 15:14:56 -05:00
Steel Titanium
0aa965c59f
How did I forget about this
2019-01-26 23:22:30 -05:00
Steel Titanium
bce093fd06
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
Sryder
2c6799c52a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next
2019-01-26 21:46:20 +00:00
ThatAwesomeGuy173
eb29063ef1
Use actual characters instead of ASCII codes as per Sryder's suggestion
2019-01-26 14:15:37 -07:00
Sryder
90bdf11346
Merge branch 'no-cheese' into 'next'
...
No respawn cheese
See merge request KartKrew/Kart-Public!32
2019-01-26 16:08:36 -05:00
toaster
ce09566e11
Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
...
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
Latapostrophe
f8fd2c5190
Changed condition to being mid-air, changed print and changed the kick to a return
2019-01-26 19:40:12 +01:00
Sal
910df92d5a
Merge branch 'expose-more-lua-stuff' into 'next'
...
More Lua stuff + PlayerCmd hook
See merge request KartKrew/Kart-Public!28
2019-01-26 13:19:41 -05:00
toaster
1a21c5efbe
Code cleanup as requested by Sal and Sryder.
...
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
Latapostrophe
9028783190
Only prevent respawn if spun out in midair and added a Got_Respawn check to kick cheaters
2019-01-26 17:40:05 +01:00
Latapostrophe
72133b7498
No more ghetto check, and some more descriptive comments on the Hook
2019-01-26 16:55:26 +01:00
ThatAwesomeGuy173
fb6570cade
I accidentally the numpad
...
also reduced the range of usable characters
2019-01-26 02:41:05 -07:00
Steel Titanium
74bf3164f8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
TehRealSalt
0d1c501664
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
ThatAwesomeGuy173
bcddbdbfbf
Allow letters to be used in the "Specify IPv4 Address:" field
2019-01-25 21:50:58 -07:00
Sryder
d959dd6934
Should hopefully fix the MD2 crash reported
...
I wasn't able to replicate it personally, but this should hopefully avoid it crashing where the RPT given pointed out.
2019-01-21 22:48:57 +00:00
toaster
d045af07b1
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods
2019-01-21 21:56:49 +00:00
toaster
e9d95f07c1
Fix everything Sal wanted changed.
2019-01-21 21:51:54 +00:00
toaster
fdbf750f48
Fix incorrect condition for setting savemoddata to false.
2019-01-21 21:48:52 +00:00
Sryder
29f31cd9f8
Fix the netticbuffer command crashing 64-bit builds
2019-01-21 20:40:28 +00:00
Alam Arias
7b182d37b9
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-01-20 17:03:17 -05:00
Alam Ed Arias
74850fea17
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
Sryder
b18a8dbc8d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
Latapostrophe
e7d730e3b2
prevent the use of respawn to cheese items like SPB
2019-01-20 18:51:45 +01:00
Latapostrophe
1850123f8b
Prevent the use of respawn to cheese SPB and other items
2019-01-20 18:50:07 +01:00
fickleheart
c0c2ba4ca6
Fix clobbering error in MD2 texture code
2019-01-18 20:28:31 -06:00
wolfy852
4f38982968
Use SHORT on just the vars
2019-01-18 16:17:54 -06:00
wolfy852
de316f1ee1
Fix SHORT being used as a cast instead of a macro
2019-01-18 15:38:06 -06:00
toaster
f8229b9dad
whoopsie doodle, forgot gh wasn't allocated until after this section
2019-01-18 14:53:43 +00:00
toaster
d119c711e5
Improve readability of server browser add-ons message.
2019-01-18 14:11:59 +00:00
toaster
4b493b81a6
Add warning message when attempting to use the master server browser while modifiedgame
is true.
...
(We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
toaster
15aafb00a9
Turns out modifiedgame was getting set during startup because of making it use G_SetGameModified. Uh, woops?
2019-01-18 13:01:40 +00:00
TehRealSalt
4c8737da08
Final v1.0.2 commit (probably)
...
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 04:30:38 -05:00
james
356249dade
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
toaster
dda94e4498
Remove irrelevant attempts at majormod setting for SOC events which explicitly can only happen if a gamedata is created.
2019-01-17 22:12:59 +00:00
toaster
66273898b7
* Refactor all instances of majormods = true;
to route through G_SetGameModified, and catch a few spots I missed in the process.
...
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
toaster
2f2d3768d5
* Increased leniency for SOC wrt "major mods".
...
* If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod".
* If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod".
* Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
wolfy852
d389cececa
Update chars.kart hash
2019-01-16 20:02:40 -06:00
wolfy852
31c911e88f
Fix position numbers being off in 1P
2019-01-16 19:53:09 -06:00
TehRealSalt
ad7b3dece0
Bump up the frequency of voting rule changes
...
This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V
2019-01-16 16:19:16 -05:00
TehRealSalt
885d2e2965
Fix XD_REMOVEPLAYER not having a proper corresponding netxcmdname
...
Caught while working on power levels -- turns out it wasn't a total waste of time when I should've been working on the rest of v1.0.2!
2019-01-16 16:16:11 -05:00
toaster
a7445a7b71
Woops, didn't commit the most up-to-date g_game.c originally (old one didn't compile)
2019-01-16 15:27:23 +00:00
Jimita
424b2b1aaf
Merge branch 'next' into flashpals-on-screenshots
2019-01-16 05:59:05 -02:00
TehRealSalt
146f2a1c0a
Don't show COOL for spectators
2019-01-16 01:55:07 -05:00
TehRealSalt
d4cf3f5dbc
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2019-01-16 01:15:21 -05:00
TehRealSalt
5e1aa0302f
SHOULD be == 1, not < 2!!!!
2019-01-16 01:13:01 -05:00
TehRealSalt
86433d53cf
Turn speed hack check into a function
2019-01-15 22:34:41 -05:00
fickleheart
f2c98b3639
Add driftturn checks to other players' movement
...
(Can we make this into a function or something?)
2019-01-15 21:09:53 -06:00
fickleheart
f5d491eda2
Merge remote-tracking branch 'remotes/internal/master' into movementchecks
...
# Conflicts:
# src/g_game.c
# src/p_user.c
2019-01-15 21:01:30 -06:00
TehRealSalt
0251814095
Minor whitespace
2019-01-15 21:56:46 -05:00
fickleheart
b28b7bf1bf
Kick players who send cmds with invalid driftturn
2019-01-15 20:20:13 -06:00
fickleheart
e30222ebac
Don't multiply driftturn by realtics
...
(I also moved multiplying angleturn to a single spot)
2019-01-15 20:19:25 -06:00
fickleheart
0121d47049
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
TehRealSalt
46e5f308e7
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next
2019-01-15 20:35:39 -05:00
TehRealSalt
ea6ff29c43
Update file hashes
2019-01-15 20:35:20 -05:00
Sal
3597a94e3e
Merge branch 'bump-maxskins' into 'next'
...
Bump MAXSKINS up to 64 + fix skin overflow error
See merge request KartKrew/Kart-Public!29
2019-01-15 20:30:33 -05:00
TehRealSalt
105958d29f
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-15 20:09:55 -05:00
wolfy852
3dbf6f7ad0
Only allow ESC and non-keyboard keys to abort connection
2019-01-15 18:47:13 -06:00
Steel Titanium
fad341b0e9
Fix skins overflow
2019-01-15 14:29:43 -05:00
toaster
081872aa85
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next
or master
.
2019-01-15 19:01:55 +00:00
wolfy852
f53594cf81
Stop the keyboard from treating accelerate and break as menu keys
2019-01-15 03:02:52 -06:00
Sal
f2b7d9f373
Merge branch 'unfuck-splitscreen-hud' into 'next'
...
Cleaner splitscreen hud
See merge request KartKrew/Kart-Public!6
2019-01-15 03:47:29 -05:00
Sal
5982e26bb5
Merge branch 'default-md2' into 'next'
...
Default model for players
See merge request KartKrew/Kart-Public!27
2019-01-15 03:42:19 -05:00
TehRealSalt
5cd8691a71
Don't draw multiple WANTED posters in splitscreen
2019-01-15 03:41:33 -05:00
TehRealSalt
c61fcc8db6
Fix really dumb flags on MT_SPBEXPLOSION
2019-01-14 21:55:10 -05:00
TehRealSalt
4ce528bea7
Attempt to fix the stupid bug where SPB decides to not hurt
2019-01-14 21:38:38 -05:00
TehRealSalt
0b299012f7
Reduce easing time, revert changing air speed
2019-01-14 21:37:53 -05:00
TehRealSalt
6ba69e9002
Missed this
2019-01-14 18:24:25 -05:00
TehRealSalt
e63d7537e0
bump maxskins to 64, fix overflow error
2019-01-14 18:16:07 -05:00
TehRealSalt
7d1e630007
Tiny SPB fixes
...
- Fix typo that could potentially invalidate the wait phase
- Prevent dying during target phase causing it to redirect to someone else
- Ease speed back up to default whenever slowed down
- SPB intensity now biases against high drift sparks + acceleration, instead of only acceleration.
- Slow speed is scaled w/ SPB intensity too
2019-01-14 02:01:00 -05:00
TehRealSalt
b560a90890
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
Sal
9fb290577a
Merge branch 'gamepad-tweaks' into 'next'
...
Gamepad Improvements: Round 2
See merge request KartKrew/Kart-Public!24
2019-01-13 20:32:17 -05:00
wolfy852
dead0475ce
Allow any key to abort network connection, ignore non-keyboard keys in chat
2019-01-13 19:22:54 -06:00
Sal
75fa18b084
Merge branch 'polyobj_fix_public' into 'next'
...
Fix rendering gaps on polys with upper/lower textures
See merge request KartKrew/Kart-Public!26
2019-01-13 18:00:58 -05:00
Latapostrophe
148bd140c2
hook_cmd_running around the loop rather than inside
2019-01-13 20:16:53 +01:00
Latapostrophe
c2aa6d4de6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
fickleheart
7e026824a4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
wolfy852
31ccae60c9
Revert "Enable d-pad on the vote screen"
...
Partial revert of commit 92a60b32de
.
2019-01-12 05:37:07 -06:00
Latapostrophe
8bbb63f52a
Forgot to trim whitespace
2019-01-12 12:28:15 +01:00
Latapostrophe
23f99bd28d
Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff
2019-01-12 12:27:30 +01:00
TehRealSalt
2416d78224
Update comment to be more accurate
2019-01-12 05:12:20 -05:00
TehRealSalt
5ed4d0256e
spacing & ()
2019-01-12 05:03:05 -05:00
TehRealSalt
0ef5c2e388
Some house-cleaning
2019-01-12 05:01:36 -05:00
TehRealSalt
650522fc59
Don't increment ingame count without bumpers
2019-01-12 04:43:43 -05:00
TehRealSalt
24a32c2f51
Allow player-count modifiers in Battle
2019-01-12 04:31:35 -05:00
TehRealSalt
922f80b22f
Uncap player-count item distribution modifiers
...
Was an idea I had in development to make 16P less chaotic, but decided against it due to lack of testing and that it could backfire badly...
2019-01-12 04:30:41 -05:00
TehRealSalt
761aada745
Turn the "Music" section of the credits into only the people on Krew who contributes music
...
Meant to do this in song-credits, since individual songs are now properly credited there.
2019-01-12 04:13:49 -05:00
TehRealSalt
89f12599c6
Minor misc fixes
2019-01-12 02:53:14 -05:00
fickleheart
87ede1e934
Fix rendering gaps on polys with upper/lower textures
2019-01-11 21:21:56 -06:00
Sal
e443285801
Merge branch 'dehacked-versioning' into 'next'
...
Update SOC version, make base SRB2 SOC throw a warning
See merge request KartKrew/Kart-Public!11
2019-01-11 20:25:00 -05:00
Sal
2bd88fd6f8
Merge branch 'disable-xinput' into 'next'
...
-noxinput command line parameter
See merge request KartKrew/Kart-Public!21
2019-01-11 20:23:39 -05:00
fickleheart
4213a9cbb6
i,m gowonna update my name in the cwedits uwu
2019-01-11 18:11:52 -06:00
wolfy852
88b5a056c8
Fix the chat being incorrectly placed in splitscreen
2019-01-11 16:04:12 -06:00
wolfy852
622509682a
Fix chat toggle not working
2019-01-11 02:38:49 -06:00
wolfy852
d5e16dca63
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
2019-01-11 00:18:45 -06:00
wolfy852
a8e0805261
-nohidapi parameter
...
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
2019-01-10 23:12:06 -06:00
mazmazz
abf2da9e9b
Merge remote-tracking branch 'mazmazz-kart-public-gl/md3-vanilla-kart' into md3-vanilla-kart
2019-01-10 22:15:05 -05:00
mazmazz
4d5f7e78cd
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
wolfy852
d72fcaecc6
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:38:57 -06:00
wolfy852
7a50ea2554
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:35:32 -06:00
Sal
45a1508f0a
Merge branch 'fix-chat' into 'next'
...
Fix splitscreen being forced into oldchat
See merge request KartKrew/Kart-Public!25
2019-01-10 18:43:14 -05:00
wolfy852
6c4decfef3
Don't check splitscreen in OLDCHAT
2019-01-10 13:52:58 -06:00
wolfy852
92a60b32de
Enable d-pad on the vote screen, allow aborting connection with more joy buttons
2019-01-10 06:10:16 -06:00
wolfy852
73369679f5
Fix player 2 not being able to play while the chat is open
...
Also attempts to fix the d-pad typing characters into the chat box.
2019-01-10 06:08:12 -06:00
TehRealSalt
5b05eff41f
Merge branch 'next' into music-credits
2019-01-10 01:14:02 -05:00
TehRealSalt
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
TehRealSalt
9975497a68
Remove this, doesn't work
2019-01-10 00:35:11 -05:00
TehRealSalt
cff7d2795d
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
TehRealSalt
d3a38a4375
Add disable for music credit showing on the change music linedef
2019-01-09 21:17:10 -05:00
TehRealSalt
2ccdd3e4b7
Fix Music toggle trying to play a non-existent song in Kart
2019-01-09 21:13:06 -05:00
TehRealSalt
ed36f5ac16
Accidental unselected change
2019-01-09 21:12:33 -05:00
TehRealSalt
565b8f87fb
Show song credits if joining mid-game
...
Dunno if this works or not yet!
2019-01-09 21:01:56 -05:00
TehRealSalt
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
wolfy852
dbb7267f22
Missed a few spots
2019-01-09 15:53:59 -06:00
wolfy852
90148f79eb
If kmd2.dat isn't found in srb2home, search the game's directory for it
2019-01-09 15:38:37 -06:00
fickleheart
a444a214d0
Here too
2019-01-09 09:07:41 -06:00
fickleheart
d20122327f
Make sure cmd.latency is always 0 in mode attack?
2019-01-09 09:05:57 -06:00
TehRealSalt
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
wolfy852
5e682d612f
-noxinput command line parameter
2019-01-09 01:38:28 -06:00
fickleheart
81a7cdf6e8
oops
2019-01-09 00:49:32 -06:00
Sal
0a34d4bafa
Merge branch 'kart-public-travis-deployer' into 'next'
...
Implement OSX and Debian installer building for Travis
See merge request KartKrew/Kart-Public!8
2019-01-09 01:42:44 -05:00
Sal
2f30625c82
Merge branch 'drift-spark-adjustment' into 'next'
...
Minimum speed to get drift sparks
See merge request KartKrew/Kart-Public!20
2019-01-09 01:18:30 -05:00
fickleheart
acfe6c4616
Don't use netticbuffer for servers
2019-01-08 23:27:51 -06:00
fickleheart
26af4e8561
Save stored turn ranges in NetArchivePlayers
2019-01-08 23:27:39 -06:00
fickleheart
100ce5958b
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 21:11:02 -06:00
fickleheart
01d7dc35ff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 20:56:14 -06:00
fickleheart
6792fd92aa
Experimental nettic buffer to stop net-induced frame drops?
2019-01-08 20:55:33 -06:00
fickleheart
cd71e94785
Remove filthy filthy cheats
2019-01-08 20:36:06 -06:00
fickleheart
1bacc4e395
Make starting boost timing compensate for latency
2019-01-08 20:27:54 -06:00
TehRealSalt
5e8e08ad95
Misc level init fixes
2019-01-08 20:14:58 -05:00
Marco Z
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
wolfy852
e528750444
Fix improperly resolved conflicts
2019-01-08 16:44:56 -06:00
wolfy852
ad01dcc5ac
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
Sal
78ac038864
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
TehRealSalt
b713903208
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
Sal
7f8609d335
Merge branch 'merge-srb2' into 'next'
...
Merge SRB2 master & next (round 1)
See merge request KartKrew/Kart-Public!16
2019-01-08 15:56:41 -05:00
Latapostrophe
a4641e1010
use PLAY as default player MD2 if avaiable.
2019-01-08 18:57:10 +01:00
Digiku
3cd4b253b1
Update hw_md2.c -- Redundant AngleFixed operation when modifying anglef
2019-01-08 11:30:04 -05:00
Digiku
090ecdb6e5
Update hw_md2.c -- player->frameangle fix
2019-01-08 11:22:33 -05:00
Digiku
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
mazmazz
6ec6622610
Merge remote-tracking branch 'kart-public-gl/animtimer-fix' into md3-vanilla-kart
2019-01-07 05:44:23 -05:00
mazmazz
d34e1fd4e9
Add floating point epsilons
2019-01-07 04:40:19 -05:00
mazmazz
05a1a7e24a
Dummy out nextframe lerping (unused in Kart)
2019-01-07 04:38:17 -05:00
mazmazz
8504b000bb
Fix blinking MD2 models
...
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-07 04:34:19 -05:00
mazmazz
391d001929
Un-dummy md5 checks
2019-01-07 04:34:18 -05:00
mazmazz
cc3b57a96c
Compile fix -- remove (void)alpha from DoScreenWipe
2019-01-07 04:34:17 -05:00
Arthur
531d42c1bd
Eliminate some old GL functions so we don't slide back into bad habits!
2019-01-07 04:34:16 -05:00
Arthur
25ef570a81
Fix screen transitions
2019-01-07 04:33:28 -05:00
mazmazz
08579d9447
Buildbot fixes
2019-01-07 04:33:27 -05:00
mazmazz
62596bed38
Compile fixes -- specify GLubyte for pglColor4ubv
2019-01-07 04:33:25 -05:00
Arthur
9774ecbdfb
Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
...
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
Arthur
00792f8dab
Removed unused PF_Md2 flag
...
More OpenGL performance increase by making assumptions about client state
2019-01-07 04:33:20 -05:00
Arthur
cf6af71d33
boolean fix for VS
...
add GL_NORMALIZE
2019-01-07 04:30:54 -05:00
mazmazz
72c2b28328
Ignored fread fix
2019-01-07 04:30:53 -05:00
mazmazz
d5a0b2df4d
More mixed d&c fixes
2019-01-07 04:30:52 -05:00
mazmazz
78adb69481
byte -> char
2019-01-07 04:30:51 -05:00
mazmazz
c5c799006a
Mixed D&C fixes
2019-01-07 04:30:49 -05:00
mazmazz
1654aa34c5
Fix floating point comparisons
2019-01-07 04:30:48 -05:00
Arthur
1249f37fc5
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2019-01-07 04:30:47 -05:00
mazmazz
2f930f1262
Small Mixed D&C fix
2019-01-07 04:30:45 -05:00
AJ Freda
4806dadd88
Fixed a few unnoticable mistakes [vanilla]
2019-01-07 04:30:42 -05:00
mazmazz
09629f092f
Ifdef nextFrame handling under USE_MODEL_NEXTFRAME
2019-01-07 04:30:40 -05:00
mazmazz
6ed896d462
Interpolation fix attempt?
...
* Fix pglNormal3bv pointer because typo
2019-01-07 04:30:39 -05:00
mazmazz
c13d3ff1dd
Adapt re-enabled DrawMD2 code block for meshes
2019-01-07 04:30:37 -05:00
mazmazz
6653b9697f
Hide/add Kart FTransform mirror and anglez behind ifdef
2019-01-07 04:30:36 -05:00
mazmazz
bbc3d27cee
More hw_md2 merge errors; re-enable interpolation code block
2019-01-07 04:27:59 -05:00
mazmazz
039cf894f2
hw_md2 merge errors
2019-01-07 04:24:00 -05:00
mazmazz
ab99f19dd1
Add model sources to sdl1.2 VC project
2019-01-07 04:23:20 -05:00
mazmazz
34afceaa3b
Ignore fread return value (buildbot error)
2019-01-07 04:23:19 -05:00
mazmazz
2a24854903
Add new model files to CMake
2019-01-07 04:23:18 -05:00
mazmazz
f0b20e302a
Buildbot fixes (changed byte types to char; mixed d&c)
2019-01-07 04:23:17 -05:00
mazmazz
2e22b069f1
GCC compile fixes
2019-01-07 04:23:15 -05:00
mazmazz
30c7ad3928
Add MD2/MD3 files to makefile
2019-01-07 04:21:46 -05:00
Arthur
11be174603
Remove CONS_Printf message that isn't even doing what it says it is!
2019-01-07 04:21:45 -05:00
Arthur
9f0b121b15
Support for 'tinyframes', and lots more optimization
2019-01-07 04:21:44 -05:00
Arthur
295ca25171
Common model format, with MD2/MD3 loading
2019-01-07 04:21:43 -05:00
Arthur
9d5622c0bc
New fixed math functions - ClosestPointOnVector, and Strength.
...
Normal also returns length now, since it is free.
2019-01-07 04:19:24 -05:00
Digiku
1c1331199d
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
wolfy852
bcf687c3af
Compile flag for DEVELOP
2019-01-06 20:47:13 -06:00
SeventhSentinel
eebdda0833
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
wolfy852
e115dbf34f
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
Sal
7176490d5e
Merge branch 'kill-facefreed' into 'next'
...
Remove facefreed/iconfreed
See merge request KartKrew/Kart-Public!15
2019-01-06 02:02:54 -05:00
SeventhSentinel
e545a8ab7d
Merge remote-tracking branch 'next' into merge-srb2
2019-01-06 02:02:33 -05:00
SeventhSentinel
8736952aad
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
SeventhSentinel
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
wolfy852
aa3c058321
Remove facefreed/iconfreed
...
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
2019-01-05 20:40:47 -06:00
SeventhSentinel
daec4f9f7e
Merge remote-tracking branch 'srb2public/master' into merge-srb2
2019-01-05 18:42:58 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
578a4fe80d
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
fickleheart
bc429ad4f8
Determine latency with leveltime BS instead of nettics
2019-01-05 01:13:16 -06:00
SeventhSentinel
a10ac14462
turn these signed before abs-ing em
2019-01-05 00:42:36 -05:00
SeventhSentinel
4de91cfea5
Load sounds.kart after patch.kart
2019-01-05 00:33:24 -05:00
fickleheart
656de08b96
test stuff
2019-01-04 23:09:29 -06:00
fickleheart
bd36a0f0a1
Don't turn players more than they're allowed to
...
This should account for latency properly.
2019-01-04 23:09:27 -06:00
fickleheart
12b0e7d5da
Send latency in players' ticcmds
2019-01-04 23:09:26 -06:00
Marco Z
882355d24b
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -05:00
Marco Z
09ed8bd046
Add LibGME to DD vc10 project
2019-01-04 20:43:45 -05:00
Marco Z
88c4a54cea
Add GME to VC10 SRB2SDL project
2019-01-04 20:43:42 -05:00
Steel Titanium
888b5056d7
Clean up the comments a bit
2019-01-04 19:55:05 -05:00
Digiku
d5870e6f8a
Merge branch 'changecontrol-text-overflow-fix' into 'master'
...
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
c97dc5d3c4
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
SeventhSentinel
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
SeventhSentinel
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
Steel Titanium
a69239bfa8
Don't increment mainwads for sounds or music.kart
2019-01-04 00:32:01 -05:00
SeventhSentinel
b513b8a11b
Actually, let's just do "1"
2019-01-03 16:43:01 -05:00
SeventhSentinel
2db9fa1b96
Update SOC version, make base SRB2 SOC throw a warning
2019-01-03 16:30:50 -05:00
mazmazz
788c75ecdf
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2019-01-03 12:31:26 -05:00
Sal
e52d5fd2fd
Merge branch 'bump-fixes' into 'next'
...
Push bouncing players backwards if they get stuck in a wall
See merge request KartKrew/Kart-Public!3
2019-01-03 12:27:14 -05:00
mazmazz
5f632d9b3c
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
Sal
0b0cbcabb7
Merge branch 'map-palette-titlefix' into 'next'
...
Fix per-map palette not being reset properly when it should.
See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
Sal
220ef1a490
Merge branch 'waypoint-lap-option' into 'next'
...
Add waypoint lap field via Parameter field
See merge request KartKrew/Kart-Public!4
2019-01-03 00:58:09 -05:00