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
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
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
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
decb22dabd
Make uninstaller a self-extractable
2018-12-04 11:17:08 -05:00
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
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
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
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
5ae8669eea
Add DLL documentation for install bundling
2018-12-04 00:51:45 -05:00
43e9524c24
Move unneeded binaries to an Old subfolder
2018-12-04 00:51:29 -05:00
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
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
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
60feae1014
Update OSX icon
2018-12-03 23:09:54 -05:00
ba81e26f71
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
d507aa231e
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
ccf5c9d040
Merge branch 'installer-followup' into 'master'
...
Forgot a gitignore
See merge request STJr/SRB2!362
2018-12-03 22:17:06 -05:00
6b4f33397f
Forgot a gitignore
2018-12-03 22:16:38 -05:00
f9744bd2a5
Merge branch 'installer-followup' into 'master'
...
Installer followup
See merge request STJr/SRB2!361
2018-12-03 22:15:14 -05:00
15f584ecc6
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
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
a70b8bc348
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into controller-menu-touchup
2018-12-03 15:38:30 -05:00
168647275c
One small change
2018-12-03 13:32:24 -05:00
8efc32b826
Merge branch 'controller-names' into 'controller-menu-touchup'
...
Controller name fix
See merge request SteelTitanium/SRB2!2
2018-12-03 12:41:55 -05:00
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
1b6ec9fd33
Merge branch 'new-install' into 'master'
...
Add new Windows installer scripts
See merge request STJr/SRB2!356
2018-12-03 07:45:05 -05:00
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
9186f259cb
Adjustments
2018-12-03 04:55:25 -05:00
5687c3b0e6
A README line
2018-12-03 01:43:27 -05:00
6694b203e0
Finishing touches 2
2018-12-03 01:06:25 -05:00
d4718fa6d1
Add new Windows installer scripts
2018-12-03 00:53:29 -05:00
978a28004d
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
13b0e9c3c5
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
a63ba7084a
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
...
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
ce4e63a366
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
2018-12-02 17:12:05 +00:00
0f11116e7b
Fix up controller menu support
2018-12-01 20:13:14 -05:00
bc1f08f89d
Fix 2 of the Unsuffixed Float Constant warnings
...
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
c5e8e0badb
Merge branch 'master' into tiny-makefile-fix
2018-11-29 21:57:47 +00:00
b1c41a193b
Merge branch '21-deb' into 'master'
...
Update debian packaging to work with Launchpad PPA
See merge request STJr/SRB2!350
2018-11-29 04:20:30 -05:00
93b6503773
Add wget to assets deb depends
2018-11-27 18:16:20 -05:00
0d5d0b2f27
Fix i386 Launchpad build by commenting out pkg-config hacks
2018-11-27 16:47:00 -05:00
559cf93e4a
Move binary routine to binary-arch for Launchpad
2018-11-27 11:05:34 -05:00
95e13d9ad3
Merge branch 'save-soundmenu-toggles' into 'master'
...
Save sound toggles to config
See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
b0474084f8
Actually both libpng names are in the wild
2018-11-27 02:30:31 -05:00
0314469c7e
Changelog version for main package
2018-11-27 02:14:47 -05:00
7c343d0f69
Fix debian desktop icon
2018-11-27 02:11:57 -05:00
ce32413633
Smarter libgme ldflag detection
2018-11-27 01:51:22 -05:00
e099d2aaf2
Tar-ignore options for main deb
2018-11-27 01:26:32 -05:00
Digiku