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 |
|
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 |
|
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 |
|
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 |
|
Steel Titanium
|
fbb2cde800
|
Make this be consistent with non-CMake builds
|
2018-12-03 15:42:37 -05:00 |
|
Steel Titanium
|
168647275c
|
One small change
|
2018-12-03 13:32:24 -05:00 |
|
mazmazz
|
8851f39b84
|
Use static joyname instead of malloc
|
2018-12-03 12:35:12 -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 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
13b0e9c3c5
|
make menu respond to joystick axis events without joyscale having to be 0
|
2018-12-02 21:18:28 +00:00 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
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 |
|
Steel Titanium
|
0f11116e7b
|
Fix up controller menu support
|
2018-12-01 20:13:14 -05:00 |
|
Sryder
|
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 |
|
Sryder
|
c5e8e0badb
|
Merge branch 'master' into tiny-makefile-fix
|
2018-11-29 21:57:47 +00:00 |
|
Monster Iestyn
|
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 |
|
Alam Ed Arias
|
78a1931bdf
|
Makefile: disable implicit-fallthroug warnings
|
2018-11-26 19:38:14 -05:00 |
|
Alam Ed Arias
|
5a3f469593
|
Makefile: skip implicit-fallthroug warnings
|
2018-11-26 19:28:55 -05:00 |
|
Alam Ed Arias
|
ac2ec6c982
|
Makefile: disable some warnings for GCC 8.x
|
2018-11-26 19:01:40 -05:00 |
|
Monster Iestyn
|
4b0d45afd8
|
Merge branch 'opengl-noloading' into 'master'
Hide OpenGL loading screen
See merge request STJr/SRB2!349
|
2018-11-26 15:30:45 -05:00 |
|
Monster Iestyn
|
a71ca1d259
|
Merge branch 'fof-slope-skew-backport' into 'master'
FOF wall slope skewing backport
See merge request STJr/SRB2!341
|
2018-11-26 08:54:29 -05:00 |
|
Steel Titanium
|
ba111d42ca
|
Last minute changes.
|
2018-11-26 00:24:11 -05:00 |
|
Steel Titanium
|
cf01e820c4
|
Take the command line params into account
Really I'm just making it return early if either of the parms are used.
|
2018-11-25 22:39:11 -05:00 |
|
mazmazz
|
930835f1a2
|
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
|
2018-11-25 21:47:56 -05:00 |
|
Steel Titanium
|
7d4c9dda91
|
Add newline to end of file
|
2018-11-25 14:24:50 -05:00 |
|
Steel Titanium
|
981a1192fb
|
Save sound toggles to config
|
2018-11-25 14:22:52 -05:00 |
|
Monster Iestyn
|
aaabf062b8
|
Merge branch 'ms-cvars-fix' into 'master'
Update server name insantly
See merge request STJr/SRB2!344
|
2018-11-25 14:04:12 -05:00 |
|
Monster Iestyn
|
5069acb110
|
Merge branch 'mpc-software-yslope-fix' into 'master'
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
|
2018-11-25 11:51:54 -05:00 |
|
Monster Iestyn
|
028236006b
|
Merge branch '21-copyright-followup' into 'master'
Print copyright notice in stdout console on program start
See merge request STJr/SRB2!347
|
2018-11-25 11:07:34 -05:00 |
|
Monster Iestyn
|
8b4a64ac05
|
Merge branch 'last-min-cleanup' into 'master'
Last min cleanup
See merge request STJr/SRB2!342
|
2018-11-25 10:14:34 -05:00 |
|
Monster Iestyn
|
11cb2e05ba
|
Merge branch 'cmake-use-internal-libs' into 'master'
CMake: Use internal libs.
See merge request STJr/SRB2!325
|
2018-11-25 09:33:50 -05:00 |
|
mazmazz
|
e4d7ba39a9
|
Whitespace
|
2018-11-25 08:17:57 -05:00 |
|
mazmazz
|
83531469d7
|
Print GPL license notice and SEGA disclaimer in console on start
|
2018-11-25 08:12:19 -05:00 |
|
Digiku
|
40dfe89273
|
Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018
See merge request STJr/SRB2!346
|
2018-11-25 07:36:41 -05:00 |
|
mazmazz
|
bd4743007e
|
Update source copyrights to 2018, outdated targets
|
2018-11-25 07:35:53 -05:00 |
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Digiku
|
62443c9090
|
Merge branch '21-credits-update' into 'master'
Extra credits update .21
See merge request STJr/SRB2!345
|
2018-11-25 07:21:31 -05:00 |
|
Steel Titanium
|
f3ea628fea
|
Update server name instantly on change
|
2018-11-24 21:24:05 -05:00 |
|
mazmazz
|
cf8b4a6cb1
|
Additional 2.1 credits update
|
2018-11-23 21:57:07 -05:00 |
|
Monster Iestyn
|
794d27b49e
|
Kill CheckMissileImpact, it has been useless for probably a decade and a half
|
2018-11-23 23:14:49 +00:00 |
|
Monster Iestyn
|
0a0336a674
|
Merge branch 'master' into fof-slope-skew-backport
# Conflicts:
# src/r_segs.c
|
2018-11-23 22:40:28 +00:00 |
|
Monster Iestyn
|
d228e35fcb
|
Merge branch 'responsefile-fix' into 'master'
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
|
2018-11-23 15:59:40 -05:00 |
|
Steel Titanium
|
97dd291f3f
|
Merge branch 'master' into responsefile-fix
|
2018-11-23 15:29:52 -05:00 |
|
Alam Arias
|
30b9cef043
|
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
Render the skies correctly on splitscreen in OpenGL mode
|
2018-11-23 14:48:05 -05:00 |
|
Alam Arias
|
b1587cb0a3
|
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
Render the startup screen on OpenGL mode
|
2018-11-23 14:47:56 -05:00 |
|
Alam Arias
|
3d0fd7ff2e
|
Merge pull request #258 from light2yellow/master
m_fixed: asm: cc is not a register
|
2018-11-23 14:47:36 -05:00 |
|
Monster Iestyn
|
08af33c51f
|
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
|
2018-11-23 19:12:48 +00:00 |
|