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 |
|
mazmazz
|
eb7718bfeb
|
PicToStart implementation; fix NumPrompts limitation error
|
2018-11-12 23:16:24 -05:00 |
|
mazmazz
|
d31b4b792b
|
F_GetTextPromptTutorialTag implementation
|
2018-11-12 22:47:20 -05:00 |
|
mazmazz
|
a362407886
|
Merge branch 'control-selector' into text-prompts
|
2018-11-12 21:11:53 -05:00 |
|
mazmazz
|
7ec4a42d9f
|
Force chasecam for tutorialmode
|
2018-11-12 20:37:55 -05:00 |
|
mazmazz
|
a0926b5314
|
First time tutorial prompt fixes
|
2018-11-12 19:10:41 -05:00 |
|
mazmazz
|
5200f55e40
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-12 18:08:48 -05:00 |
|
mazmazz
|
118da60615
|
Freeze camera values in tutorialmode with proper defaults
|
2018-11-12 18:08:24 -05:00 |
|
mazmazz
|
a58461c29e
|
Merge branch 'tutorial-time' into tutorial-time-camera
|
2018-11-12 17:41:49 -05:00 |
|
mazmazz
|
80c613561c
|
->defalutvalue -- .defaultvalue adjustment
|
2018-11-12 17:37:54 -05:00 |
|
mazmazz
|
40e5a2104b
|
Also set cv_analog for tutorialgcs
* M_TutorialSaveControlResponse CV_Set adjustment
|
2018-11-12 17:34:56 -05:00 |
|
mazmazz
|
acd922886a
|
Change mouse cv vars temporarily alongside control scheme
|
2018-11-12 17:30:21 -05:00 |
|
mazmazz
|
44b42af22b
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 17:17:02 -05:00 |
|
mazmazz
|
1a5ccb2781
|
Uncomment gcs_platform
|
2018-11-12 17:16:54 -05:00 |
|
mazmazz
|
4986d5945b
|
Restrict control changes if tutorialgcs is active
|
2018-11-12 16:56:06 -05:00 |
|
mazmazz
|
45381058b3
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 16:54:49 -05:00 |
|
mazmazz
|
31c1145cf3
|
Uncomment gcs_platform defaults
|
2018-11-12 16:54:42 -05:00 |
|
mazmazz
|
ab084f1bc9
|
Add tutorialgcs variable for optional control scheme loading
|
2018-11-12 16:50:03 -05:00 |
|
Monster Iestyn
|
e85f73117c
|
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
|
2018-11-12 20:07:45 +00:00 |
|
Monster Iestyn
|
63ba59341b
|
Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing
|
2018-11-12 16:23:59 +00:00 |
|
mazmazz
|
8f7c1e7f71
|
Fix CopyControls not firing when starting tutorial while keeping current controls
|
2018-11-11 23:42:02 -05:00 |
|