mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity
12,035 Commits 18 Branches 66 Tags
Commit Graph

1470 Commits

Author SHA1 Message Date
Marc Zinnschlag
e23a32c44f some cleanup 2014-10-13 15:26:47 +02:00
Marc Zinnschlag
8062faa51a fixed member variable access in OpenCS script compiler (Fixes #2011) 2014-10-13 15:25:27 +02:00
Marc Zinnschlag
02acf60c0b added tooltips for scopes in creator bar 2014-10-13 14:24:27 +02:00
cc9cii
961867e39f Hide overlay if off screen. 2014-10-13 20:58:07 +11:00
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
Marc Zinnschlag
eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 2014-10-13 11:03:03 +02:00
cc9cii
43838ccf01 Remove override (c++11) 2014-10-13 16:42:50 +11:00
cc9cii
e58e5c2bf5 Update overlays independently from multiple viewports. 2014-10-13 15:57:01 +11:00
Thoronador
46496a35a1 fix uninitialized pointer variable in CSVDoc::SubView class 2014-10-12 23:42:44 +02:00
cc9cii
47c5bc9a19 Set bounding box on manual objects rather than creating meshes. 2014-10-13 07:42:43 +11:00
scrawl
9323f96211 Move terrainstorage to opencs_units_noqt 2014-10-12 17:18:27 +02: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
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
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
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
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +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
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
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
cc9cii
b3e09cce00 Remove mouse picking code. 2014-10-06 22:29:45 +11:00
cc9cii
972c789060 Add Ogre Overlay path to cmake. 2014-10-06 20:25:09 +11:00
cc9cii
cc6153eb8e Removed temporary key bindings. 2014-10-06 14:21:44 +11:00
cc9cii
6d687993b8 Remove C++11 stuff. 2014-10-06 14:08:35 +11:00
cc9cii
e38417e662 Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. 
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag.  No idea what is causing this.
 2014-10-06 13:55:36 +11:00
cc9cii
dbb2781817 Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default. 2014-10-06 08:20:09 +11:00
Marc Zinnschlag
2d3ffc4483 fixed pathgrid saving 2014-10-05 15:12:12 +02:00
cc9cii
85d93807c5 Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented. 2014-10-05 19:25:37 +11:00
Marc Zinnschlag
be3b229a5f fixed pathgrid loading 2014-10-04 15:36:52 +02:00
cc9cii
c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f951c6006792461a81f3429b24bd7583.
 2014-10-04 06:20:10 +10:00
cc9cii
3aea1bf5f9 CMake changes for using Ogre Overlay. 2014-10-04 05:48:56 +10:00
Marc Zinnschlag
9fd82212b3 Merge remote-tracking branch 'cc9cii/opencs-settings' 2014-10-03 13:11:05 +02:00
cc9cii
115841d31d Do not save window size on exit. 2014-10-03 05:59:24 +10:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00