SeventhSentinel
a595d0ba00
Load sounds.kart after patch.kart
2019-01-05 00:33:24 -05:00
Sal
09016c877d
Merge branch 'mainwads-fix' into 'next'
...
Don't increment mainwads for sounds or music.kart
See merge request KartKrew/Kart-Public!12
2019-01-04 20:01:57 -05:00
Steel Titanium
a57626f828
Clean up the comments a bit
2019-01-04 19:55:05 -05:00
Steel Titanium
d2da1db6c8
Don't increment mainwads for sounds or music.kart
2019-01-04 00:32:01 -05:00
Sal
b69013a4f1
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
1b02805445
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
5c1267d2e6
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
4e0f4ed709
Remove double brackets
2019-01-02 13:04:56 -05:00
Steel Titanium
b63f4a66e8
Comment this out again.
...
How did this even get reverted...
2018-12-31 18:34:04 -05:00
Steel Titanium
26a257eda7
Better attempt at fixing this
2018-12-31 18:19:18 -05:00
SeventhSentinel
199f71172d
Merge remote-tracking branch 'kartinternal/master' into next
2018-12-31 15:16:39 -05:00
Steel Titanium
de6c2a84f3
Attempt 1 to properly fix
2018-12-31 14:18:00 -05:00
Steel Titanium
fddd6fb0d5
Revert "Fix per-map palette not being reset properly on title"
...
This reverts commit b63e6ab325
2018-12-31 13:35:38 -05:00
Steel Titanium
b63e6ab325
Fix per-map palette not being reset properly on title
2018-12-30 23:38:38 -05:00
fickleheart
e5f2f39b46
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
55e0dcb2e3
oops forgot this
2018-12-26 15:31:19 -06:00
fickleheart
9485bbfe10
Clean up stuff I did while debugging
2018-12-26 14:51:06 -06:00
fickleheart
229aa89450
Push bouncing players backwards if they get stuck in a wall
2018-12-26 14:51:05 -06:00
Sal
82b06e2e85
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
8a9f274f71
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
f3e158320b
Make SPB follow the same rules too
2018-12-13 09:34:27 -05:00
SeventhSentinel
f35e5d816a
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
7f335e9c46
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
2d9ad86d20
> 2
...
Same here
2018-12-05 22:54:06 -05:00
TehRealSalt
fbf0cb2211
< -2
...
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
TehRealSalt
90f480faa2
Set Shrink timer, don't add to it
2018-12-05 22:51:08 -05:00
TehRealSalt
5e4bd29c9c
Add Miku's author to credits.
2018-12-05 21:58:26 -05:00
Sal
2cd332f5c6
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
0b40488fb8
Give lap animation V_SNAPTOTOP as intended
2018-12-05 21:39:34 -05:00
TehRealSalt
6af84a96c1
Comment out M_DrawSaveLoadBorder
2018-12-05 21:27:51 -05:00
TehRealSalt
d7ee931a16
Cut this down slightly
2018-12-05 20:54:58 -05:00
TehRealSalt
91448ddd95
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
TehRealSalt
bf3a9d1d2e
Edited even more things to say "SRB2Kart"
2018-12-05 20:40:58 -05:00
TehRealSalt
38e72520af
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
26315ccf63
Merge remote-tracking branch 'srb2public/master' into merge-next
2018-12-05 19:21:13 -05:00
TehRealSalt
6012fd09e6
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
dfdba01591
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
Digiku
6146429696
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
2c557d668a
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Digiku
3e867e13ff
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
681b4d4b99
Revert "Add player taunt functions to Lua"
...
This reverts commit 1de54c0bbd
2018-12-04 11:39:45 -05:00
Digiku
6888db044b
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
5dba5210a6
Make uninstaller a self-extractable
2018-12-04 11:17:08 -05:00
Monster Iestyn
ca01834d2e
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
bf35a5a72c
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
c0aed5a7dc
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
92913389b8
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
7655929516
Add DLL documentation for install bundling
2018-12-04 00:51:45 -05:00
mazmazz
ace2b495c2
Move unneeded binaries to an Old subfolder
2018-12-04 00:51:29 -05:00
mazmazz
4d39a8ddcd
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
