Commit graph

4919 commits

Author SHA1 Message Date
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
336610c042 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -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
Digiku
aac4a99e99 Merge branch 'tutorial-time' into 'master'
Tutorial mode handling

See merge request STJr/SRB2Internal!201
2018-11-13 10:49:02 -05:00
Digiku
38107c9b3d Merge branch 'control-switching' into 'master'
Game control switching

See merge request STJr/SRB2Internal!202
2018-11-13 10:48:18 -05:00
Digiku
3f7df0561d Merge branch 'tracerangle' into 'master'
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away

See merge request STJr/SRB2Internal!198
2018-11-13 10:48:01 -05:00
Digiku
d10191ea5d Merge branch 'monitor-exec' into 'master'
Run linedef exec upon popping a monitor

See merge request STJr/SRB2Internal!199
2018-11-13 10:47:37 -05:00
mazmazz
9a36d559dc Compile errors 2018-11-13 10:43:40 -05:00
mazmazz
c92df614f0 Compile errors 2018-11-13 10:31:06 -05:00
Monster Iestyn
b45622fc0e Merge branch 'monitors-floatbob-fix' into 'next'
Fix for object z positions on floating, bobbing FOFs

See merge request STJr/SRB2!316
2018-11-13 08:58:08 -05:00
mazmazz
7b224cdcd5 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
3c168afc60 Check specifically for gcs_fps when starting tutorial 2018-11-13 01:57:51 -05:00
mazmazz
5270743a42 F_AdvanceToNextPage adjustment 2018-11-13 01:38:20 -05:00
mazmazz
422692ed03 NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
2018-11-13 00:13:36 -05:00
mazmazz
deb036058c text-prompts gclist -> gcl refactor 2018-11-12 23:31:10 -05:00
mazmazz
25857f04c0 Merge branch 'control-selector' into text-prompts 2018-11-12 23:26:27 -05:00
mazmazz
5cb72f7071 tutorial-time gclist -> gcl refactor 2018-11-12 23:25:49 -05:00
mazmazz
4fd469da56 Merge branch 'control-selector' into tutorial-time 2018-11-12 23:23:52 -05:00