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
mazmazz
872227f211
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
83ef924996
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
95fff25a7f
Update OSX icon
2018-12-03 23:09:54 -05:00
Digiku
ffd1f400e1
Merge branch 'controller-menu-touchup' into 'master'
...
Controller select menu improvements.
See merge request STJr/SRB2!354
2018-12-03 23:00:36 -05:00
Digiku
d6dd0c8fef
Merge branch 'joystick-juggling-two' into 'next'
...
Joystick additions for menu, axis defaults, and vertical look toggle
See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
Digiku
a6a1b12a44
Merge branch 'gc-menus' into 'next'
...
Make mappable buttons for System Menu, Screenshot, Movie, and Viewpoint
See merge request STJr/SRB2!358
2018-12-03 22:58:43 -05:00
Digiku
5c13b2fb71
Merge branch 'cmake-strings' into 'master'
...
CMake:Use commit hash and branch name.
Closes #37
See merge request STJr/SRB2!360
2018-12-03 22:58:23 -05:00
Digiku
19a63e19d6
Merge branch 'installer-followup' into 'master'
...
Forgot a gitignore
See merge request STJr/SRB2!362
2018-12-03 22:17:06 -05:00
mazmazz
c3b0e961f8
Forgot a gitignore
2018-12-03 22:16:38 -05:00
Digiku
dae1c1d6b1
Merge branch 'installer-followup' into 'master'
...
Installer followup
See merge request STJr/SRB2!361
2018-12-03 22:15:14 -05:00
mazmazz
fce935da2d
Installer followup
...
* Check if administrator rights are required
* Add INSTALL INSTRUCTIONS text file to root install folder in case the installer fails
* Add failsafes to uninstaller file deletion: check if name is a folder, and check for illegal chars
* Fixed parentheses breaking the installer by instead making exclamation marks do the breaking. Thanks Windows!
2018-12-03 22:12:13 -05:00
TehRealSalt
1de54c0bbd
Add player taunt functions to Lua
...
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
TehRealSalt
2ff31a7b72
Buff item hitbox size
...
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
2018-12-03 17:30:27 -05:00
Steel Titanium
2797b1e428
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
b4a9c48011
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into controller-menu-touchup
2018-12-03 15:38:30 -05:00
Steel Titanium
c31c80d216
One small change
2018-12-03 13:32:24 -05:00
mazmazz
22232847e2
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
3bdb738888
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
mazmazz
861b35dea4
Revert "Make pause key bring up the menu if it's a joy button"
...
This reverts commit 44bec22793 .
2018-12-03 13:11:48 -05:00
mazmazz
4ad7cdc684
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
mazmazz
0e25ec9309
Add Joy2 for network abort
2018-12-03 13:10:47 -05:00
mazmazz
44bec22793
Make pause key bring up the menu if it's a joy button
...
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
mazmazz
098f02fc95
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
mazmazz
24ff6bc279
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00