Marc Zinnschlag
f6ae967ba0
simplified Data constructor
2014-06-06 20:47:31 +02:00
Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
Marc Zinnschlag
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
2014-06-04 21:12:23 +02:00
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
Marc Zinnschlag
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548
silenced two warnings
2014-05-30 10:18:05 +02:00
Marc Zinnschlag
ae50632774
implemented cell and reference saving int OpenCS
2014-05-29 18:08:40 +02:00
Marc Zinnschlag
e0ba9a4bf2
added reference collection stage to saving operation (preparation for cell saving)
2014-05-27 12:39:26 +02:00
Marc Zinnschlag
f4334da42e
added changed reference tracking for cells
2014-05-23 09:32:34 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02: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
e0b6bf6aeb
implemented reference record deleting
2014-05-20 09:28:18 +02:00
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02:00
greye
130349e0cd
open files in binary mode when necessary
2014-05-20 08:14:29 +04:00
greye
db16bb8983
fix OpenCS saving to Unicode path destination
2014-05-19 15:52:19 +04:00
Marc Zinnschlag
7c149e98e0
Merge branch 'openmw-30'
2014-05-18 22:38:52 +02:00
cc9cii
8971db8962
SceneWidget windowHandle fix for Windows.
2014-05-17 23:53:33 +10:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
Marc Zinnschlag
c2ea92b93a
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239
ignore all drops that will not create usefull filter
2014-05-14 11:56:23 +02:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
Marc Zinnschlag
8279d307c4
text encoding configuration (was using hardcoded settings before)
2014-05-12 10:32:57 +02:00
Marc Zinnschlag
5b5bf6f37e
removed a redundant (and unsufficiently configured) copy of ConfigurationManager
2014-05-10 17:46:10 +02:00
Marc Zinnschlag
804bf523ba
removed two unused files
2014-05-10 17:35:11 +02:00
Marc Zinnschlag
5b9e90744e
Merge branch 'load'
2014-05-10 13:49:25 +02:00
Marc Zinnschlag
6fdbd4d3f9
minor adjustment to UniversalId
2014-05-10 13:49:19 +02:00
Marc Zinnschlag
96ca9500ca
generate error messages when encounting non-critical problems during load
2014-05-10 13:47:22 +02:00
Marc Zinnschlag
79d59153c1
improved layout of loading window
2014-05-10 13:29:28 +02:00
Marc Zinnschlag
95d24492de
display load error messages in loading window
2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d
added load error log
2014-05-10 12:04:36 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
Marc Zinnschlag
cf90da6cd8
minor fix
2014-05-08 15:23:29 +02: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
205306ee3d
changed message passing format from QString to a UniversalId/std::string pair
2014-05-08 12:42:29 +02:00
graffy76
0e7d40de6a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
upstream merge
2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5
Decoupled setting definitions from the Setting class. QSettings
...
implementation is now fully responsible for managing user settings.
2014-05-07 21:59:26 -05:00
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2
Removed unneeded includes, cleaned up code, added comments
2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3
Removed error code for missing opencs.ini files.
2014-05-06 19:22:45 -05:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
Marc Zinnschlag
a30d816982
fixed a mixup in CSMTools::Tools constructor/destructor
2014-05-06 11:44:20 +02:00
Marc Zinnschlag
492620c8cf
handle exceptions thrown during loading and report them to the user
2014-05-06 09:39:39 +02:00
graffy76
5cba828cc9
Removed unneeded code from setting manager. Moved some code to user
...
settings
2014-05-05 06:26:00 -05:00
graffy76
74fa115d20
fixed check for missing ini files
2014-05-05 06:07:41 -05:00
graffy76
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
2014-05-05 05:56:03 -05:00
Marc Zinnschlag
df97a1b57f
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-04 17:11:43 +02:00
Marek Kochanowicz
f51f826dad
fixed compilation
2014-05-04 15:13:03 +02: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
Marek Kochanowicz
4a502226e6
added flag to distingiush widgets
2014-05-04 12:41:06 +02:00
graffy76
3f737bbb44
implemented QDial into RangeView class
2014-05-03 22:02:16 -05:00
graffy76
4f876574c1
Implemented slider widget in rangeView class
2014-05-03 21:50:08 -05:00
graffy76
0a3ab3dcd1
Commented out "proxy selection test" demo page in user settings
2014-05-03 19:48:04 -05:00
graffy76
35d1502308
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-05-03 19:16:42 -05:00
graffy76
1c26741c56
Implemented rangeview with spinbox as only control. Simplified setting
...
class constructor.
2014-05-03 18:58:43 -05:00
graffy76
bc6197c552
Added custom spin box class
2014-05-03 18:57:34 -05:00
Marek Kochanowicz
00b21449a2
replaced type_cell with type_scene
2014-05-03 19:47:13 +02:00
Marc Zinnschlag
e9c2f24faa
intercept close button clicks in loading window
2014-05-03 17:14:17 +02:00
Marc Zinnschlag
3fdd72f204
added cancel button to loading window
2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222
record loading progress bar
2014-05-03 15:33:35 +02:00
Marc Zinnschlag
6692d2dc72
split up load function in a start and continue part
2014-05-03 15:05:02 +02:00
Marc Zinnschlag
0b309d9ef4
Merge branch 'master' into load
...
Conflicts:
apps/opencs/view/doc/viewmanager.cpp
2014-05-03 14:36:06 +02:00
Marek Kochanowicz
5e99381019
Drag and drop works.
2014-05-03 14:00:30 +02:00
Marc Zinnschlag
e0e2ad8316
content file loading progress bar
2014-05-03 13:01:29 +02:00
Marc Zinnschlag
e09218f164
moved load code from Document to Loader class
2014-05-03 12:07:05 +02:00
Marek Kochanowicz
7f1df878f6
make getDropType static and public.
2014-05-02 20:28:28 +02:00
Marek Kochanowicz
c2b070f097
trying to do it right.
2014-05-01 19:17:33 +02:00
Marek Kochanowicz
ea1aaef8ca
replace paged with unpaged (and vice versa)
2014-05-01 18:25:28 +02:00
Marek Kochanowicz
d00dbf47d5
working on worldspace drops
2014-05-01 15:09:47 +02:00
Marc Zinnschlag
ab94e70724
more cleanup of document setup
2014-05-01 13:04:48 +02:00
Marek Kochanowicz
57131332f4
fixing minor issues
2014-05-01 12:34:54 +02:00
Marek Kochanowicz
9e01a54d72
minor correction
2014-04-30 15:17:20 +02:00
Marek Kochanowicz
6aaa15b2e8
paged worldspace drop
2014-04-30 15:03:46 +02:00
Marek Kochanowicz
19dac9dc86
that would be it
2014-04-30 14:27:11 +02:00
Marek Kochanowicz
4d79f00e28
enable dragging on the region map cells
2014-04-30 13:32:54 +02:00
Marek Kochanowicz
eeb18b533e
moved editlock to the dragrecordtable
2014-04-29 21:41:57 +02:00
Marek Kochanowicz
d376efe30b
handle dragging not-existing records
2014-04-29 19:34:06 +02:00
cc9cii
7d990abd37
OpenCS changes to allow compilation with MSVC 11.0.
2014-04-29 22:46:55 +10:00
Marc Zinnschlag
8dc6ad5059
moved new flag from setupData function to Document constructor
2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6
added basic loading GUI
2014-04-29 14:17:25 +02:00
Marc Zinnschlag
2906ade531
string fix
2014-04-29 13:16:58 +02:00
Marek Kochanowicz
18fc8acc71
able to drag existing cells from the regionmap
2014-04-29 12:27:26 +02:00
Marek Kochanowicz
853abb65c3
added new, later common, base for the regionmap and the table
2014-04-29 11:44:21 +02:00
Thoronador
f69d61976e
minor performance improvements in other apps subdirectories
2014-04-27 23:25:02 +02:00
graffy76
985af15a12
removed qdebug references
2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0
Converted SettingType enums to indicate widget type.
2014-04-26 21:32:36 -05:00
graffy76
b94466dbb4
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-04-26 21:24:02 -05:00
graffy76
ab33e78b67
Added RangeView class files
2014-04-26 09:40:58 -05:00
Marc Zinnschlag
ddb0496dca
replaced return value of removeDocument with a signal
2014-04-26 13:11:27 +02:00
Marc Zinnschlag
42b332775a
removed some debug statements
2014-04-25 15:30:46 +02:00
graffy76
2e06414b43
Fixed broken delegate display modes (Display Format settings). Moved
...
UserSetting update functions to DataDisplayDelegate.
2014-04-25 07:16:40 -05:00
graffy76
3f2ae950f5
Disabled view resize for open views when user setting changes. Fixed
...
new view size issue to match existing user settings.
2014-04-24 12:50:10 -05:00
Marc Zinnschlag
dbb192f084
moved loading to a separate thread
2014-04-24 15:09:25 +02:00
graffy76
ce56669339
Fixed failed signal/slot connection between UserSettings and
...
CSVWorld::SubView
2014-04-23 17:02:37 -05:00
graffy76
4b607d658f
Re-link user settings to editor main application
2014-04-22 22:19:53 -05:00
