Alexander "Ace" Olofsson
468e8e3635
Missing iostream include
2013-11-04 10:36:22 +01:00
Marc Zinnschlag
8e439c290d
updated changelog
2013-11-04 09:22:23 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
graffy76
6d439d032f
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
2013-11-03 21:38:10 -06:00
graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
2013-11-03 21:36:41 -06:00
graffy76
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
2013-11-03 16:45:18 -06:00
Marc Zinnschlag
3ac58b387b
fixed wording of an error message
2013-11-03 22:08:38 +01:00
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
2013-11-03 14:02:41 -06:00
graffy76
12c06a5615
Fixed broken dependency check
2013-11-03 06:21:28 -06:00
Marc Zinnschlag
4724df7e9b
added topic/journal column to info tables
2013-11-03 10:48:50 +01:00
graffy76
973803eb2f
Fixed pathing issues in launcher
2013-11-03 00:02:46 -05:00
Lukasz Gromanowski
afce10cf37
Fixes #597 : Assertion `dialogue->mId == id' failed in esmstore.cpp
...
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-11-02 16:39:05 +01:00
graffy76
8d12e2b99d
fixed merge conflicts
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/launcher/settings/gamesettings.hpp
components/contentselector/model/contentmodel.cpp
2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e
Another stab at fixing the pathing problem...
2013-11-01 21:47:26 -05:00
scrawl
e6960d915a
Add simple Ogre widget
2013-11-02 02:51:38 +01:00
Marc Zinnschlag
15b7d3263c
subclass ESM::DialInfo to keep track of parent topic
2013-11-01 17:43:45 +01:00
graffy76
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
2013-10-31 18:12:13 -05:00
Nikolay Kasyanov
a85dffe644
Delete README_Mac.md
...
Use updated manual from wiki: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#Mac_OS_X
2013-10-31 20:28:01 +03:00
Marc Zinnschlag
ea0e8be0d3
disallow sorting (via column headers) in info tables
2013-10-31 13:40:14 +01:00
Marc Zinnschlag
90aa8f9db6
fixed dialogue record loading with multiple content files
2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c
added missing columns to journal info table
2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be
split info records between journal and topic info tables
2013-10-31 12:16:45 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184
Removed a workaround from Renderer, some cleanup
2013-10-30 13:05:28 +01:00
Marc Zinnschlag
b20943b123
Merge remote-tracking branch 'ace/win-package' into openmw-27
2013-10-29 14:18:13 +01:00
Alexander "Ace" Olofsson
632a53ead4
Support packing the OpenCS into windows builds
2013-10-29 13:28:43 +01:00
Marc Zinnschlag
ba88c94d58
first attempt at an info record collection
2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc
use result of getAppendIndex instead of always appending at the end
2013-10-29 09:27:23 +01:00
Marc Zinnschlag
29fce6d11f
increased version number
2013-10-28 08:45:56 +01:00
Marc Zinnschlag
f5fbe7361f
Merge remote-tracking branch 'lgro/saving' into saving
2013-10-28 08:35:51 +01:00
graffy76
b51bef0d98
fixed missing adjuster widget in file dialog open view
2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 20:03:12 +01:00
Lukasz Gromanowski
489475a32f
Corrected compilation error (g++ 4.8.2) triggered by not found declaration
...
in argument-dependent lookup at the point of instantiation.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 19:57:05 +01:00
Marc Zinnschlag
c2bbbef637
Merge remote-tracking branch 'rainChu/drowning-gauge'
2013-10-27 16:10:11 +01:00
Marc Zinnschlag
9a80e11182
reimplemented add and appendBlankRecord via insertRecord
2013-10-27 14:13:10 +01:00
Marc Zinnschlag
525d6fadec
added Collection insert function for arbitrary position and reimplemented appendRecord in via this function
2013-10-27 14:00:25 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
graffy76
ea7a8eb2a4
last commit
2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52
Hide adjusterwidget for open files view
2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
2013-10-25 19:23:03 -05:00
scrawl
8c9a5de26f
Fix an irritating error message
2013-10-25 23:47:53 +02:00
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3
Implemented Launcher namespace
2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731
Fixed filedialog new / edit content path issue
2013-10-24 17:33:28 -05:00
graffy76
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
67bc0a0c70
additional modification to the IDValidator (restricting relaxed mode slightly more)
2013-10-22 11:32:10 +02:00
