scrawl
|
6ee7c61667
|
CSMPrefs: fix deadlock in toColor()
|
2015-12-15 19:33:28 +01:00 |
|
Marc Zinnschlag
|
9c7bbd667b
|
Merge branch 'usersettings'
|
2015-12-15 14:58:04 +01:00 |
|
Marc Zinnschlag
|
d6bd2cb1f0
|
changed name of openmw-cs user settings file
|
2015-12-15 14:51:25 +01:00 |
|
Marc Zinnschlag
|
c646533448
|
removed old user settings system
|
2015-12-15 12:49:55 +01:00 |
|
Marc Zinnschlag
|
67cf260144
|
final batch of changing over user settings usage to the new system
|
2015-12-15 12:44:04 +01:00 |
|
Marc Zinnschlag
|
44925e9fc8
|
fixed records settings (Text Only wasn't updating)
|
2015-12-15 12:26:08 +01:00 |
|
Marc Zinnschlag
|
591564566c
|
made user settings access thread-safe
|
2015-12-15 12:19:48 +01:00 |
|
Marc Zinnschlag
|
a3a2c2f476
|
second batch of changing over user settings usage to the new system
|
2015-12-14 17:38:33 +01:00 |
|
scrawl
|
fb9f5f8fe8
|
Fix typo
|
2015-12-14 01:36:53 +01:00 |
|
Marc Zinnschlag
|
0ffe4290fb
|
workaround for MOC's lack of namespace awareness
|
2015-12-12 12:05:56 +01:00 |
|
Marc Zinnschlag
|
04a11679fb
|
added category update function
|
2015-12-12 11:58:53 +01:00 |
|
Marc Zinnschlag
|
3a5238bebc
|
changed the settingChanged signature to accommodate queued connections
|
2015-12-11 12:06:20 +01:00 |
|
Marc Zinnschlag
|
8245b9e439
|
added interface for querying settings
|
2015-12-11 11:50:06 +01:00 |
|
Marc Zinnschlag
|
31b105ad9e
|
improved settings layout
|
2015-12-11 11:32:55 +01:00 |
|
Marc Zinnschlag
|
a907b4ab15
|
made Setting class non-abstract
|
2015-12-11 11:22:15 +01:00 |
|
Marc Zinnschlag
|
73ffdd5ac5
|
added colour settings
|
2015-12-11 11:15:14 +01:00 |
|
Marc Zinnschlag
|
590d6eba9b
|
added enum settings
|
2015-12-10 17:33:14 +01:00 |
|
Marc Zinnschlag
|
8050eba83b
|
added a few comments
|
2015-12-10 13:33:44 +01:00 |
|
Marc Zinnschlag
|
b0fb6d56f1
|
added bool settings
|
2015-12-10 13:28:48 +01:00 |
|
Marc Zinnschlag
|
9ca5a1b647
|
added double settings
|
2015-12-10 10:58:38 +01:00 |
|
Marc Zinnschlag
|
c61d717e41
|
added integer settings
|
2015-12-08 17:21:58 +01:00 |
|
Marc Zinnschlag
|
c158224314
|
fixed a faulty include
|
2015-12-08 12:09:53 +01:00 |
|
Marc Zinnschlag
|
5e40b4d2e8
|
page switching mechanism
|
2015-12-08 12:04:45 +01:00 |
|
Marc Zinnschlag
|
0dc3d10112
|
some simplification
|
2015-12-08 09:56:42 +01:00 |
|
scrawl
|
07b064f616
|
Rename to lowerCaseInPlace
|
2015-12-07 22:49:15 +01:00 |
|
scrawl
|
4dd4c5394b
|
Broken lower-casing fix
|
2015-12-07 22:30:37 +01:00 |
|
scrawl
|
42d68eb7fb
|
Build fix
|
2015-12-07 22:29:57 +01:00 |
|
Marc Zinnschlag
|
b37a2ac09c
|
user settings categories
|
2015-12-06 12:06:28 +01:00 |
|
Marc Zinnschlag
|
36ce8f97d7
|
basic framework for new user settings system
|
2015-12-06 11:18:31 +01:00 |
|
Marc Zinnschlag
|
99500f4021
|
make initial size of script error panel configurable (Fixes #2996)
|
2015-11-21 14:28:40 +01:00 |
|
scrawl
|
eb2f16d682
|
Support for loading .osg mesh format
|
2015-11-16 23:26:43 +01:00 |
|
scrawl
|
af4923577b
|
Fix double writing of Dialogue NAME in OpenCS
|
2015-11-15 16:04:52 +01:00 |
|
Marc Zinnschlag
|
de98ee0062
|
Merge remote-tracking branch 'scrawl/esm_rewrite'
|
2015-11-14 14:25:08 +01:00 |
|
Marc Zinnschlag
|
b0d79ee790
|
Merge branch 'tooltip'
|
2015-11-13 11:40:10 +01:00 |
|
scrawl
|
b8e11cf197
|
Merge commit 'pull/upstream/678' into HEAD
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
|
2015-11-13 01:34:36 +01:00 |
|
Marc Zinnschlag
|
01f4b8a182
|
added scene tooltips system (tag based)
|
2015-11-12 15:06:37 +01:00 |
|
cc9cii
|
7f477e2fae
|
Fix include file issue.
|
2015-11-02 06:57:24 +11:00 |
|
cc9cii
|
4af469511d
|
Fix some sub-tables becoming uneditable since commit 80869d
|
2015-11-02 06:43:20 +11:00 |
|
cc9cii
|
819fecd08e
|
Add a check for scale value of 0. Should resolve bug #2880.
|
2015-11-01 11:23:28 +11:00 |
|
cc9cii
|
7c007d9c6d
|
Rename a variable to make it less confusing.
|
2015-10-31 20:45:16 +11:00 |
|
cc9cii
|
78c735adc6
|
Fix saving when only topic info was modified (topic itself unchanged)
|
2015-10-31 20:42:42 +11:00 |
|
Marc Zinnschlag
|
ad4e0e3b97
|
split virtual select button into two buttons (primary select and seconadry select)
|
2015-10-29 11:20:06 +01:00 |
|
cc9cii
|
107ccd84d4
|
Move TableEditModes enum inside a class scope.
|
2015-10-28 23:33:24 +11:00 |
|
cc9cii
|
77471d1592
|
Re-add mistakenly removed line and fix a silly typo.
|
2015-10-28 20:52:07 +11:00 |
|
cc9cii
|
80869d9bae
|
Disable context menu for fixed size sub-tables. Should resolve bug #2932.
|
2015-10-28 20:30:30 +11:00 |
|
cc9cii
|
972193c7eb
|
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
|
2015-10-28 11:49:24 +11:00 |
|
cc9cii
|
1a64b40725
|
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980.
|
2015-10-28 11:30:36 +11:00 |
|
cc9cii
|
9f0e059a15
|
Fix editing ingredient effects sub-table. Should resolve bug #2978.
|
2015-10-28 11:18:48 +11:00 |
|
Marc Zinnschlag
|
3f9db7ba3c
|
more reliable method of obtaining the cell coordinates in CSVRender::Cell
|
2015-10-12 18:00:44 +02:00 |
|
cc9cii
|
3bbcf6a916
|
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930.
|
2015-10-08 12:47:23 +11:00 |
|