scrawl
4a0a16be36
Fix a build error
2013-11-27 20:03:11 +01:00
Marc Zinnschlag
68598f9b63
fixed handling of user directory defaultfilters file; some cleanup
2013-11-13 14:56:04 +01:00
Marek Kochanowicz
821d0c5c2d
Corrected filter template loading.
2013-11-13 11:38:29 +01:00
sirherrbatka
08f8c93a71
Merge pull request #3 from zinnschlag/openmw-27
...
Openmw 27
2013-11-13 00:17:51 -08:00
Nikolay Kasyanov
05e19b37e3
Removed obsolete comment
2013-11-10 22:25:29 +04:00
Nikolay Kasyanov
dafe80874a
Added empty line
2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
96714fc2c1
OpenCS: proper working dir & library path on OS X
2013-11-10 22:19:32 +04:00
Nikolay Kasyanov
fa13818360
OS X: OpenCS packaging
2013-11-10 22:04:13 +04:00
Nikolay Kasyanov
dfa900e4e3
OS X: Fixed “macro redefined” warning
2013-11-10 20:59:10 +04:00
Nikolay Kasyanov
0494fa543f
OpenCS: set current directory to bundle location on OS X, like in OpenMW binary
2013-11-10 20:39:35 +04:00
Nikolay Kasyanov
df5b52b45b
OpenCS.app icon & bundle properties
2013-11-10 20:11:53 +04:00
Nikolay Kasyanov
04edd25add
OpenCS as a separate app bundle
2013-11-10 19:09:05 +04:00
Marc Zinnschlag
224aa5d38c
Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27
2013-11-08 09:10:26 +01:00
Bret Curtis
5a071b0f81
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-08 09:08:56 +01:00
eroen
e885c502a1
Stop installing "Daedric Font License.txt"
...
It was removed in 3a827d9c12
2013-11-08 04:37:55 +01:00
Marc Zinnschlag
fb417f9880
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
2013-11-07 09:19:55 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Marc Zinnschlag
8bacdc8ab8
updated changelog
2013-11-04 14:19:58 +01:00
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
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
graffy76
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
2013-10-31 18:12:13 -05: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
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
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
