mazmazz
5cdd6a16b2
Attempt to stop music before wipe (doesn't work?!)
2018-12-06 08:20:18 -05:00
mazmazz
8933601507
DD hack to pause music during a wipe
2018-12-06 07:12:12 -05:00
Digiku
7852e418d5
Merge branch '21-tweaks' into '21-version'
...
Change 2p controller defaults
See merge request STJr/SRB2!369
2018-12-06 05:48:06 -05:00
mazmazz
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
Digiku
68ed55fa71
Merge branch 'versionflags' into '21-version'
...
Add OS and 32/64-bitness to VERSION console command
See merge request STJr/SRB2!368
2018-12-05 13:15:21 -05:00
mazmazz
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
6d9fb0d3fd
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
Monster Iestyn
aee8dcdff8
Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server
...
it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck
2018-12-05 17:39:02 +00:00
mazmazz
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
ae14fd2f85
Fix motd being broken for admins
...
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
2018-12-04 21:09:28 +00:00
Monster Iestyn
b4b82e681c
Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart
2018-12-04 18:54:36 +00:00
Monster Iestyn
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00: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
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
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
