Alam Ed Arias
|
7b2a7190dd
|
Added static library of SDL2 and SDL2_mixer for ARM systems
|
2018-12-22 20:48:15 -05:00 |
|
Alam Ed Arias
|
e6cf509a84
|
More work to cleanup the ARM builds
|
2018-12-22 19:50:32 -05:00 |
|
mazmazz
|
5ed5d09950
|
Center window on current monitor during vidmode change
|
2018-12-22 01:43:58 -05:00 |
|
Alam Arias
|
5765b3e034
|
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
|
7920dbe4a8
|
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
|
f674a77a8e
|
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
|
fb3fbf64bd
|
Update CMake paths for Windows DLLs
|
2018-12-20 16:46:40 -05:00 |
|
mazmazz
|
8a6031ba01
|
Update code versions to 2.1.22
|
2018-12-20 02:35:27 -05:00 |
|
Arthur
|
b762dc7bca
|
Common model format, with MD2/MD3 loading
|
2018-12-18 17:52:45 -05:00 |
|
Alam Ed Arias
|
261e1e623c
|
Clear float equal warnings
|
2018-12-14 20:34:06 -05:00 |
|
mazmazz
|
e1c0a7158b
|
Indentation
|
2018-12-08 14:10:56 -05:00 |
|
mazmazz
|
71aa97fc22
|
Force directsound to fix wrong-pitch sound effects
|
2018-12-08 14:05:58 -05:00 |
|
Monster Iestyn
|
b32f5830ed
|
Merge branch 'next' into 21-version
|
2018-12-04 17:19:36 +00:00 |
|
Monster Iestyn
|
dfdba01591
|
Merge branch 'master' into next
|
2018-12-04 17:18:19 +00:00 |
|
Digiku
|
2c557d668a
|
Merge branch 'joystick-juggling' into 'master'
Joystick juggling
See merge request STJr/SRB2!355
|
2018-12-04 11:51:55 -05:00 |
|
Monster Iestyn
|
ca01834d2e
|
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
|
95fff25a7f
|
Update OSX icon
|
2018-12-03 23:09:54 -05:00 |
|
mazmazz
|
a7b12b3ce5
|
Use static joyname instead of malloc
|
2018-12-03 12:35:12 -05:00 |
|
mazmazz
|
856f826afb
|
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
|
2018-12-03 05:37:07 -05:00 |
|
Monster Iestyn
|
dadaf83e41
|
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
|
2d2088fd85
|
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
|
94ad0b880f
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
Monster Iestyn
|
2e12cf411d
|
Backport the Blockmap library I made two years ago
|
2018-11-30 17:11:11 +00:00 |
|
Sryder
|
0847d7e29d
|
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
|
0897adcf98
|
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
|
c91b2b4456
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Monster Iestyn
|
0bff44e22b
|
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
|
8c845510a4
|
Update version to 2.1.21
|
2018-11-23 06:58:45 -05:00 |
|
Steel Titanium
|
0c30cd0fa1
|
Merge branch 'master' into responsefile-fix
|
2018-11-22 23:02:20 -05:00 |
|
Steel Titanium
|
6d946c1c84
|
Fix the not found errors on DLLs
|
2018-11-22 22:44:47 -05:00 |
|
Steel Titanium
|
e6fa257b42
|
Merge branch 'master' into cmake-use-internal-libs
|
2018-11-21 20:05:08 -05:00 |
|
Monster Iestyn
|
eb4eef6104
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
|
2018-11-20 14:33:10 +00:00 |
|
mazmazz
|
89a3c889dd
|
stray #if to #ifdef
|
2018-11-19 20:52:01 -05:00 |
|
Alam Ed Arias
|
3bd88acf25
|
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
|
45c8920bb1
|
Clean up warnings
|
2018-11-14 10:52:16 -05:00 |
|
Marco Z
|
999a03aada
|
Comment context for declaration changes; remove extern terms
|
2018-11-14 08:15:38 -05:00 |
|
Marco Z
|
f5fe8c46fa
|
Remove unnecessary SDLCALL from xpm declarations
|
2018-11-14 08:06:07 -05:00 |
|
Monster Iestyn
|
3350096b2f
|
Fix VC project files to include hw_clip.c/h
|
2018-11-14 12:11:57 +00:00 |
|
Steel Titanium
|
6eec21f49d
|
Merge branch 'master' into cmake-use-internal-libs
|
2018-11-13 19:46:43 -05:00 |
|
mazmazz
|
366aeadac4
|
Fix x64 build issue
|
2018-11-13 17:12:18 -05:00 |
|
mazmazz
|
4b63f20e9d
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-11-13 14:34:40 -05:00 |
|
mazmazz
|
df7d23f00d
|
Merge branch 'master' into musicplus-core
|
2018-11-13 13:46:30 -05:00 |
|
Monster Iestyn
|
4c3bfe81bd
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
|
2018-11-10 19:18:34 +00:00 |
|
Monster Iestyn
|
51ee510b85
|
Merge branch 'gcc-compiling-cleanup' into 'master'
Compiling cleanup and fixes
See merge request STJr/SRB2!311
|
2018-11-10 13:56:17 -05:00 |
|
Monster Iestyn
|
7989e9a482
|
Merge branch 'public_next'
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
|
2018-11-10 15:41:57 +00:00 |
|
Monster Iestyn
|
b34e8c5390
|
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
|
2018-11-08 16:26:55 +00:00 |
|
Steel Titanium
|
d7a0a3c94b
|
Update copyright info on some files
|
2018-11-01 14:47:19 -04:00 |
|
Steel Titanium
|
9847e6d181
|
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
|
2018-10-30 21:06:06 -04:00 |
|
Monster Iestyn
|
a0c822fec8
|
Merge branch 'public_next'
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
|
2018-10-20 15:31:48 +01:00 |
|
mazmazz
|
bf93dace76
|
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
|
2018-10-19 22:04:26 -04:00 |
|