Marek Kochanowicz
7eb82f74ae
Fixed complitaion.
2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb
Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix
2014-06-16 09:44:49 +02:00
Marek Kochanowicz
8763309a1b
reformatting to make code easier to read
2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9
check if index is valid before attempting to use it
2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac
correcting problems
2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644
Merge remote-tracking branch 'master/refs' into dialog-fix
...
Conflicts:
CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/world/dialoguesubview.cpp
2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3
subview does not store row number anymore
2014-06-09 11:37:48 +02:00
Marek Kochanowicz
29231b8fc9
starting new branch
2014-06-09 10:26:53 +02:00
Marc Zinnschlag
48468b7d0c
some dialogue subview cleanup and start of command dispatching refactoring
2014-06-08 14:10:08 +02:00
Marc Zinnschlag
7ede6573eb
removed more hardcoded column numbers
2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a
fixed some proxy model problems related to column numbers
2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709
removed some hardcoded column numbers
2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9
replaced selection model in CommandDispatcher with a slightly slower but more robust implementation
2014-06-07 13:02:45 +02:00
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
Marek Kochanowicz
55d451febe
changes in the model (idtable) to support nested data
2014-06-02 20:41:37 +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
Marek Kochanowicz
6720d85a04
fixed compilation, thanks greye
2014-05-27 14:50:21 +02:00
Marek Kochanowicz
41db48720d
does not compile
2014-05-27 14:01:15 +02:00
Marc Zinnschlag
e0ba9a4bf2
added reference collection stage to saving operation (preparation for cell saving)
2014-05-27 12:39:26 +02:00
Marek Kochanowicz
befc7a4078
adding column for the content of the container
2014-05-25 17:02:40 +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
