stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 09:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
5383 commits 59 branches 11 tags 93 MiB
Commit graph

5383 commits

This branch
This branch
All branches
Author SHA1 Message Date
wolfy852
c370a86f48 Set flashing tics to 0 after boosting 2019-02-16 06:37:09 -06: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
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
wolfs
faa2433455 Merge branch 'less-misleading-sorting-keys' into 'master' 
Use less confusing player sorting key names

See merge request KartKrew/Kart-Public!61
 2019-02-16 06:07:22 -05:00
wolfs
5179313c68 Merge branch 'items_off_by_one' into 'next' 
Items off by one

See merge request KartKrew/Kart-Public!57
 2019-02-15 02:18:05 -05:00
James R
bc6f3cf4b4 Merge branch 'james/Kart-Public-apng' into 'apng' 
Support MSVC and XCode for aPNG

See merge request james/Kart-Public!1
 2019-02-15 01:31:58 -05: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
wolfy852
3a3dd42b89 Add pogospring to itemenabled 2019-02-13 05:37:13 -06: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
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
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
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
Sal
13f87088ab Merge branch 'version-prep' into 'next' 
Update version to v1.0.3

See merge request KartKrew/Kart-Public!55
 2019-02-05 19:02:54 -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
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
Sal
6b3046ec18 Merge branch 'fix-fade-timeout' into 'next' 
Fix Encore Fade Timeout

See merge request KartKrew/Kart-Public!52
 2019-02-04 21:39:33 -05: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
Sal
258a426603 Merge branch 'insta-lookback' into 'master' 
Lookback camera switches instantly

See merge request KartKrew/Kart-Public!51
 2019-02-04 15:44:32 -05: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
Sal
b0d9ea537f Merge branch 'split_is_just_a_synonym_for_disappear' into 'next' 
Split is just a synonym for disappear

See merge request KartKrew/Kart-Public!50
 2019-02-03 21:46:59 -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
Sal
88de3546a5 Merge branch 'break_a_few_eggs' into 'next' 
Break a few eggs

See merge request KartKrew/Kart-Public!49
 2019-02-03 18:11:34 -05: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
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