mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 00:49:54 +00:00
Code Issues Releases Wiki Activity
12908 commits 38 branches 54 tags 122 MiB
Commit graph

213 commits

Author SHA1 Message Date
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.
 2014-06-02 02:51:04 -05:00
greye
8f9091550e require boost::locale only on Windows 2014-05-22 15:42:47 +04:00
greye
b728a919a2 write dependency on boost::locale to CMake files 2014-05-20 12:59:58 +04:00
Marc Zinnschlag
6eff5ecaad Merge branch 'operations' into load 
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
 2014-05-08 13:17:24 +02:00
Marc Zinnschlag
21142711f0 Merge remote-tracking branch 'graffy76/master' 2014-05-07 10:35:11 +02:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
Marc Zinnschlag
7f78c29bb5 Merge remote-tracking branch 'sirherrbatka/Feature#1274' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-05-04 14:03:56 +02:00
graffy76
1c26741c56 Implemented rangeview with spinbox as only control. Simplified setting 
class constructor.
 2014-05-03 18:58:43 -05:00
Marc Zinnschlag
0b309d9ef4 Merge branch 'master' into load 
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
 2014-05-03 14:36:06 +02:00
Marc Zinnschlag
5f1d2f72f6 added basic loading GUI 2014-04-29 14:17:25 +02:00
Marek Kochanowicz
853abb65c3 added new, later common, base for the regionmap and the table 2014-04-29 11:44:21 +02:00
graffy76
ab33e78b67 Added RangeView class files 2014-04-26 09:40:58 -05:00
Marc Zinnschlag
dbb192f084 moved loading to a separate thread 2014-04-24 15:09:25 +02:00
graffy76
e3384e3999 relocate support.hpp / remove support.cpp 2014-04-22 22:19:03 -05:00
Marc Zinnschlag
e324450118 replaced return value of DocumentManager::addDocument with a signal 2014-04-21 09:02:58 +02:00
Marc Zinnschlag
0516d95253 added context menu with selection functions to region map 2014-04-10 22:12:09 +02:00
Marc Zinnschlag
67965ec10c added CellCoordinates and CellSelection classes 2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4 removed grid button (discarding the first attempt at a cell selector) 2014-04-07 10:21:26 +02:00
Marc Zinnschlag
baf30ba292 added grid tool (does not work yet) 2014-04-03 14:44:48 +02:00
Marc Zinnschlag
ed524b2fd4 added bright lighting mode 2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32 added night lighting mode 2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27 added day lighting mode 2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8 added lighting switching 2014-03-23 15:14:26 +01:00
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
 2014-03-19 10:23:15 +01:00
Marc Zinnschlag
c36dfef972 prewview subview 2014-03-16 12:44:01 +01:00
Marek Kochanowicz
2e6b45dafb edit view, savind works 2014-03-07 22:17:40 +01:00
Marek Kochanowicz
020e3f8fc5 Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3 2014-03-07 17:16:38 +01:00
Marek Kochanowicz
f0a45fa15f just saved progress 2014-03-07 17:15:43 +01:00
Marc Zinnschlag
397921e457 specialising WorldspaceWdiget into paged and unpaged subclasses 2014-03-06 10:13:39 +01:00
Marc Zinnschlag
a264e86e13 subclasses scene widget for worldspace scenes 2014-03-04 14:47:43 +01:00
Marc Zinnschlag
536a0e0ab0 added orbit navigation mode 2014-03-01 14:15:04 +01:00
Marc Zinnschlag
4eea2c7a86 added free navigation mode 2014-02-27 15:42:59 +01:00
Marc Zinnschlag
c977b2a756 moved implementation of the 1st person camera into a separate file 2014-02-27 15:23:14 +01:00
Marc Zinnschlag
14c3bfcf62 added navigation class 2014-02-27 14:46:06 +01:00
Marc Zinnschlag
02c6c65705 Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-17 09:55:50 +01:00
Marc Zinnschlag
6ac64bbe15 Merge branch 'script' 
Conflicts:
	readme.txt
 2014-02-16 12:12:56 +01:00
Marek Kochanowicz
97fe5465bf created new files 2014-02-15 17:55:18 +01:00
Marc Zinnschlag
e17af4231a added script verifier 2014-02-14 13:38:30 +01:00
Marek Kochanowicz
c142089bfe Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-12 13:13:32 +01:00
Marek Kochanowicz
423b2906be Yes, you can drag. But not drop. 2014-02-04 11:40:48 +01:00
Marc Zinnschlag
bf1a37dc38 Merge remote-tracking branch 'sirherrbatka/referencables_verifer' 2014-01-15 14:29:54 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
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.
 2013-12-20 20:02:42 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
Nikolay Kasyanov
dafe80874a Added empty line 2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +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
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
 2013-11-10 13:21:39 +01:00
Marc Zinnschlag
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
Marc Zinnschlag
0745a86039 added InfoCreator 2013-11-08 11:51:59 +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
Bret Curtis
36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-07 23:05:45 +01: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
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01: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
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
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
 2013-10-21 16:45:43 +02:00
Marc Zinnschlag
0be157efea set dialogue type for newly created dialogue records 2013-10-21 13:39:13 +02:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
Marc Zinnschlag
0c5f07a65a added SceneToolMode class 2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4 added scene toolbar buttons (still not doing anything) 2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f added basic scene subview (no functionality yet) 2013-09-28 09:25:54 +02:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
Marc Zinnschlag
1c4a4b4f26 generalised RefIdTypeDelegate into IdTypeDelegate 2013-09-22 13:39:44 +02:00
Marc Zinnschlag
3d2281fe80 added signals and functions to Data for handling ID list changes 2013-09-19 12:11:27 +02:00
Marc Zinnschlag
8326ac9b6f replaced dummy save implementation with a threaded dummy save implementation 2013-09-15 12:53:59 +02:00
Marc Zinnschlag
b7bffc8a79 removed Verifier class (using Operation class without subclassing now) 2013-09-14 15:16:31 +02:00
Marc Zinnschlag
077a157841 moved Operation and Stage from model/tools to model/doc 2013-09-14 14:56:23 +02:00
Marc Zinnschlag
e9f14449eb added AdjusterWidget 2013-09-10 16:45:01 +02:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169 splitting new game and new addon functions (new game currently not working) 2013-09-08 12:06:28 +02:00
Marc Zinnschlag
6cd7da6547 Merge remote-tracking branch 'marcrbouvier/master' 2013-09-03 13:47:07 +02:00
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.
 2013-09-03 01:44:21 -05:00
Marc Zinnschlag
3cf60da5a7 added numeric value filter node 2013-08-24 14:43:38 +02:00
Marc Zinnschlag
de956737fe added text filter node 2013-08-22 14:50:42 +02:00
Marc Zinnschlag
ba6edc55d4 added not filter node 2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888 added and and or filter nodes 2013-08-22 13:14:35 +02:00
Marc Zinnschlag
c38860fa72 added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node) 2013-08-18 14:17:18 +02:00
Marc Zinnschlag
236dc9fc43 replaced binary filter node with a n-ary node 2013-08-16 14:18:31 +02:00
Marc Zinnschlag
789a66eaa7 added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now) 2013-08-11 20:39:21 +02:00
Marc Zinnschlag
f5b06d5d52 basic filter tree structure 2013-08-09 14:49:05 +02:00
Marc Zinnschlag
f6226e4859 added Creator class for filters 2013-08-08 15:55:23 +02:00
Marc Zinnschlag
76b9d3dbc1 columns are now identified via an enum instead the name string 2013-08-07 09:36:05 +02:00
Marc Zinnschlag
d2f96deb98 renamed columns.hpp to columimp.hpp 2013-08-02 10:42:52 +02:00
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
 2013-07-30 15:55:50 +02:00
Marc Zinnschlag
102700a498 added specialised Creator for references 2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce added specialised Creator for referenceable records 2013-07-30 12:34:18 +02:00
Marc Zinnschlag
82958e6514 added custom creator for cell records 2013-07-28 18:08:57 +02:00
Marc Zinnschlag
32c697abc6 validate IDs entered by the user 2013-07-28 14:40:11 +02:00
Marc Zinnschlag
fee748d4b5 added creator bar UI and cancel button 2013-07-26 21:09:23 +02:00
Marc Zinnschlag
ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 2013-07-26 12:35:17 +02:00
Marc Zinnschlag
55e7e71c11 added optional per-subview status bar 2013-07-25 14:29:56 +02:00
Marc Zinnschlag
7600d6c04b basic filter table 2013-07-22 21:18:47 +02:00
Marc Zinnschlag
6a5ab34971 Merge branch 'region' 2013-07-14 12:19:02 +02:00
Marc Zinnschlag
b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2013-07-11 09:09:52 +02:00
graffy76
bb049806df Repo permissions commit fix #2 2013-07-10 21:13:59 -05:00
Marc Zinnschlag
4f05f2bddf basic region map; non-interactive for now and working with dummy data instead of real cell/region records 2013-07-08 13:12:50 +02:00