Marc Zinnschlag
|
6ff41c6a00
|
intercept shift/ctrl double-clicks in tables
|
2014-10-23 11:28:58 +02:00 |
|
Marc Zinnschlag
|
94ae222f0e
|
Merge branch 'settings'
|
2014-10-19 13:44:15 +02:00 |
|
Marc Zinnschlag
|
a5bbfff9e2
|
another layout correction
|
2014-10-19 13:43:40 +02:00 |
|
Marc Zinnschlag
|
49938182e8
|
silenced a compiler warning regarding null pointer dereferencing
|
2014-10-17 15:46:07 +02:00 |
|
Marc Zinnschlag
|
a3c894c1e2
|
Merge branch 'cellmarker'
|
2014-10-17 14:26:16 +02:00 |
|
Marc Zinnschlag
|
994159fafd
|
fixed broken iterator
|
2014-10-17 14:23:37 +02:00 |
|
Marc Zinnschlag
|
8a05c0e5c0
|
fixed overlay singleton
|
2014-10-17 14:23:27 +02:00 |
|
Marc Zinnschlag
|
ba46bcad40
|
Revert "Don't allow viewing non-existent cells from the regionmap."
This reverts commit 7cdab41501 .
|
2014-10-17 13:52:21 +02:00 |
|
Marc Zinnschlag
|
4b921c3876
|
user settings cleanup
|
2014-10-17 13:49:33 +02:00 |
|
Marc Zinnschlag
|
ed44f3ec7d
|
added tooltip support to user settings UI
|
2014-10-16 16:22:36 +02:00 |
|
Marc Zinnschlag
|
f4894deff1
|
removed special value text from spin boxes (broken feature, not used anyway)
|
2014-10-16 14:47:55 +02:00 |
|
Marc Zinnschlag
|
c94c1adaf3
|
split off settings page label from internal section name
|
2014-10-16 13:48:07 +02:00 |
|
cc9cii
|
7cdab41501
|
Don't allow viewing non-existent cells from the regionmap.
|
2014-10-16 07:36:47 +11:00 |
|
cc9cii
|
094f046087
|
Convert OverlaySystem to a OpenCS style singleton.
|
2014-10-16 07:29:46 +11:00 |
|
Marc Zinnschlag
|
720ba2c0d8
|
split off settings label from internal settings name
|
2014-10-15 13:39:53 +02:00 |
|
Marc Zinnschlag
|
868fdfba51
|
reclaiming some unused space
|
2014-10-15 11:07:40 +02:00 |
|
Marc Zinnschlag
|
e20fa209cc
|
user settings UI layout improvements
|
2014-10-15 11:02:41 +02:00 |
|
cc9cii
|
1d0ac3b4df
|
Delete Ogre::OverlaySystem before Ogre::Root
|
2014-10-15 07:02:19 +11:00 |
|
cc9cii
|
8cebfc411b
|
Minor visual improvements.
|
2014-10-14 17:34:10 +11:00 |
|
cc9cii
|
994420aa57
|
Singleton wrapper for Ogre OverlaySystem.
|
2014-10-14 13:21:43 +11:00 |
|
cc9cii
|
57b337d368
|
Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.
|
2014-10-14 11:43:56 +11: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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|