Commit Graph

8059 Commits (04edd25add7ed4cc43e7f705a8d04e17cb9e6514)
 

Author SHA1 Message Date
Nikolay Kasyanov 04edd25add OpenCS as a separate app bundle 11 years ago
Marc Zinnschlag 224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
eroen e885c502a1 Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
Marc Zinnschlag fb417f9880 Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27 11 years ago
scrawl 3a827d9c12 Deleted Obliviontt.zip 11 years ago
Marc Zinnschlag 8bacdc8ab8 updated changelog 11 years ago
Alexander "Ace" Olofsson 468e8e3635 Missing iostream include 11 years ago
Marc Zinnschlag 8e439c290d updated changelog 11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
graffy76 6d439d032f Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector 11 years ago
graffy76 ed913936f8 Eliminated game & addon keys from profile configuration 11 years ago
graffy76 dace904490 changed game/addon to content for writing to openmw.cfg from launcher 11 years ago
Marc Zinnschlag 3ac58b387b fixed wording of an error message 11 years ago
graffy76 1d4b5a2425 Fix broken launcher content file display / selection scheme
Disable selection of content files with missing dependencies (grayed
out)
11 years ago
graffy76 12c06a5615 Fixed broken dependency check 11 years ago
graffy76 973803eb2f Fixed pathing issues in launcher 11 years ago
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>
11 years ago
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
11 years ago
graffy76 cddece4f9e Another stab at fixing the pathing problem... 11 years ago
graffy76 0cb591e4f6 Fixed path problem with adjuster widget and local data path. 11 years ago
Marc Zinnschlag b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 11 years ago
Alexander "Ace" Olofsson 632a53ead4 Support packing the OpenCS into windows builds 11 years ago
Marc Zinnschlag 29fce6d11f increased version number 11 years ago
Marc Zinnschlag f5fbe7361f Merge remote-tracking branch 'lgro/saving' into saving 11 years ago
graffy76 b51bef0d98 fixed missing adjuster widget in file dialog open view 11 years ago
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>
11 years ago
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>
11 years ago
Marc Zinnschlag c2bbbef637 Merge remote-tracking branch 'rainChu/drowning-gauge' 11 years ago
Alex "rainChu" Haddad 23eaf90846 Breath meter flashes when drowning 11 years ago
graffy76 ea7a8eb2a4 last commit 11 years ago
graffy76 5e123d3f52 Hide adjusterwidget for open files view 11 years ago
graffy76 9b483c3ae3 Fix for file path issues 11 years ago
graffy76 ba365ff49e Fixed merge conflicts with saving branch 11 years ago
scrawl 8c9a5de26f Fix an irritating error message 11 years ago
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
11 years ago
graffy76 1a23cccce3 Implemented Launcher namespace 11 years ago
graffy76 16d87ea1d1 Merge branch 'master' into esxSelector 11 years ago
graffy76 2ca7f24731 Fixed filedialog new / edit content path issue 11 years ago
graffy76 b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 11 years ago
graffy76 ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for"
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
11 years ago
graffy76 f9591ddda6 Reimplemented constentselector view class 11 years ago
Marc Zinnschlag 3146af34d6 some fixes for the merged filter branch 11 years ago
Marc Zinnschlag fdba029566 Merge remote-tracking branch 'sirherrbatka/filters' into saving 11 years ago
Marek Kochanowicz ce2c558257 Missed a file. 11 years ago
Marek Kochanowicz 70602c2c36 Removed changes in the unimplemented copy ctor. 11 years ago
Marek Kochanowicz 5e1bdd605b Corrected formatting in document.hpp 11 years ago
Marc Zinnschlag 743c6ea5b1 save dialogue records 11 years ago
Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
11 years ago
Marek Kochanowicz b23df42817 Removed old comment. Changed to set resources path correctly. 11 years ago