Marco Z
|
88c4a54cea
|
Add GME to VC10 SRB2SDL project
|
2019-01-04 20:43:42 -05:00 |
|
Digiku
|
5278d1ca20
|
Merge branch 'caps-lock-consistency-fix' into 'master'
Update capslock state on window re-focus
See merge request STJr/SRB2!436
|
2019-01-01 15:05:20 -05:00 |
|
Digiku
|
80e30c6aaa
|
Merge branch 'MSVC-ARM' into 'master'
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
|
2018-12-28 01:05:40 -05:00 |
|
james
|
0b857f127f
|
Update capslock state on window re-focus
|
2018-12-26 15:49:57 -08:00 |
|
mazmazz
|
894c139bf1
|
Update code versions to 2.1.23
|
2018-12-26 16:31:43 -05:00 |
|
mazmazz
|
7fc79f0b88
|
Merge remote-tracking branch 'public-gl/master' into 2122-version
|
2018-12-24 17:31:03 -05:00 |
|
mazmazz
|
ed410575d6
|
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
|
2018-12-23 22:09:16 -05:00 |
|
Steel Titanium
|
46d1a866d8
|
Another attempt to lock the mouse
|
2018-12-23 18:54:15 -05:00 |
|
mazmazz
|
c0a0c5ac5d
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-23 18:09:14 -05:00 |
|
Monster Iestyn
|
2d675750cf
|
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
|
2018-12-23 21:52:49 +00:00 |
|
Steel Titanium
|
40a037f603
|
A more through out attempt to lock the mouse
|
2018-12-23 14:54:14 -05:00 |
|
mazmazz
|
b49cf11fb6
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-22 23:41:55 -05:00 |
|
Steel Titanium
|
66e13cf1cc
|
SDL:Auto grab input
|
2018-12-22 23:28:59 -05:00 |
|
Alam Ed Arias
|
0ed9665a79
|
Added static library of SDL2 and SDL2_mixer for ARM systems
|
2018-12-22 20:48:15 -05:00 |
|
Alam Ed Arias
|
102fd11cb4
|
More work to cleanup the ARM builds
|
2018-12-22 19:50:32 -05:00 |
|
mazmazz
|
8707b2f40a
|
Center window on current monitor during vidmode change
|
2018-12-22 01:43:58 -05:00 |
|
Alam Arias
|
b6a917cda1
|
Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
|
2018-12-21 16:47:10 -05:00 |
|
Digiku
|
58a2cec70f
|
Merge branch 'float_equal' into 'master'
Clear Float equal warnings
See merge request STJr/SRB2!383
|
2018-12-20 16:58:37 -05:00 |
|
Digiku
|
f405f1ae30
|
Merge branch 'cmake-dllpath-fix' into 'master'
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
|
2018-12-20 16:53:06 -05:00 |
|
mazmazz
|
0519d8c52d
|
Update CMake paths for Windows DLLs
|
2018-12-20 16:46:40 -05:00 |
|
mazmazz
|
9d212b340b
|
Update code versions to 2.1.22
|
2018-12-20 02:35:27 -05:00 |
|
Alam Ed Arias
|
6fd66bdb49
|
Clear float equal warnings
|
2018-12-14 20:34:06 -05:00 |
|
mazmazz
|
47ee3525af
|
Indentation
|
2018-12-08 14:10:56 -05:00 |
|
mazmazz
|
01f1933f69
|
Force directsound to fix wrong-pitch sound effects
|
2018-12-08 14:05:58 -05: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
|
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
|
60feae1014
|
Update OSX icon
|
2018-12-03 23:09:54 -05:00 |
|
mazmazz
|
8851f39b84
|
Use static joyname instead of malloc
|
2018-12-03 12:35:12 -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
|
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 |
|
Monster Iestyn
|
33c1ac33f5
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
Monster Iestyn
|
11cb163435
|
Backport the Blockmap library I made two years ago
|
2018-11-30 17:11:11 +00: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 |
|
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
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -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 |
|
mazmazz
|
36e020c366
|
Update version to 2.1.21
|
2018-11-23 06:58:45 -05:00 |
|
Steel Titanium
|
fe43deacec
|
Merge branch 'master' into responsefile-fix
|
2018-11-22 23:02:20 -05:00 |
|
Steel Titanium
|
6020abab94
|
Fix the not found errors on DLLs
|
2018-11-22 22:44:47 -05:00 |
|
Steel Titanium
|
ff9c41ca5f
|
Merge branch 'master' into cmake-use-internal-libs
|
2018-11-21 20:05:08 -05:00 |
|
Alam Ed Arias
|
f81d01edca
|
Merge branch 'vc-xpm-fix' into 'master'
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
|
2018-11-14 11:00:20 -05:00 |
|
Alam Ed Arias
|
f73ea4f984
|
Clean up warnings
|
2018-11-14 10:52:16 -05:00 |
|
Marco Z
|
8777d5c6c9
|
Comment context for declaration changes; remove extern terms
|
2018-11-14 08:15:38 -05:00 |
|
Marco Z
|
51768e7dd1
|
Remove unnecessary SDLCALL from xpm declarations
|
2018-11-14 08:06:07 -05:00 |
|
Monster Iestyn
|
f3b59c1731
|
Fix VC project files to include hw_clip.c/h
|
2018-11-14 12:11:57 +00:00 |
|
Steel Titanium
|
d0b64222f7
|
Merge branch 'master' into cmake-use-internal-libs
|
2018-11-13 19:46:43 -05:00 |
|
mazmazz
|
894ee02f3f
|
Fix x64 build issue
|
2018-11-13 17:12:18 -05:00 |
|