Christoph Oelckers
79f3984346
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-07-26 10:17:47 +02:00
Christoph Oelckers
5576892c01
Merge branch 'redundant_offsetof_macro' of https://github.com/edward-san/zdoom
2014-07-26 10:17:25 +02:00
Christoph Oelckers
e7f844b61a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-26 10:15:23 +02:00
Christoph Oelckers
a21f01bc5f
- added jpalomo's submission to make freelook a 3-state setting, like crouch and jump. This required moving around the flags a bit so demo compatibility had to be bumped. It may also require adjustment for launchers that can set the dmflags.
2014-07-26 10:15:07 +02:00
Randy Heit
ff257a0300
Fix compiling with provided VS 2005 projects
2014-07-21 22:31:05 -05:00
Edward Richardson
0276760a2d
Animate switches when bumped
2014-07-19 21:00:12 +12:00
Edoardo Prezioso
ae2f7b8707
- Remove a duplicate of a custom offsetof macro.
...
It's already defined in cmdlib.h .
2014-07-19 00:53:18 +02:00
Edoardo Prezioso
484eb347ca
- Fixed: wrong FString empty string check.
...
Even when '+logfile' argument was omitted, the console would print 'Could not start log', because 'logfile != NULL' was used as a check for the presence of '+logfile' argument, but the internal buffer of FString is never NULL, so the right check is 'logfile.isNotEmpty()'.
While I'm at it, I fixed another bad check for 'pagename'.
2014-07-18 01:15:41 +02:00
Christoph Oelckers
e0b756e511
- fixed: The cubemapped skybox renderer did not set up the model matrix properly.
2014-07-17 10:04:20 +02:00
Christoph Oelckers
f64428dd2a
Merge branch 'master' into Glew_Version_For_Real
2014-07-17 09:31:18 +02:00
Christoph Oelckers
b78b566b0a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-17 09:30:50 +02:00
Christoph Oelckers
eb9d2d9917
- reactivate compatibility profile so that immediate mode drawing can be used on older hardware not supporting persistently mapped buffers.
...
- reactivate alpha testing per fixed function pipeline
- use the 'modern' way to define clip planes (GL_CLIP_DISTANCE). This is far more portable than the old glClipPlane method and a lot more robust than checking this in the fragment shader.
2014-07-17 02:37:18 +02:00
Edward Richardson
f99a84b498
Changes to maketic/menu/console updates
...
- Console and Menu will now update cleanly during stalls.
- Moved net adaption so uncapped framerate will always use it.
2014-07-17 11:29:30 +12:00
Braden Obrzut
84cb49b074
- Fixed: Legacy render style array was in the wrong order.
2014-07-16 19:19:20 -04:00
Braden Obrzut
b6bbdf6195
- Call C_DeinitConsole in I_Quit so that we can be sure that Printf will work for as long as possible. Otherwise ZDoom will crash when ending a demo recording.
2014-07-16 18:59:49 -04:00
Braden Obrzut
bd5bf2a40a
- Expand environment variables for autoload paths.
...
- Forgot to save the French translation file for the last commit, so a few more corrections there.
2014-07-15 21:26:26 -04:00
Braden Obrzut
bfbea40415
- Fixed some typos with chex quest obituaries and French translation error.
2014-07-15 21:20:05 -04:00
Braden Obrzut
fa5dfe79ae
- Disable cubic and spline resamplers on 64-bit with fmod 4.26 since they crash.
2014-07-15 21:07:07 -04:00
Braden Obrzut
2020769967
- Fixed: Player turned into a zombie if exiting telefragged in buddha mode.
...
- Fixed: Players could drop their inventory after dying.
2014-07-15 20:16:28 -04:00
Christoph Oelckers
6b9d6787d9
- move models into their own draw list to avoid frequent buffer changes.
...
- same for SKYHACK walls. Although rare, they would get in the way of optimizing the draw calls if not being separated out.
2014-07-15 21:16:59 +02:00
Christoph Oelckers
b8bcbe819b
- removed texture based dynamic lighting. For GL 3.x the shader approach is always better.
...
- fixed: sky fog was not unset.
2014-07-15 20:49:21 +02:00
Christoph Oelckers
fb6b4238ed
- fixed: glProgramUniform is only present from GL 4.1 or a specific extension so it may not be used on systems not supporting it.
2014-07-15 02:48:59 +02:00
Christoph Oelckers
fc0cf4f998
- GZDoom now runs on an OpenGL core profile. :)
...
It's probably still necessary to replace GLEW with another loader library. GLEW is pretty much broken on core OpenGL without some hacky workarounds...
2014-07-15 02:26:23 +02:00
Christoph Oelckers
6046b11b4f
- all shaders now compile in core profile.
2014-07-15 01:05:53 +02:00
Christoph Oelckers
eedc5a69be
- replaced builtin position vertex attribute.
2014-07-15 01:02:48 +02:00
Christoph Oelckers
1b7f5a2e6a
- replaced builtin texture coordinate vertex attribute.
2014-07-15 00:59:01 +02:00
Christoph Oelckers
5a322742c3
- remove use of builtin and deprecated color vertex attribute.
2014-07-15 00:37:13 +02:00
Christoph Oelckers
5193f6cfef
- remove use of builtin deprecated varyings in shaders.
2014-07-15 00:19:41 +02:00
Christoph Oelckers
ed8a21fd86
- replaced deprecated alpha testing with shader code.
2014-07-14 21:14:43 +02:00
Christoph Oelckers
84a49e37ee
- handle normals for spheremapped mirror surfaces using non-deprecated features.
...
- move all WGL references out of global header files so that global wgl header include is no longer necessary
2014-07-14 19:54:07 +02:00
Christoph Oelckers
ed5ee4e8d1
- removed some obsolete init stuff and some deprecated constants.
2014-07-14 18:48:46 +02:00
Christoph Oelckers
4df25d951b
Merge branch 'master' into Glew_Version_For_Real
2014-07-14 16:51:41 +02:00
Christoph Oelckers
4297bd9a51
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-14 00:32:16 +02:00
Christoph Oelckers
1f2f7616e1
- remove timing of matrix application method
2014-07-14 00:31:10 +02:00
Christoph Oelckers
150135a07d
- reinstate drawcall timing.
2014-07-13 23:14:28 +02:00
Christoph Oelckers
ce3653f6e1
- remove all uses of builtin matrices.
2014-07-13 23:13:40 +02:00
Christoph Oelckers
2214c0ac06
- remove all uses of builtin matrix manipulation. Only glLoadMatrix for view and projection matrix are left.
2014-07-13 22:37:34 +02:00
Christoph Oelckers
dbb05c5f33
- remove use of builtin texture matrices.
...
- make matrix class single precision.
2014-07-13 20:41:20 +02:00
Christoph Oelckers
9230a20f18
- added some checks to the wall rendering code that will allow to disable the clip planes in many cases, even when a plane mirror portal is active. This also solves the precision issue with using world coordinates for clip checks.
2014-07-13 17:15:17 +02:00
Christoph Oelckers
00fcf4bc06
- for some reason using world coordinates for clipping in the shader is somewhat imprecise so the clip plane heights have to be adjusted a bit for it.
2014-07-13 13:25:42 +02:00
Christoph Oelckers
60dc2e1122
- some shader fixes.
2014-07-13 13:01:35 +02:00
Christoph Oelckers
d868f60f6c
- since the clip planes for plane mirrors did not work anymore I reimplemented them using shader based logic. It still needs to be seen if this affects performance on older hardware.
2014-07-13 12:14:12 +02:00
Christoph Oelckers
004cf5748c
- fixed: FraggleScript's SpawnedThings array must always be checked for owned inventory items. The 'mapthingnumexist' function forgot to do that.
2014-07-13 09:43:28 +02:00
Christoph Oelckers
400a573e65
- fixed: ACS's LineAttack function with a valid tid still used the activator as the attack's source.
2014-07-13 09:12:46 +02:00
Edward Richardson
e1130b860e
Serialize FriendPlayer
2014-07-13 14:44:22 +12:00
Christoph Oelckers
7cbffc7c14
- test code removal.
2014-07-10 10:35:02 +02:00
Christoph Oelckers
a936629cec
- use default fragment shader for burn and stencil shader, with the time consuming parts disabled by a #define, to avoid code duplication.
2014-07-10 10:33:07 +02:00
Christoph Oelckers
e691341541
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-09 09:16:30 +02:00
Christoph Oelckers
e1729a9ec2
- fixed compilation with VC++2005 solution.
...
hu_stuff.h defined some callbacks for qsort without STACK_ARGS which causes problems with this solution's Release setting which uses __fastcall calling convention.
2014-07-09 09:15:51 +02:00
Edoardo Prezioso
d83f048858
- Miscellaneous CMakeLists.txt fixes.
...
- fixed a CMake warning about uninitialized use of the variable CROSS_EXPORTS in the tools subfolder when CMAKE_CROSSCOMPILING is off;
- fixed a variable typo: CMAKE_CURRENTY_BINARY_DIR instead of CMAKE_CURRENT_BINARY_DIR;
- in src/CMakeLists.txt, fixed a missing merge of a portion of code from maint branch to master.
2014-07-01 19:13:05 +02:00