Monster Iestyn
|
07fc73dbad
|
Merge branch 'mingw-64bit' into 'master'
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
|
2018-11-18 19:49:18 -05:00 |
|
Steel Titanium
|
e1f7717f24
|
Statically link stdc++ and libgcc into libgme
Should fix libgme depending on two DLLs externally.
|
2018-11-18 18:09:34 -05:00 |
|
Monster Iestyn
|
b912008c41
|
Merge branch 'master' into next
|
2018-11-18 17:11:57 +00:00 |
|
Monster Iestyn
|
dbb308e284
|
Merge branch 'camera-subsector-crash-fix' into 'master'
Camera subsector crash fix
See merge request STJr/SRB2!318
|
2018-11-18 08:28:38 -05:00 |
|
Steel Titanium
|
15a70109ae
|
Add missing 64-bit libgme dll
|
2018-11-15 13:30:59 -05:00 |
|
Steel Titanium
|
a84c49d7d6
|
Some small changes
|
2018-11-14 21:01:54 -05:00 |
|
Steel Titanium
|
ae2b331a11
|
Fix up compiling on DD version
|
2018-11-14 18:00:10 -05:00 |
|
Steel Titanium
|
a817c84836
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
|
2018-11-14 17:28:41 -05:00 |
|
Alam Ed Arias
|
8277f32b67
|
fix format-truncation: need bigger string buffers
|
2018-11-14 16:50:52 -05:00 |
|
Monster Iestyn
|
d366ee76b6
|
Merge branch 'master' into next
|
2018-11-14 21:49:11 +00:00 |
|
Monster Iestyn
|
9e3e9a3248
|
Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
|
2018-11-14 16:48:13 -05:00 |
|
Alam Ed Arias
|
270ec5e2b9
|
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
|
2018-11-14 16:32:57 -05:00 |
|
Alam Ed Arias
|
e2249b3f08
|
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
|
2018-11-14 16:26:46 -05:00 |
|
Alam Ed Arias
|
f2f02c6095
|
TravisCI: test build on GCC 8.x
|
2018-11-14 15:56:46 -05:00 |
|
Alam Ed Arias
|
aef0d9a421
|
Merge branch 'master' into next
|
2018-11-14 15:45:29 -05:00 |
|
MonsterIestyn
|
0ea835058c
|
Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
|
2018-11-14 19:57:47 +00:00 |
|
MonsterIestyn
|
44646db6af
|
Merge branch 'master' into analog-flipcam-synch-fix
|
2018-11-14 19:36:39 +00:00 |
|
Monster Iestyn
|
4e86572285
|
Merge branch 'master' into next
|
2018-11-14 18:01:31 +00:00 |
|
Monster Iestyn
|
a0bec73904
|
Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4
See merge request STJr/SRB2!322
|
2018-11-14 12:58:07 -05:00 |
|
Monster Iestyn
|
16451363b9
|
Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9
See merge request STJr/SRB2!321
|
2018-11-14 12:57:54 -05:00 |
|
Digiku
|
b10ae14719
|
Merge branch 'tracer-angle-fix' into 'master'
Line 457 Track Object Angle: Calculate input angle tolerance correctly
See merge request STJr/SRB2Internal!203
|
2018-11-14 11:31:54 -05:00 |
|
Alam Ed Arias
|
525bd219b6
|
Merge branch 'master' into next
|
2018-11-14 11:07:12 -05:00 |
|
Alam Ed Arias
|
05afaa586e
|
Fix misleading indentation
|
2018-11-14 11:06:45 -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
|
fbb28ba1b5
|
Cleanup whitespace
|
2018-11-14 10:54:33 -05:00 |
|
Alam Ed Arias
|
a4726ee0b7
|
Merge branch 'master' into next
|
2018-11-14 10:52:49 -05:00 |
|
Alam Ed Arias
|
45c8920bb1
|
Clean up warnings
|
2018-11-14 10:52:16 -05:00 |
|
mazmazz
|
368b12d6d9
|
Line 457: Calculate input angle tolerance correctly
|
2018-11-14 10:13:39 -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 |
|
Monster Iestyn
|
fabcb3d842
|
Merge branch 'public-winsnd-libgme-fix' into 'master'
Missed #ifdef HAVE_LIBGME in win_snd
See merge request STJr/SRB2!326
|
2018-11-14 06:40:07 -05:00 |
|
Marco Z
|
af0fdfe6e5
|
Missed #ifdef HAVE_LIBGME in win_snd
|
2018-11-13 22:50:08 -05:00 |
|
mazmazz
|
98ba84f50d
|
Add SDL Mixer 2.0.4 VC package
|
2018-11-13 22:05:05 -05:00 |
|
mazmazz
|
b438361869
|
Add SDL 2.0.9 VC package
|
2018-11-13 22:02:18 -05:00 |
|
Steel Titanium
|
be3fac2908
|
Fix up 64-bit MINGW
|
2018-11-13 20:32:18 -05:00 |
|
Monster Iestyn
|
0c0cbb3b00
|
Merge branch 'mixer-sound-x64-fix' into 'master'
mixer_sound fix x64 build issue
See merge request STJr/SRB2!323
|
2018-11-13 17:42:23 -05:00 |
|
Monster Iestyn
|
a09ee2729c
|
Merge branch 'extend-png-metadata' into 'master'
Save the current renderer to screenshots.
See merge request STJr/SRB2!324
|
2018-11-13 17:28:29 -05:00 |
|
mazmazz
|
86f48304ba
|
Win32 boolean fixes
|
2018-11-13 17:24:19 -05:00 |
|
Steel Titanium
|
792d42ebd9
|
Save current renderer to screenshots
|
2018-11-13 17:19:22 -05:00 |
|
mazmazz
|
366aeadac4
|
Fix x64 build issue
|
2018-11-13 17:12:18 -05:00 |
|
mazmazz
|
9086d880a3
|
Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders
|
2018-11-13 16:43:16 -05:00 |
|
mazmazz
|
b4de5baa08
|
Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders
|
2018-11-13 16:40:43 -05:00 |
|
mazmazz
|
22ce982335
|
Merge branch 'master' into musicplus-core
|
2018-11-13 14:19:04 -05:00 |
|
mazmazz
|
336610c042
|
Remove misplaced tutorialmode = false due to debugging
|
2018-11-13 14:12:22 -05:00 |
|
mazmazz
|
df7d23f00d
|
Merge branch 'master' into musicplus-core
|
2018-11-13 13:46:30 -05:00 |
|
Monster Iestyn
|
f114f8cd26
|
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
|
2018-11-13 18:14:59 +00:00 |
|
Monster Iestyn
|
0ed4efdb58
|
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
|
2018-11-13 18:13:51 +00:00 |
|
Digiku
|
656a471908
|
Merge branch 'text-prompts' into 'master'
SOC and Line Exec Text Prompts
See merge request STJr/SRB2Internal!200
|
2018-11-13 11:14:02 -05:00 |
|
mazmazz
|
7b0ec6479f
|
Merge branch 'master' into text-prompts
|
2018-11-13 11:12:44 -05:00 |
|