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
4670 commits 60 branches 11 tags 94 MiB
Commit graph

4670 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steel Titanium
a69239bfa8 Don't increment mainwads for sounds or music.kart 2019-01-04 00:32:01 -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
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
Steel Titanium
3273924743 Remove double brackets 2019-01-02 13:04:56 -05:00
Steel Titanium
d6178a3a40 Comment this out again. 
How did this even get reverted...
 2018-12-31 18:34:04 -05:00
Steel Titanium
6ad2c145d7 Better attempt at fixing this 2018-12-31 18:19:18 -05:00
SeventhSentinel
5b4faa4ddb Merge remote-tracking branch 'kartinternal/master' into next 2018-12-31 15:16:39 -05:00
Steel Titanium
749bc65caa Attempt 1 to properly fix 2018-12-31 14:18:00 -05:00
Steel Titanium
18fea4f3b1 Revert "Fix per-map palette not being reset properly on title" 
This reverts commit 1bb6ff27c8.
 2018-12-31 13:35:38 -05:00
Steel Titanium
1bb6ff27c8 Fix per-map palette not being reset properly on title 2018-12-30 23:38:38 -05:00
fickleheart
90e553d81a Use waypoint extrainfo to determine lap it works on 
This can be useful to improve waypoint tracking on sprint maps.
 2018-12-27 17:11:16 -06:00
fickleheart
2b870ef6d4 oops forgot this 2018-12-26 15:31:19 -06:00
fickleheart
6954689b96 Clean up stuff I did while debugging 2018-12-26 14:51:06 -06:00
fickleheart
74f13c0889 Push bouncing players backwards if they get stuck in a wall 2018-12-26 14:51:05 -06:00
Sal
1951548245 Merge branch 'stupid-orbinaut-bullshit' into 'master' 
Fix stupid Orbinaut bullshit

See merge request KartKrew/Kart!120
 2018-12-15 19:10:41 -05:00
SeventhSentinel
2cb2b02b73 Fix Ballhog under the last commit... 
It actually uses trailing item's throw speeds instead of its own, oddly enough; I don't want to mess with the gameplay there, so I just gave it its own exception.
 2018-12-13 09:47:14 -05:00
SeventhSentinel
6d19be6412 Make SPB follow the same rules too 2018-12-13 09:34:27 -05:00
SeventhSentinel
bbf8222767 Stupid Orbinaut bullshit 
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
 2018-12-12 21:25:18 -05:00
TehRealSalt
c599d84d6e Actually, best of both: 
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
 2018-12-05 23:28:44 -05:00
TehRealSalt
9bafdaf492 > 2 
Same here
 2018-12-05 22:54:06 -05:00
TehRealSalt
0bd0240464 < -2 
I doubt this hurts anything, but might as well I guess
 2018-12-05 22:53:34 -05:00
TehRealSalt
c2dfc1155f Set Shrink timer, don't add to it 2018-12-05 22:51:08 -05:00
TehRealSalt
101feb9498 Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Sal
261319b754 Merge branch 'force-spb' into 'master' 
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.

See merge request KartKrew/Kart!119
 2018-12-05 21:43:59 -05:00
TehRealSalt
97f2f858ad Give lap animation V_SNAPTOTOP as intended 2018-12-05 21:39:34 -05:00
TehRealSalt
116b10c29d Comment out M_DrawSaveLoadBorder 2018-12-05 21:27:51 -05:00
TehRealSalt
d0180ecb15 Cut this down slightly 2018-12-05 20:54:58 -05:00
TehRealSalt
d53e4af93a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-05 20:46:48 -05:00
TehRealSalt
7ab098636b Edited even more things to say "SRB2Kart" 2018-12-05 20:40:58 -05:00
TehRealSalt
d16c47ccb6 Edited the installer to support SRB2Kart 
There is a LOT that can go wrong here, so I'm not gonna make this a priority for v1.0.2. If someone else wants to take a crack at maintaining this though, and fixing any and all inconsistencies, then feel free.
 2018-12-05 20:39:42 -05:00
TehRealSalt
df191639bd Merge remote-tracking branch 'srb2public/master' into merge-next 2018-12-05 19:21:13 -05:00
TehRealSalt
b3b5b3f81d Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out. 2018-12-05 19:09:05 -05:00
Monster Iestyn
f2b0db5a1c Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku
e6e5856fd8 Merge branch 'auto-joystick' into 'master' 
Use Joystick 1 and Joystick 2 by default if plugged in

See merge request STJr/SRB2!364
 2018-12-04 11:53:58 -05:00
Digiku
631f6ed406 Merge branch 'joystick-juggling' into 'master' 
Joystick juggling

See merge request STJr/SRB2!355
 2018-12-04 11:51:55 -05:00
Digiku
0d86292d10 Merge branch 'exchndl-new' into 'master' 
Slightly re-organize DLLs and document the required list for bundling

See merge request STJr/SRB2!365
 2018-12-04 11:51:17 -05:00
TehRealSalt
0a00a0cebb Revert "Add player taunt functions to Lua" 
This reverts commit 09e9e2ba4d.
 2018-12-04 11:39:45 -05:00
Digiku
e224bfd0e6 Merge branch 'installer-followup' into 'master' 
Make uninstaller a self-extractable

See merge request STJr/SRB2!367
 2018-12-04 11:18:09 -05:00
mazmazz
decb22dabd Make uninstaller a self-extractable 2018-12-04 11:17:08 -05:00
Monster Iestyn
d1a8e3acdb Merge branch 'tiny-makefile-fix' into 'master' 
Tiny Makefile Fix

See merge request STJr/SRB2!289
 2018-12-04 08:09:27 -05:00
Digiku
20386d26ee Merge branch 'installer-followup' into 'master' 
Add old-install-list.txt to explicitly define which old install files need to be moved

See merge request STJr/SRB2!366
 2018-12-04 01:12:21 -05:00
mazmazz
7b1423a236 Add old-install-list.txt to explicitly define which old install files need to be moved 
Replaces MoveOldExeDlls routine in installer staging
 2018-12-04 01:11:30 -05:00
mazmazz
2b336b9f2f Move DLL binaries from bin/Resources to libs/dll-binaries 
Reason for this is because the SDL2 binaries live in libs/ for ease of copying. The DLLs ought to be in one location.
 2018-12-04 00:57:28 -05:00
mazmazz
5ae8669eea Add DLL documentation for install bundling 2018-12-04 00:51:45 -05:00
mazmazz
43e9524c24 Move unneeded binaries to an Old subfolder 2018-12-04 00:51:29 -05:00
mazmazz
4ec3eb9375 Update exchndl.dll to 0.9.0 
https://github.com/jrfonseca/drmingw/releases/tag/0.9.0
 2018-12-04 00:07:14 -05:00
mazmazz
c799584f3d Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart) 2018-12-03 23:36:36 -05:00
Digiku
d071c615e3 Merge branch 'mac-icon-update' into 'master' 
Update OSX icon

See merge request STJr/SRB2!363
 2018-12-03 23:10:28 -05:00
mazmazz
60feae1014 Update OSX icon 2018-12-03 23:09:54 -05:00