id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 15:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
555 commits 1 branch 0 tags 87 MiB
Commit graph

452 commits

Author SHA1 Message Date
Tobias Frost
cbbf473d59 patch to use system's zlib when enabled by the CMake option USE_SYSTEM_ZLIB 2014-11-01 14:13:16 +01:00
palmalcheg
27387e664b cmake definition on winrt detection, log device info 2014-10-27 22:20:20 +02:00
palmalcheg
aab81a225f sound for WinRT 2014-10-27 04:39:10 +02:00
unknown
f039e3c668 precompiled for msvc fix 2014-10-26 03:36:49 +03:00
BielBdeLuna
df69087fd6 ffmpeg fix so we can compile it without deprecated functions 2014-10-24 10:44:26 +02:00
Dan McGoo
2288ab82bb Fix loading saved game prior to commit 7e21048 crash. 
Commit 7e21048 introduced a change in the save game files strutcure.
This makes the game crash whenever you load saved games created with a prior version of the code.
This commit tends to fix this issue.
However, save game files created between commit 7e21048 and the current one will not load correclty.
Unless the user change the saved game's saveVersion number in game.details.
 2014-10-09 18:54:35 +09:00
Dan McGoo
8b28e50cd4 Write the renderprogs under the savepath. 
Because under *nix systems, the basepath may be write protected for the user.
 2014-10-07 23:20:20 +09:00
Dan McGoo
e719a8de0f Add native arch compilation option. 2014-10-07 23:12:42 +09:00
Robert Beckebans
0d3e4733af glMapBufferRange Bugfix for Nvidia WHQL drivers >= 344.11. 
Thanks to Mathias Heyer by Nvidia for helping this out.
 2014-09-27 10:56:34 +02:00
Robert Beckebans
72f986077b Removed unnecessary USERCMD_HZ. #129 2014-08-31 16:24:56 +02:00
BielBdeLuna
7e21048ba3 skipping cut scene working 2014-08-31 02:21:49 +02:00
Robert Beckebans
ce0e83ebca Merge pull request #160 from BielBdeLuna/envshot 
Envshot and cubemap to skymap transforms
 2014-08-25 17:17:47 +02:00
BielBdeLuna
1f993688c6 image.h included 2014-08-25 16:13:16 +02:00
BielBdeLuna
fc7ed840bc astyle and other wonderbar stuff! 2014-08-25 15:25:54 +02:00
BielBdeLuna
fedaf6b691 envshot and others working 2014-08-24 00:10:50 +02:00
Robert Beckebans
9147482a37 Added check for Gallium drivers to use GLSL ES 3.00. #137 2014-08-20 13:07:59 +02:00
BielBdeLuna
d7345d6168 envToSky not working yet 2014-08-20 12:12:01 +02:00
Robert Beckebans
7e49606cc8 Removed ARB endings from OpenGL calls 2014-08-20 11:09:02 +02:00
Robert Beckebans
f9ff46d03d Removed include of SDL_syswm.h because it creates problems on Kubuntu 14.04 with Mir 2014-08-20 00:30:39 +02:00
BielBdeLuna
095cf836c6 screen shots are PNG and envshots are TGA, but still envshots come out somewhat wrong 2014-08-19 11:35:50 +02:00
BielBdeLuna
706d98f24c now envshot does the target renderers at a proportionatesize and unskewed, but still the first of them fails. 2014-08-18 03:38:55 +02:00
BielBdeLuna
71b26cf128 envshot working but not correctly 2014-08-16 23:20:46 +02:00
Robert Beckebans
195b99e39f Removed usage of Sys_GetSystemRam(). refs #164 2014-08-06 11:35:42 +02:00
Robert Beckebans
45b0075a75 VectorSet compile fix. refs #146 2014-08-06 11:27:11 +02:00
Robert Beckebans
05b21ff3ad Updated embedded Cg shaders 2014-08-02 15:10:06 +02:00
Robert Beckebans
e03ed8769d Small corrections to dmap 2014-08-02 15:09:25 +02:00
Robert Beckebans
352df659a8 Replaced ( void ) with () 2014-08-02 14:48:04 +02:00
Pat Raynor
125191b866 Added back dmap and aas compiler from original Doom 3 GPL release 2014-08-01 03:07:00 -04:00
Pat Raynor
d2ebebca35 Fix classic doom define logic in XAudio2 sound backend 2014-08-01 02:37:00 -04:00
Pat Raynor
6f65394d97 Removed the useless Sys_GetSystemRam and Sys_GetVideoRam 2014-08-01 02:36:04 -04:00
Pat Raynor
afeab489dd Add more windows versions... 2014-08-01 02:35:12 -04:00
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
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
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
79c4b3ef98 Fixed SDL 1.2 support 2014-05-22 09:55:25 +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
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
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
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
d356c6e156 Merge remote-tracking branch 'RBDOOM-3-BFG/master' 
Conflicts:
	neo/renderer/RenderProgs.cpp
	neo/renderer/RenderProgs.h
	neo/renderer/RenderWorld_portals.cpp
	neo/renderer/tr_backend_rendertools.cpp
 2014-05-15 17:03:28 +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
a66859f09c Only use 2048^2 shadow maps for cascaded shadow mapping 2014-05-14 18:57:12 +02:00
Robert Beckebans
4a68a5ef59 Made interactionSM shader sampler loop to use r_shadowMapSamples many iterations 2014-05-14 18:49:56 +02:00
Robert Beckebans
7d6d8b4641 Reduced FFmpeg debug console prints 2014-05-12 20:02:20 +02:00
Robert Beckebans
a67f99acda Fixed shadow mapping problems with the ATI Catalyst driver 2014-05-12 19:54:09 +02:00
Robert Beckebans
c1b7308862 Fixed problems when building for Win64 and using FFmpeg. fixes #106 2014-05-12 09:51:41 +02:00
Robert Beckebans
f95076984f Shadow LOD fix for parallel lights 2014-05-11 22:59:21 +02:00
Robert Beckebans
0eaaea4b96 Improved shadow mapping performance using the shadow LOD and tweaked 
polygon offsets to fight shadow acne
 2014-05-11 22:30:01 +02:00
Robert Beckebans
5153422d0d Added shadow LOD calculation 2014-05-11 17:24:24 +02:00
Robert Beckebans
6d25a20b80 Updated ENGINE_VERSION 2014-05-11 14:44:31 +02:00
Robert Beckebans
fc51a7cf70 Updated embedded shaders 2014-05-11 14:37:58 +02:00
Robert Beckebans
2307a94d53 Added r_forceShadowMapsOnAlphaTestedSurfaces 1 2014-05-11 14:36:51 +02:00
Robert Beckebans
0ca7667fd2 Removed glewExperimental = GL_TRUE hack for SDL 2 2014-05-11 12:28:29 +02:00
Robert Beckebans
5c0fedf190 Patched GLEW to get the extensions with OpenGL >= 3.2 for the case that glGetString(GL_EXTENSIONS) fails 2014-05-11 12:19:10 +02:00
Robert Beckebans
f72d98a1eb Disabled shadow mapping for Mesa drivers fixes #103 2014-05-11 11:49:14 +02:00
Robert Beckebans
11456a231d Changed Mesa backend to output GLSL ES 3.00 in order to support shadow mapping 2014-05-11 11:30:56 +02:00
Robert Beckebans
14f87fe9db Added support for loading .png image files as textures and changed screenshot command to write in .png format 2014-05-10 18:15:33 +02:00
Robert Beckebans
0c8463ea5b Added -Wno-inline-new-delete for Clang 2014-05-10 16:11:47 +02:00
Robert Beckebans
887773cb24 Removed dangerous and obsolete memset 2014-05-10 16:03:28 +02:00
Robert Beckebans
96e879361d Fixed a problem with the searching for embedding local and embedded shaders 2014-05-10 16:00:18 +02:00
Robert Beckebans
12fd563fce Merge branch 'advanced-renderer-upgrades' of github.com:RobertBeckebans/RBDOOM-3-BFG into advanced-renderer-upgrades 2014-05-10 15:30:55 +02:00
Robert Beckebans
ade5c434f8 Replaced QGL with GLEW in sdl_glimp.cpp 2014-05-10 15:30:48 +02:00
Robert Beckebans
485417ab41 Removed obsolete sdl_qgl.cpp and fixed some compile errors 2014-05-10 15:29:59 +02:00
Robert Beckebans
08cacdfe17 Added utility functions for dmap 2014-05-10 15:03:06 +02:00
Robert Beckebans
277964f074 Because I can :) 
- Implemented soft shadows using PCF hardware shadow mapping

  The implementation uses sampler2DArrayShadow and PCF which usually
  requires Direct3D 10.1 however it is in the OpenGL 3.2 core so it should
  be widely supported.
  All 3 light types are supported which means parallel lights (sun) use
  scene independent cascaded shadow mapping.
  The implementation is very fast with single taps (400 fps average per
  scene on a GTX 660 ti OC) however I defaulted it to 16 taps so the shadows look
  really good which should you give stable 100 fps on todays hardware.

  The shadow filtering algorithm is based on Carmack's research which was
  released in the original Doom 3 GPL release draw_exp.cpp.

- Changed interaction shaders to use Half-Lambert lighting like in HL2 to
  make the game less dark

- Fixed some of the renderer debugging/development tools like r_showTris
 2014-05-10 14:40:01 +02:00
Robert Beckebans
b983156829 Updated GLEW to version 1.10.0 2014-05-10 12:12:32 +02:00
RobertBeckebans
e1661f8cde Merge branch 'master' into glew 2014-04-30 12:05:30 +02:00
RobertBeckebans
6b2793ed6a Removed null characters from RenderProgs_embedded.h 2014-04-28 11:29:11 +02:00
RobertBeckebans
853eaa5a00 Added missing neo/premake/embed.lua 2014-04-26 14:28:09 +02:00
Robert Beckebans
34025e08cb Added cmake-linux-release.sh Bash script 2014-04-26 14:26:26 +02:00
RobertBeckebans
cacf1bb46b Embedded Cg renderprog sources into the renderer using Lua/Premake. Now the renderer can export the renderprogs to any GLSL version without having the user to copy the renderprogs/* shaders to the Doom 3 BFG installation directory. fixes #95 2014-04-26 14:13:25 +02:00
RobertBeckebans
7008c661a5 Removed obsolete includes 2014-04-25 20:29:36 +02:00
RobertBeckebans
60ccf3567b Merge branch 'master' into glew 2014-04-25 20:24:30 +02:00
RobertBeckebans
055cc09c8b GLEW fixes 2014-04-25 20:23:34 +02:00
Robert Beckebans
740cc0d2e8 Merge pull request #94 from dekadenZ/size-format-macros 
Attempt at removing the kludge concerning non-standard printf format references
 2014-04-25 19:48:48 +02:00
dekadenZ
e4605633f0 Move format specifier macros to idlib/sys/sys_defines.h 2014-04-25 15:22:15 +02:00
Robert Beckebans
d326d49cf0 Merge pull request #93 from dekadenZ/fix-renderer-string-cmp 
Fix length error in prefix comparison
 2014-04-25 11:07:12 +02:00
dekadenZ
69f26fbe11 Replaced sizeof format references with macro 2014-04-25 03:30:03 +02:00
dekadenZ
27e25cfb08 Macros for format references to size_t 2014-04-25 03:23:34 +02:00
dekadenZ
20e5cf5ae2 Fix length error in prefix comparison 2014-04-25 02:39:49 +02:00
Robert Beckebans
8943a6d4a2 Fixed FFmpeg video timings and crashes. Also fixes the black screen problem with Ubuntu 14.04 #92 2014-04-21 23:56:46 +02:00
Robert Beckebans
e47429f532 Disabled FFmpeg by default because there are some serious issues with ffmpeg on Ubuntu 14.04 which cause a black screen after the intro video #92 2014-04-21 20:33:19 +02:00
RobertBeckebans
8018378c3c Merge branch 'master' into glew 
Conflicts:
	neo/renderer/OpenGL/glext.h
	neo/renderer/OpenGL/qgl.h
	neo/renderer/OpenGL/wglext.h
	neo/renderer/RenderProgs.cpp
	neo/renderer/RenderProgs_GLSL.cpp
	neo/renderer/RenderSystem_init.cpp
	neo/renderer/tr_backend_draw.cpp
	neo/sys/win32/win_qgl.cpp
 2014-04-21 15:01:50 +02:00
RobertBeckebans
b0b0d8ed76 gfxInfo Typo 2014-04-20 17:55:03 +02:00
Robert Beckebans
a8cda090c1 Disabled timing queries when using the Mesa driver #90 2014-04-20 17:50:37 +02:00
Robert Beckebans
3b19aa7991 Added glConfig.vendorType settings for Linux and disabled unused shaders. #90 2014-04-20 17:20:50 +02:00
RobertBeckebans
cce21e0d76 Added GLSL ES 1.0 backend for Mesa drivers #90 2014-04-20 16:29:58 +02:00
RobertBeckebans
e61eae499c Replaced sizeof format references %lu with %zu (GCC, Clang) and %Iu (MSVC) #88 2014-04-16 11:08:05 +02:00
Robert Beckebans
1115b52dd2 Fixed another crash in cinametic code. Now it should be stable 2014-04-11 10:28:53 +02:00
RobertBeckebans
647a3ebad8 Fixed crashes in cinematic code 2014-04-06 12:15:27 +02:00
RobertBeckebans
899982b0b2 Made FFmpeg optional and fixed potential crashes 2014-04-06 11:38:38 +02:00
Robert Beckebans
1e443f6857 Bink support on Linux with CMake 2014-04-05 17:38:42 +02:00
RobertBeckebans
17ff91664b Added FindFFMPEG.cmake 2014-04-05 16:30:41 +02:00
RobertBeckebans
730a1f2baa Merged FFmpeg Bink video support from DOOM-3-BFG-VR fork 2014-04-05 15:41:19 +02:00
RobertBeckebans
c9249bd05c Added ffmpeg win32 dev libs 2014-04-05 15:40:20 +02:00
Robert Beckebans
5d390301d6 Suppress warnings about multichar literals 2014-02-23 20:04:24 +01:00
Andreas Bergmeier
f66591f244 Force format invocations to be correct (on gcc and clang) and fix them. 2014-02-23 19:16:23 +01:00
RobertBeckebans
70108766d4 Updated astyle.exe to AStyle 2.03 2014-02-23 15:23:10 +01:00
Robert Beckebans
a315630d7d Changed astyle-code.sh script to use the system astyle which is 2.03 on Kubuntu 13.10 2014-02-23 15:19:11 +01:00
Robert Beckebans
4a124390a4 Merge pull request #75 from abergmeier/fix_trigraphs 
Fix usage of trigraphs.
 2014-02-23 15:15:14 +01:00
Andreas Bergmeier
be49ad4151 Add format analysis to format functions in Common. 2014-02-22 18:24:25 +01:00
Andreas Bergmeier
4d9970b148 Properly handle format analysis 
Rename ATTRIBUTE_PRINTF to
- ID_STATIC_ATTRIBUTE_PRINTF
- ID_INSTANCE_ATTRIBUTE_PRINTF
since for instance functions, this has to be taken into account, too.
Add format analysis to idLib, DeclManager and idTokenParser functions.
Add support for clang.
 2014-02-22 17:02:06 +01:00
Andreas Bergmeier
69f7f0eba6 Fix usage of trigraphs. 2014-02-22 11:54:04 +01:00
RobertBeckebans
7b6ceb48c8 Formatted code with AStyle 2014-02-18 11:57:59 +01:00
Robert Beckebans
47cc4f37b6 Merge pull request #72 from abergmeier/fix_constr_order 
Correct initialization order of idSoundVoice_OpenAL constructor.
 2014-02-18 10:03:37 +01:00
Robert Beckebans
3d1d78e528 Merge pull request #71 from abergmeier/fix_array_access 
Fix accessing array in PrintFloat by char instead of int.
 2014-02-18 10:03:28 +01:00
Robert Beckebans
8bd15e6f55 Merge pull request #70 from abergmeier/fix_64_bit 
Handle st_lwPolygon::surf for 64bit.
 2014-02-18 10:02:58 +01:00
Robert Beckebans
71a62beaac Merge pull request #65 from ckorn/typos 
Fix typos
 2014-02-18 09:56:44 +01:00
Andreas Bergmeier
beed9b7b4c Correct initialization order of idSoundVoice_OpenAL constructor. 2014-02-17 15:54:00 +01:00
Andreas Bergmeier
bf283af184 Fix accessing array in PrintFloat by char instead of int. 2014-02-17 15:41:33 +01:00
Andreas Bergmeier
a7b258ac2b Fix multiple compiler warnings and properly handle st_lwPolygon::surf for 64bit. 
Changed surf member to now be a union of a intptr_t index and a lwSurface*.
Index member has to be signed to prevent overflow (by assigning a possibly negative short).
For most platforms, sizeof(int*) should be the same as sizeof(lwSurface*), though this might still be a race condition.
 2014-02-17 14:22:01 +01:00
Robert Beckebans
dd22a2a85a Merge branch 'master' into glew 2014-02-15 11:53:30 +01:00
Robert Beckebans
cb2754884d Updated credits 2014-02-15 11:45:27 +01:00
RobertBeckebans
c710c9577f Merge branch 'master' into glew 2014-02-13 13:51:36 +01:00
RobertBeckebans
4a865cbbe5 Added .bat files for quick VS 2013 projects creation 2014-02-13 13:50:31 +01:00
Robert Beckebans
573905e295 Compile fix 2014-01-09 17:53:30 +01:00
Christoph Korn
cf9ae278f9 Fix another typo 
Small typo fix.
 2013-12-31 02:37:42 +01:00
Christoph Korn
264ffcb6f7 Fix typos 
Just fix some typos.
 2013-12-31 02:23:16 +01:00
Robert Beckebans
7690fb4b8e Merge branch 'master' into glew 
Conflicts:
	neo/renderer/OpenGL/glext.h
	neo/renderer/RenderSystem_init.cpp
 2013-12-24 15:49:06 +01:00