stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
5531 commits 60 branches 11 tags 94 MiB
Commit graph

5531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Cochenour
f5fe073627 Fix floating lob items 2019-03-06 01:53:52 -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
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
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
3fa1751706 CircleCi: we need SSH for buildbot 2019-03-04 16:51:39 -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
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
Sal
2a672dbd70 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
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
Sal
7799732988 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
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
f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Alam Arias
94bd0e39d5 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 13:11:16 -05:00
Monster Iestyn
0051eb7039 Merge branch 'circleci' into 'master' 
CircleCI: test build SRB2 without network support

See merge request STJr/SRB2!462
 2019-03-01 12:56:52 -05:00
Alam Arias
3fe3d1121a Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:53:57 -05: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
27adf300b2 Merge branch 'apng-backport' into 'master' 
aPNG backport from Kart

See merge request STJr/SRB2!464
 2019-03-01 11:04:08 -05: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
wolfs
d3e2e37c66 Merge branch 'need-more-time' into 'master' 
Stop Linux servers from hanging every 34 hours

See merge request KartKrew/Kart-Public!95
 2019-03-01 01:12:32 -05: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
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
Alam Arias
d865b5660a CircleCI: test build SRB2 without network support 2019-02-27 14:37:31 -05:00
Monster Iestyn
e86d0836a3 Merge branch 'updatelibgme' into 'master' 
Update game-emu-music lib to 0.6.2

See merge request STJr/SRB2!444
 2019-02-27 13:49:44 -05: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
Sal
fd7711c35b Merge branch 'software-fov' into 'master' 
Software FOV

See merge request KartKrew/Kart-Public!88
 2019-02-27 01:18:49 -05:00