Commit graph

12874 commits

Author SHA1 Message Date
Rachael Alexanderson
61660bf147 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-05-28 10:50:06 -04:00
alexey.lysiuk
f759e1155a Damage factor on armor is no longer ignored
https://forum.zdoom.org/viewtopic.php?t=56632
2017-05-28 17:41:44 +03:00
alexey.lysiuk
e56cda1350 Fixed crash on change particular sound options
Happened only when there is a current song but it’s not played, for example in title screen
https://forum.zdoom.org/viewtopic.php?t=56631
2017-05-28 17:18:35 +03:00
Rachael Alexanderson
65bb8a5185 Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom 2017-05-28 07:13:27 -04:00
Rachael Alexanderson
619281de64 Revert "Merge commit 'refs/pull/336/head' of https://github.com/coelckers/gzdoom"
This reverts commit a05c38fefd, reversing
changes made to 0fb1a0604c.
2017-05-28 07:12:41 -04:00
Christopher Bruns
a49afd5bfc Initial OpenVR mode.
Second attempt: clean up commit, and avoid messing with HDR framebuffer format.
2017-05-28 06:20:32 -04:00
Rachael Alexanderson
a05c38fefd Merge commit 'refs/pull/336/head' of https://github.com/coelckers/gzdoom 2017-05-28 01:33:59 -04:00
Rachael Alexanderson
0fb1a0604c Merge https://github.com/coelckers/gzdoom 2017-05-27 21:52:43 -04:00
Christopher Bruns
a149b54226 Maybe avoid gcc compile problem with forward declared enum. 2017-05-27 20:16:00 -04:00
Christopher Bruns
c1bacdbf92 Create initial rotation-tracking-only implementation of OpenVR mode for VR headsets. 2017-05-27 19:42:49 -04:00
Rachael Alexanderson
9435a09f1e - Added vid_glswfb to menu on Mac. 2017-05-27 08:01:56 -04:00
Rachael Alexanderson
d0c1dc9b02 - Added compatibility fix for Doom2's map18 for missing textures on one of the door frames - lines 451 and 459 2017-05-27 06:53:36 -04:00
Rachael Alexanderson
a7cc6fb1ba - fixed: 'IfOption(Linux)' is actually 'IfOption(unix)' in menudef 2017-05-27 05:12:59 -04:00
Rachael Alexanderson
9ebf1ec9a2 - Update menu to match new vid_glswfb config
- Added vid_glswfb to menu on Linux
2017-05-27 04:58:48 -04:00
Rachael Alexanderson
4545bb2fa1 - rename vid_used3d on windows to vid_glswfb to match Linux. Additionally, the values were reversed to match the Linux variant of this configuration. This CVar now operates exactly the same way it does on Linux, except it defaults to being off and still allows the D3D framebuffer on Windows when it's deactivated. 2017-05-27 04:52:43 -04:00
Rachael Alexanderson
872db304f0 Merge https://github.com/coelckers/gzdoom 2017-05-27 04:31:53 -04:00
Magnus Norddahl
b111a708da - Fix compile error and some warnings 2017-05-27 06:27:36 +02:00
Magnus Norddahl
3f991429d1 - Reduce the number of naked new/delete calls in OpenGLSWFrameBuffer 2017-05-27 02:31:15 +02:00
Rachael Alexanderson
40bbb70799 Merge https://github.com/coelckers/gzdoom 2017-05-26 18:17:35 -04:00
alexey.lysiuk
67d313cf25 Fixed megasphere item selection in bot code
https://forum.zdoom.org/viewtopic.php?t=56604
2017-05-26 11:54:42 +03:00
Rachael Alexanderson
5c30a99aa9 Merge https://github.com/coelckers/gzdoom 2017-05-25 10:39:14 -04:00
alexey.lysiuk
d633e8afc1 Fixed sector iteration with Floor_Stop and Ceiling_Stop action specials
https://forum.zdoom.org/viewtopic.php?t=56582
2017-05-25 10:41:06 +03:00
alexey.lysiuk
3da02764d5 Updated Travis CI configuration
Use MinSizeRel configuration with Clang 4.0 on Linux
Use Debug configuration with GCC 7
2017-05-25 10:30:55 +03:00
Rachael Alexanderson
d757279c92 Merge https://github.com/coelckers/gzdoom 2017-05-24 05:49:38 -04:00
alexey.lysiuk
d766d22336 Added GCC 7 target to Travis CI configuration 2017-05-24 11:16:02 +03:00
Rachael Alexanderson
538bfabef8 Merge https://github.com/coelckers/gzdoom 2017-05-23 06:17:46 -04:00
Christoph Oelckers
9d73e4c635 - fixed errors in wallsprite setup for the classic software renderer:
* it did not use the correct texture.
* it had a math error in the right edge's y-coordinate calculation.
2017-05-23 09:37:38 +02:00
Dugan Chen
bc0f9023f6 Add mem_fn header to oalsound.cpp 2017-05-22 21:54:58 +02:00
Rachael Alexanderson
7600fdb200 Merge https://github.com/coelckers/gzdoom 2017-05-22 13:10:19 -04:00
svdijk
bdfc42182f OPLsynth: Default to center panning. 2017-05-22 09:15:02 +02:00
Christoph Oelckers
42e62d9005 - fixed: Harmony requires special scaling treatment for the fullscreen HUD's icons. 2017-05-21 21:30:46 +02:00
Christoph Oelckers
7bc5573baa - call P_FindParticleSubsectors before rendering a save picture in OpenGL.
This entry point was the only one missing that call.
2017-05-21 12:45:49 +02:00
Christoph Oelckers
fc0855fac7 - fixed size of particles in the hardware renderer.
From the look of it the scale was changed in the software renderer several years back but the hardware renderer never got adjusted for it.
This also adds a bit of compensation to round particles so that they get rendered a bit larger than square ones.
2017-05-21 12:36:34 +02:00
Christoph Oelckers
be2cfddb17 - handle the case where SBARINFO only contains a mugshot definition and fall back to the current statusbarclass if creating an SBARINFO-based statusbar fails. 2017-05-21 12:06:22 +02:00
Magnus Norddahl
e27e89b57d - Make sure a hung worker thread always crashes the application 2017-05-21 12:03:12 +02:00
Rachael Alexanderson
3955b7a4f8 Merge https://github.com/coelckers/gzdoom 2017-05-21 05:52:27 -04:00
Magnus Norddahl
aff9205057 - Fix mipmap filtering bug when using nearest filter 2017-05-21 11:01:37 +02:00
svdijk
371a8755c2 vid_glswfb: Prevent defunct windows. 2017-05-20 23:21:51 +02:00
Christoph Oelckers
4388d97db6 - PlayerPawn.PlayerThink needs to consider the possibility of the player getting unmorphed and must call any function after a potential unmorph through 'player.mo' instead of 'self'. 2017-05-20 20:56:43 +02:00
Rachael Alexanderson
fd0602a163 Merge https://github.com/coelckers/gzdoom 2017-05-19 23:40:51 -04:00
Christoph Oelckers
fc8639226d - yet again Visual Studio's autocompletion feature deleted some tildes. 2017-05-19 21:36:32 +02:00
Christoph Oelckers
a4231ffd00 - more handling of some very broken old ATI drivers. 2017-05-19 21:33:48 +02:00
Christoph Oelckers
e1cd0dc588 - major optimization on carry scroller code.
The old version was checking every single actor in every single sector for being affected by a carry scroller if there was so much as a single such scroller in the map.
Changed it so that the scroll thinker flags all actors in the affected sectors so that these expensive calculations can be skipped for everything else.
This change and reduce think time by 1/3 on maps like ZDCMP2 (on the test machine it went down from 6 ms to 4 ms on this map.)
2017-05-19 16:31:44 +02:00
Christoph Oelckers
9fc309d5b5 - stop the music when processing a fatal error. 2017-05-19 12:20:33 +02:00
Christoph Oelckers
c1e64fa576 - fixed: The rail trail should use r_trail_sparsity, not r_spiral_sparsity.
- fixed: Spawning actors on the rail trail must ignore the sparsity CVARs completely.
2017-05-19 12:03:20 +02:00
Christoph Oelckers
c8e631bf26 - fixed: The colormap was not fully initialized for 3D floors in sectors where neither the original floor nor ceiling were visible. 2017-05-19 11:42:44 +02:00
Christoph Oelckers
97b664968e - removed a few unused VM opcodes. 2017-05-19 10:27:22 +02:00
Rachael Alexanderson
2f743c3128 Merge https://github.com/coelckers/gzdoom 2017-05-19 04:10:25 -04:00
svdijk
8ece6dff6a Menu: Never treat keys with no "Char" as hotkeys. 2017-05-18 21:29:08 +02:00
svdijk
4b8f4212ef Menu: Hotkeys should only select selectable items. 2017-05-18 21:29:08 +02:00