stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 18:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
5620 commits 172 branches 41 tags 281 MiB
Commit graph

5620 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
9c70c87f8e Merge branch 'master' into next 2018-11-14 18:01:31 +00:00
Monster Iestyn
8c95ef8a1d 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
fc4bb83c3e 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
cc3dd1f664 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
97fd69951a Merge branch 'master' into next 2018-11-14 11:07:12 -05:00
Alam Ed Arias
de5b626520 Fix misleading indentation 2018-11-14 11:06:45 -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
d14f87b8c6 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias
938bf1605c Merge branch 'master' into next 2018-11-14 10:52:49 -05:00
Alam Ed Arias
f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
mazmazz
cf834f3503 Line 457: Calculate input angle tolerance correctly 2018-11-14 10:13:39 -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
Monster Iestyn
0625ffcf8a 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
0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
mazmazz
b4c87d585e Add SDL Mixer 2.0.4 VC package 2018-11-13 22:05:05 -05:00
mazmazz
85fc8a1d47 Add SDL 2.0.9 VC package 2018-11-13 22:02:18 -05:00
Steel Titanium
2ca5e29110 Make sure the new option only works on Windows. 
Is this how you do it? I'm not really sure.
 2018-11-13 20:37:14 -05:00
Steel Titanium
4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
Steel Titanium
d0b64222f7 Merge branch 'master' into cmake-use-internal-libs 2018-11-13 19:46:43 -05:00
Monster Iestyn
302358c403 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
41b4ffd458 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
Steel Titanium
9029cf5d9c Fix skybox disappearing after using objectplace command 2018-11-13 17:25:42 -05:00
mazmazz
2db2b6e6af Win32 boolean fixes 2018-11-13 17:24:19 -05:00
Steel Titanium
95ed3fcf7e Save current renderer to screenshots 2018-11-13 17:19:22 -05:00
mazmazz
894ee02f3f Fix x64 build issue 2018-11-13 17:12:18 -05:00
mazmazz
2e39e5ffdd Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders 2018-11-13 16:43:16 -05:00
mazmazz
ba821056ce Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders 2018-11-13 16:40:43 -05:00
mazmazz
6bb408da08 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -05:00
Monster Iestyn
e9fe0ebae1 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
0d38061db8 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
Digiku
da0084095c 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
6c69dd1f78 Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
Digiku
b6a0b2f1d9 Merge branch 'tutorial-time' into 'master' 
Tutorial mode handling

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

See merge request STJr/SRB2Internal!202
 2018-11-13 10:48:18 -05:00
Digiku
3ccfd57fba 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
1b7f7ef7cc 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
dbb4924348 Compile errors 2018-11-13 10:43:40 -05:00
mazmazz
c1c815ce6e Compile errors 2018-11-13 10:31:06 -05:00
Monster Iestyn
395a67196e 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
4b3dff3ef3 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
3d7b185ea0 Check specifically for gcs_fps when starting tutorial 2018-11-13 01:57:51 -05:00
mazmazz
6f435ee410 F_AdvanceToNextPage adjustment 2018-11-13 01:38:20 -05:00
mazmazz
75c4a96e69 NextTag implementation 
* Adjust named tag implementation to be more portable
* Next page adjustments
 2018-11-13 00:13:36 -05:00
mazmazz
f4ad5ebfba text-prompts gclist -> gcl refactor 2018-11-12 23:31:10 -05:00
mazmazz
3a00439f3a Merge branch 'control-selector' into text-prompts 2018-11-12 23:26:27 -05:00
mazmazz
96da056f81 tutorial-time gclist -> gcl refactor 2018-11-12 23:25:49 -05:00
mazmazz
870ee89371 Merge branch 'control-selector' into tutorial-time 2018-11-12 23:23:52 -05:00
mazmazz
1d86cc348d Refactor gclists 2018-11-12 23:23:39 -05:00