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
Digiku
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
Digiku
42cb597731
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
8471c416d7
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
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
Digiku
ccf5c9d040
Merge branch 'installer-followup' into 'master'
...
Forgot a gitignore
See merge request STJr/SRB2!362
2018-12-03 22:17:06 -05:00
mazmazz
6b4f33397f
Forgot a gitignore
2018-12-03 22:16:38 -05:00
Digiku
f9744bd2a5
Merge branch 'installer-followup' into 'master'
...
Installer followup
See merge request STJr/SRB2!361
2018-12-03 22:15:14 -05:00
mazmazz
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
Steel Titanium
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
a70b8bc348
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into controller-menu-touchup
2018-12-03 15:38:30 -05:00
Steel Titanium
168647275c
One small change
2018-12-03 13:32:24 -05:00
mazmazz
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
mazmazz
7ce092128b
Revert "Make pause key bring up the menu if it's a joy button"
...
This reverts commit 9de31cf2e7
2018-12-03 13:11:48 -05:00
mazmazz
6730c6c765
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
mazmazz
ed57d0d9f9
Add Joy2 for network abort
2018-12-03 13:10:47 -05:00
mazmazz
9de31cf2e7
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
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
mazmazz
0bb113130b
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00
mazmazz
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
mazmazz
3134d72c12
Preserve event ch for other responders
2018-12-03 13:10:18 -05:00
mazmazz
6bf31492b7
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 13:10:16 -05:00
mazmazz
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
mazmazz
78dde93f3e
Remap menu actions to better joy keys
2018-12-03 13:10:12 -05:00
Steel Titanium
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
mazmazz
06faf6ffe4
Unneeded input header in st_stuff
2018-12-03 12:36:42 -05:00
mazmazz
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
mazmazz
6c78af3542
Missed (unused?) viewpoint strings
2018-12-03 12:20:19 -05:00
mazmazz
3d8bc85494
Forgot config strings for menu keys
2018-12-03 12:19:41 -05:00
mazmazz
5314c0e36b
Make F12 spectator string constant because of wrapping issues
2018-12-03 12:13:36 -05:00
mazmazz
60b16289e5
Change spectator string for "Press F12 to watch"
2018-12-03 12:11:03 -05:00
mazmazz
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
Digiku
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
mazmazz
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
mazmazz
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
mazmazz
9186f259cb
Adjustments
2018-12-03 04:55:25 -05:00
mazmazz
5687c3b0e6
A README line
2018-12-03 01:43:27 -05:00
mazmazz
6694b203e0
Finishing touches 2
2018-12-03 01:06:25 -05:00
