Commit graph

369 commits

Author SHA1 Message Date
Robert Beckebans
f5dd0611d5 Merge pull request #140 from darealshinji/patch-1
use av_frame_alloc() if lavc is >= 55.28.1
2014-07-21 10:04:12 +02:00
Robert Beckebans
77f65454f2 Merge pull request #143 from jonathangray/mesa-shader-fix
make a shader work with Mesa by avoiding an implicit type conversion
2014-07-21 10:00:16 +02:00
Robert Beckebans
78c18d972d Merge pull request #144 from jonathangray/timidity-resample-fix
Fix memory corruption in timidity resampling code
2014-07-21 09:58:00 +02:00
Jonathan Gray
86216aa708 Fix memory corruption in timidity resampling code.
From Sam Lantinga in SDL_mixer 1.2.8:
http://lists.libsdl.org/pipermail/commits-libsdl.org/2007-July/008673.html

Fixes a crash on OpenBSD.
2014-07-20 22:58:43 +10:00
Jonathan Gray
79b8e04e95 avoid an implicit type conversion in a shader
renderprogs/interactionSM.pixel does not compile with the Mesa
shader compiler due to a an implicit type conversion.

This gives a console warning on a release build and fatally
asserts on an debug build:

0:135(19): error: could not implicitly convert operands to arithmetic operator

Avoid this by changing an int declaration to a float.
2014-07-20 21:25:24 +10:00
darealshinji
f1d2d2c459 use av_frame_alloc() if lavc is >= 55.28.1 2014-07-07 16:40:12 +02:00
Robert Beckebans
485edfebc1 Merge pull request #128 from chungy/master
Change default Linux path to a generic and standard name
2014-05-29 11:05:36 +02:00
Mike Swanson
1c56560cc4 Change default Linux path to a generic and standard name
While the game so far has no official release on Linux, we cannot
depend on any pre-installed path for the game.  Even if it were, it
would likely be a steam exclusive and constrained to
$HOME/.local/share/Steam ...

Instead, this adopts a more typical Debian-style path used for game
data, that is putting it into /usr/share/games. This is already the
path I have chosen when making the doom3bfg-data package[1] for the
Arch Linux AUR, and currently both packages for RBDOOM-3-BFG patch
this file in order to use this path. The more generic path name can
facilitate the use of any other forks of BFG Edition that may come
along, and everyone will benefit by sharing the same data path.

[1] https://aur.archlinux.org/packages/doom3bfg-data/
2014-05-28 19:19:24 -07:00
Robert Beckebans
4c7451aee3 Added extract_resources.cfg for modding purposes 2014-05-22 11:35:47 +02:00
Robert Beckebans
79c4b3ef98 Fixed SDL 1.2 support 2014-05-22 09:55:25 +02:00
Robert Beckebans
0f1f22de45 Merge pull request #125 from JanSimek/objective-c
Replaced procfs dependent functions with native calls on OS X. #87
2014-05-22 09:48:01 +02:00
Radegast
e1f8597360 Use SDL to find Application Support path. #87 2014-05-22 00:33:58 +01:00
Radegast
c76e9a26ef Removed objective-c++ code. #87 2014-05-22 00:07:34 +01:00
Radegast
4045be32b1 Replaced procfs dependent functions with native calls on OS X. #87 2014-05-21 22:31:18 +01:00
Robert Beckebans
6d0765f3e3 Fixed mouse release comment #122 2014-05-20 23:50:53 +02:00
Robert Beckebans
746c9ce20a Merge pull request #120 from JanSimek/master
Replaced MACOS_X define with standardised __APPLE__. #87
2014-05-20 23:35:59 +02:00
Robert Beckebans
ae4ef25160 Keep mouse grabbed when opening a PDA or menu. fixes #122 2014-05-20 23:33:57 +02:00
Robert Beckebans
54ec429fa8 Merge pull request #121 from something15525/master
Updated README with instructions on installing the DirectX SDK (June 2010)
2014-05-20 23:03:43 +02:00
Michael Limb
8809610cfa Updated README with instructions on installing the DirectX SDK (June 2010) 2014-05-20 11:06:50 -07:00
Radegast
b8676a513f Replaced MACOS_X define with standardised __APPLE__. #87 2014-05-20 13:51:53 +01:00
Robert Beckebans
be7d912cf2 Just to be safe. Changed Sys_Yield() 2014-05-20 09:31:40 +02:00
Robert Beckebans
05248cce6d AStyle 2014-05-20 09:29:08 +02:00
Robert Beckebans
9c2124718f Merge pull request #117 from JanSimek/master
OS X support. #87
2014-05-20 09:27:44 +02:00
Radegast
5304284e90 Added CLOCK_REALTIME support to our custom clock_gettime() function for OS X. #87
The monotonic part was written by Gavin Beatty
https://github.com/gavinbeatty/python-monotonic-time/blob/master/darwin.c
2014-05-19 22:53:46 +01:00
Radegast
ca5c463bbd Added clock_gettime() for OS X which always returns monotonic time. #87 2014-05-19 16:53:20 +01:00
Radegast
764b067825 Avoid 'unknown event' spam when testing with touchpad. #87 2014-05-19 15:52:33 +01:00
Radegast
0ae98f62c4 It's no fun without textures. #87 2014-05-18 23:49:03 +01:00
Radegast
9b4f849cd5 Get RAM in MB. #87 2014-05-18 23:33:08 +01:00
Radegast
812fb78d52 Initial OS X support. #87 2014-05-18 23:14:28 +01:00
Robert Beckebans
185f2aaf90 Disabled some GL_CheckErrors() calls that can be a slowdown 2014-05-18 15:17:15 +02:00
Robert Beckebans
f560e29183 Updated README 2014-05-17 15:22:57 +02:00
Robert Beckebans
952907fa77 ATI hotfix for shadow mapping. #116 2014-05-17 10:53:14 +02:00
Robert Beckebans
63add75e7f Disabled MSAA 16x option which is a performance killer in combination with shadow mapping 2014-05-16 23:57:17 +02:00
Robert Beckebans
66889f5c81 Bumped engine version to 1.0.2 2014-05-16 22:49:23 +02:00
Robert Beckebans
54c31bff8f Fixed r_shadowMapJitterScale for Poisson disc algorithm 2014-05-16 22:32:56 +02:00
Robert Beckebans
3dcade4c15 Updated embedded shadow mapping using rotated Poisson disc 2014-05-16 21:52:31 +02:00
Robert Beckebans
c17773306c Revert "Changed r_useShadowMapping 1: medium+faster, 2: high quality"
This reverts commit 87b0040f92.

Conflicts:
	neo/renderer/RenderSystem_init.cpp
	neo/renderer/tr_backend_draw.cpp
	neo/renderer/tr_local.h
2014-05-16 21:50:49 +02:00
Robert Beckebans
ef9869972d Improved shadow mapping performance using randomly rotated Poisson discs 2014-05-16 21:33:39 +02:00
Robert Beckebans
7f0f7f8a41 Commented out #include <inttypes.h>. fixes #112 2014-05-16 10:47:42 +02:00
Robert Beckebans
e0c8243ee7 Make high quality shadow mapping the default 2014-05-16 00:22:34 +02:00
Robert Beckebans
87b0040f92 Changed r_useShadowMapping 1: medium+faster, 2: high quality 2014-05-16 00:14:42 +02:00
Robert Beckebans
cd3ed5a927 Sacrificed texture bias option for shadows option. fixes #109
We can't add new graphics options without altering the original Flash menu
files which we don't have. I disabled the r_lodBias functionality which
can make the game look worse by adding a bias to the texture lookup
functions which cause choosing texture mip maps that are smaller than the
original image size in every view even though we want the first mip map
level 0 which is the best quality.
2014-05-15 23:46:53 +02:00
Robert Beckebans
e13fc0f4e9 Added cvar r_useHalfLambertLighting to make it optional, it requires reloadShaders 2014-05-15 16:37:55 +02:00
Robert Beckebans
42874cfd05 Added graphics option to make soft shadows optional 2014-05-15 12:14:37 +02:00
Robert Beckebans
c300acd507 Fixed typo. Now all videos should work on Linux. refs #100 2014-05-15 10:48:37 +02:00
Robert Beckebans
837cb4dff2 Changed file testing for .bik videos to support fs_game. fixes #100 2014-05-14 23:14:37 +02:00
Robert Beckebans
ee09662c10 Added custom content support by looking for all content in all maps/*.resources.
This changes the filesystem to work a bit more like previous id tech
engines and allows to run mods and custom content like the Wulfen high
resolution textures in those mods with

+set fs_game <modname> +set fs_resourceLoadPriority 0
2014-05-14 22:32:34 +02:00
Robert Beckebans
26bb497b3c Supress warnings about failed #include global.inc when using embedded Cg shaders 2014-05-14 19:14:21 +02:00
Robert Beckebans
75d6e89876 Made interactionSM shader sampler loop to use r_shadowMapSamples many iterations 2014-05-14 18:57:53 +02:00
Robert Beckebans
a66859f09c Only use 2048^2 shadow maps for cascaded shadow mapping 2014-05-14 18:57:12 +02:00