Commit Graph

219 Commits (celladd)

Author SHA1 Message Date
Marc Zinnschlag 879ab49e9c added resources manager 11 years ago
Marc Zinnschlag 74ed9cbb2d added cell rendering class 11 years ago
Marc Zinnschlag 0c1ad54e68 refactored object rendering into a separate class 11 years ago
Marc Zinnschlag c23e9e03fd Merge branch 'refs' 11 years ago
scrawl 3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 11 years ago
Marc Zinnschlag 83d5f2aaeb factored out command creation from table view into a separate class 11 years ago
slothlife 20dabaead9 Fix CMake scripts to link static dependencies
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
11 years ago
greye 8f9091550e require boost::locale only on Windows 11 years ago
greye b728a919a2 write dependency on boost::locale to CMake files 11 years ago
Marc Zinnschlag 6eff5ecaad Merge branch 'operations' into load
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
11 years ago
Marc Zinnschlag 21142711f0 Merge remote-tracking branch 'graffy76/master' 11 years ago
graffy76 a17cb1f389 Fixed opencs.ini formatting 11 years ago
Marc Zinnschlag 7f78c29bb5 Merge remote-tracking branch 'sirherrbatka/Feature#1274'
Conflicts:
	apps/opencs/view/world/table.cpp
11 years ago
graffy76 1c26741c56 Implemented rangeview with spinbox as only control. Simplified setting
class constructor.
11 years ago
Marc Zinnschlag 0b309d9ef4 Merge branch 'master' into load
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
11 years ago
Marc Zinnschlag 5f1d2f72f6 added basic loading GUI 11 years ago
Marek Kochanowicz 853abb65c3 added new, later common, base for the regionmap and the table 11 years ago
graffy76 ab33e78b67 Added RangeView class files 11 years ago
Marc Zinnschlag dbb192f084 moved loading to a separate thread 11 years ago
graffy76 e3384e3999 relocate support.hpp / remove support.cpp 11 years ago
Marc Zinnschlag e324450118 replaced return value of DocumentManager::addDocument with a signal 11 years ago
Marc Zinnschlag 0516d95253 added context menu with selection functions to region map 11 years ago
Marc Zinnschlag 67965ec10c added CellCoordinates and CellSelection classes 11 years ago
Marc Zinnschlag 324b2743d4 removed grid button (discarding the first attempt at a cell selector) 11 years ago
Marc Zinnschlag baf30ba292 added grid tool (does not work yet) 11 years ago
Marc Zinnschlag ed524b2fd4 added bright lighting mode 11 years ago
Marc Zinnschlag 9746f8bd32 added night lighting mode 11 years ago
Marc Zinnschlag fa29942b27 added day lighting mode 11 years ago
Marc Zinnschlag d5506172e8 added lighting switching 11 years ago
Marek Kochanowicz 6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
11 years ago
Marc Zinnschlag c36dfef972 prewview subview 11 years ago
Marek Kochanowicz 2e6b45dafb edit view, savind works 11 years ago
Marek Kochanowicz 020e3f8fc5 Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3 11 years ago
Marek Kochanowicz f0a45fa15f just saved progress 11 years ago
Marc Zinnschlag 397921e457 specialising WorldspaceWdiget into paged and unpaged subclasses 11 years ago
Marc Zinnschlag a264e86e13 subclasses scene widget for worldspace scenes 11 years ago
Marc Zinnschlag 536a0e0ab0 added orbit navigation mode 11 years ago
Marc Zinnschlag 4eea2c7a86 added free navigation mode 11 years ago
Marc Zinnschlag c977b2a756 moved implementation of the 1st person camera into a separate file 11 years ago
Marc Zinnschlag 14c3bfcf62 added navigation class 11 years ago
Marc Zinnschlag 02c6c65705 Merge remote-tracking branch 'sirherrbatka/DragDrop' 11 years ago
Marc Zinnschlag 6ac64bbe15 Merge branch 'script'
Conflicts:
	readme.txt
11 years ago
Marek Kochanowicz 97fe5465bf created new files 11 years ago
Marc Zinnschlag e17af4231a added script verifier 11 years ago
Marek Kochanowicz c142089bfe Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 11 years ago
Marek Kochanowicz 423b2906be Yes, you can drag. But not drop. 11 years ago
Marc Zinnschlag bf1a37dc38 Merge remote-tracking branch 'sirherrbatka/referencables_verifer' 11 years ago
Scott Howard 2f082ef796 remove unneeded libraries 11 years ago
Marek Kochanowicz 8085fcc792 Added Referencable checks class, added method to get refidcontainer, added method to get mBooks.
Currently only books are checked, and only if name is present.
11 years ago
Marc Zinnschlag 04b1657d98 Merge branch 'openmw-27'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
11 years ago
Nikolay Kasyanov dafe80874a Added empty line 11 years ago
Nikolay Kasyanov fa13818360 OS X: OpenCS packaging 11 years ago
Nikolay Kasyanov df5b52b45b OpenCS.app icon & bundle properties 11 years ago
Nikolay Kasyanov 04edd25add OpenCS as a separate app bundle 11 years ago
Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
11 years ago
Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
11 years ago
Marc Zinnschlag 0745a86039 added InfoCreator 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Bret Curtis 36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
Marc Zinnschlag 15b7d3263c subclass ESM::DialInfo to keep track of parent topic 11 years ago
Marc Zinnschlag ba88c94d58 first attempt at an info record collection 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 16d87ea1d1 Merge branch 'master' into esxSelector 11 years ago
graffy76 f9591ddda6 Reimplemented constentselector view class 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
Marc Zinnschlag 0be157efea set dialogue type for newly created dialogue records 11 years ago
graffy76 00c78a4aa1 Implementing ContentSelector class in DataFilesPage
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
Marc Zinnschlag 0c5f07a65a added SceneToolMode class 11 years ago
Marc Zinnschlag 84cadc10f4 added scene toolbar buttons (still not doing anything) 11 years ago
Marc Zinnschlag 9ea092927f added basic scene subview (no functionality yet) 11 years ago
Marc Zinnschlag d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 11 years ago
Marc Zinnschlag 1c4a4b4f26 generalised RefIdTypeDelegate into IdTypeDelegate 11 years ago
Marc Zinnschlag 3d2281fe80 added signals and functions to Data for handling ID list changes 11 years ago
Marc Zinnschlag 8326ac9b6f replaced dummy save implementation with a threaded dummy save implementation 11 years ago
Marc Zinnschlag b7bffc8a79 removed Verifier class (using Operation class without subclassing now) 11 years ago
Marc Zinnschlag 077a157841 moved Operation and Stage from model/tools to model/doc 11 years ago
Marc Zinnschlag e9f14449eb added AdjusterWidget 11 years ago
Marc Zinnschlag 25b7cd33ea added FileWidget; fixed OpenCS configuration 11 years ago
Marc Zinnschlag ecedb60169 splitting new game and new addon functions (new game currently not working) 11 years ago
Marc Zinnschlag 6cd7da6547 Merge remote-tracking branch 'marcrbouvier/master' 12 years ago
Marc Bouvier 51332b86a1 [Feature #811] Only 1 Instance of OpenCS is Allowed
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
12 years ago
Marc Zinnschlag 3cf60da5a7 added numeric value filter node 12 years ago
Marc Zinnschlag de956737fe added text filter node 12 years ago
Marc Zinnschlag ba6edc55d4 added not filter node 12 years ago
Marc Zinnschlag 806e9a2888 added and and or filter nodes 12 years ago
Marc Zinnschlag c38860fa72 added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node) 12 years ago
Marc Zinnschlag 236dc9fc43 replaced binary filter node with a n-ary node 12 years ago
Marc Zinnschlag 789a66eaa7 added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now) 12 years ago
Marc Zinnschlag f5b06d5d52 basic filter tree structure 12 years ago
Marc Zinnschlag f6226e4859 added Creator class for filters 12 years ago
Marc Zinnschlag 76b9d3dbc1 columns are now identified via an enum instead the name string 12 years ago
Marc Zinnschlag d2f96deb98 renamed columns.hpp to columimp.hpp 12 years ago
Marc Zinnschlag adb05737ee Merge branch 'master' into filter
Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp
12 years ago
Marc Zinnschlag 102700a498 added specialised Creator for references 12 years ago
Marc Zinnschlag 57be764cce added specialised Creator for referenceable records 12 years ago
Marc Zinnschlag 82958e6514 added custom creator for cell records 12 years ago
Marc Zinnschlag 32c697abc6 validate IDs entered by the user 12 years ago
Marc Zinnschlag fee748d4b5 added creator bar UI and cancel button 12 years ago
Marc Zinnschlag ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 12 years ago