1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:19:55 +00:00
Commit graph

11745 commits

Author SHA1 Message Date
cc9cii
f459adf117 Revert CMake changes (didn't work for osx anyway) 2014-10-12 22:30:08 +11:00
cc9cii
971b0de4fa An attempt to make osx to find the ogre overlay headers. 2014-10-12 21:48:49 +11:00
cc9cii
a54970cf2a Merge branch 'master' into QtOgre
Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
2014-10-12 21:20:49 +11:00
cc9cii
758ce0ed98 Various fixes as per feedback comments. 2014-10-12 21:15:50 +11:00
cc9cii
809b8c6d5b Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-10-12 05:54:21 +11:00
Marc Zinnschlag
3fd10d2a82 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 14:51:55 +02:00
Marc Zinnschlag
a0dbb40c8e Allow script names starting with digits (Fixes #1730) 2014-10-11 14:48:52 +02:00
Marc Zinnschlag
82b4148a62 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498 remove unused var. mSoftwareCursor in WindowManager 2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce Fix: initialize boolean field with boolean value, not NULL 2014-10-11 10:07:01 +04:00
Thoronador
8361019456 fix uninitialized (pointer) vars in more classes 2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c fix uninitialized member variables in OcclusionQuery class 2014-10-11 01:35:12 +02:00
Thoronador
db38108801 fix uninitialized pointer variables in some classes 2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13 remove unused dummy variable 2014-10-11 00:56:57 +02:00
Thoronador
ab364c9440 fix some more uninitialized class member fields 2014-10-11 00:50:32 +02:00
Thoronador
51cd2bb5d9 remove unused/double variable from CSMWorld::Column class 2014-10-11 00:15:36 +02:00
Thoronador
a799353f60 fix uninitialized fields in CSMDoc::Operation class 2014-10-11 00:06:50 +02:00
Thoronador
deb6452e0d fix uninitialized pointer fields in CS::Editor class 2014-10-10 23:57:10 +02:00
Thoronador
f0d3fc73d5 fix uninitialized pointer fields in GraphicsPage class 2014-10-10 23:47:27 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
Marc Zinnschlag
23e969eae7 fixed pathgrid saving again (previous fix was incomplete) 2014-10-10 15:29:21 +02:00
Marc Zinnschlag
3df7071d19 Merge remote-tracking branch 'lgro/mailmap' 2014-10-10 10:52:24 +02:00
cc9cii
3e5027abbb Incorporate terrain height to labels and camera. 2014-10-10 13:36:16 +11:00
cc9cii
bfd10a03c0 User configuration manager's resource directory. 2014-10-10 13:35:14 +11:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
Marc Zinnschlag
e00771cccd Merge remote-tracking branch 'scrawl/master' 2014-10-09 15:03:00 +02:00
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02:00
Lukasz Gromanowski
136f1952c9 Completly removed .mailmap file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-09 12:04:09 +02:00
Lukasz Gromanowski
4adfbd5048 Added obfuscation for email addresses in .mailmap file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-09 11:59:55 +02:00
cc9cii
13f028e27b Avoid out of range exceptions. 2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2 Different implementation of update overlay fix. 2014-10-09 05:56:44 +11:00
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
cc9cii
5d8022bdc5 Update overlay upon control elements button signal. 2014-10-08 21:22:12 +11:00
cc9cii
e2560de05a Don't use windows path separator. 2014-10-08 08:08:03 +11:00
cc9cii
4fd7537155 Use default sort until a more generic sort that uses numeric order can be implemented. 2014-10-08 07:59:21 +11:00
cc9cii
e1197e75bc Handle change of names or regions to dynamically update the overlay. 2014-10-08 07:54:22 +11:00
sylar
70fd531722 None texturing filtering enable for android by default 2014-10-08 00:15:22 +04:00
sylar
3a625c567d fixes for shaders glsles 2014-10-07 23:32:19 +04:00
sylar
4c46da79de changed android configs paths 2014-10-07 23:31:22 +04:00
sylar
f75721a217 Add none texture filtering .It is fixes a bug with black objects in shaders glsles 2014-10-07 23:30:31 +04:00
Marc Zinnschlag
744c56943a Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup' 2014-10-07 18:03:25 +02:00
cc9cii
7836ee9ab6 Fixed crash exiting internal cells. Better starting camera position for external cells. 2014-10-07 21:18:32 +11:00
cc9cii
a161ad3cd5 Sort cell id column by numerical order. 2014-10-07 20:11:44 +11:00
cc9cii
0cccdfd114 Added description below the cell id (name if exists, or region) 2014-10-07 19:35:28 +11:00
Jordan Ayers
56db525a93 Document the return value of getEffectMultiplier. 2014-10-06 21:56:41 -05:00
cc9cii
7640875f9d More cleanup. 2014-10-07 10:34:30 +11:00
cc9cii
f48f841d31 Add full path for Ogre Overlay headers (workaround for osx). 2014-10-07 06:40:28 +11:00
cc9cii
0197f7088f Remove extra frame rendering after enabling/disabling the label. 2014-10-07 06:04:13 +11:00
scrawl
8097d9801d Fix HasSoulgem function to return number of soulgems 2014-10-06 14:56:49 +02:00
scrawl
9ab8d0a8e6 Hotfix for crash when deleting an actor 2014-10-06 14:56:49 +02:00