Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
Marc Zinnschlag
4421e7a5cc
added lighting mode toolbar icons
2014-07-25 11:15:04 +02:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
Marc Zinnschlag
a9f9dec923
consider script blacklist in OpenCS verifier
2014-07-21 12:15:21 +02:00
Marc Zinnschlag
1a1f5dfc4a
added tooltips to dialgoue subview buttons
2014-07-15 12:46:52 +02:00
Marc Zinnschlag
517b27e29a
Merge branch 'toolbar'
2014-07-14 14:18:08 +02:00
Marc Zinnschlag
0430558c3c
fixed focussed button in mode tool panel when panel is opened
2014-07-14 14:17:27 +02:00
Marc Zinnschlag
17fc570e38
new keyboard shortcut (T): move focus from toolbar to scene widget
2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856
new keyboard shortcut (T): move focus from scene widget to toolbar
2014-07-14 11:19:59 +02:00
Marc Zinnschlag
688d413b8c
when scene toolbar gains focus, focus first button
2014-07-14 11:06:12 +02:00
Marc Zinnschlag
c2ea8f3f0a
added self-adjusting tooltips to the top-level toolbar buttons
2014-07-13 14:21:50 +02:00
Marc Zinnschlag
26f87f5d23
added navigation mode button tooltips
2014-07-13 12:15:05 +02:00
Marc Zinnschlag
e855e55318
added tooltip to user settings button on startup window
2014-07-13 10:52:33 +02:00
Marc Zinnschlag
490442cf62
added lighting mode tooltips
2014-07-10 13:18:24 +02:00
Marc Zinnschlag
61a02d8a40
replaced custom toolbutton push flag with type enum
2014-07-10 13:04:30 +02:00
Marc Zinnschlag
32e48edb83
toolbar tooltip system
2014-07-10 12:53:57 +02:00
Marc Zinnschlag
67ad7d5b0e
fixed scene subview focus problem
2014-07-10 12:20:48 +02:00
Marc Zinnschlag
57b9b8d884
set focus when opening a toolbar panel
2014-07-10 12:13:27 +02:00
Marc Zinnschlag
d6c0b8d0ac
use custom button on toolbar (top level)
2014-07-10 11:45:45 +02:00
Marc Zinnschlag
44b95bbd7b
added push mode and icon-less push button constructor
2014-07-10 11:45:20 +02:00
Marc Zinnschlag
8b239df1b1
removed text argument from button constructor, because toolbar buttons will always be icon only
2014-07-10 11:34:09 +02:00
Marc Zinnschlag
365b721878
return/enter activate the selected button
2014-07-10 11:32:20 +02:00
Marc Zinnschlag
50ee815dd8
make buttons in mode panel act like radiobuttons
2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390
custom push button
2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5
SceneWidget::setLighting was missing an update call
2014-07-10 10:09:21 +02:00
Marc Zinnschlag
3333f67830
removed a left-over marker
2014-07-08 12:53:25 +02:00
Marc Zinnschlag
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
2014-07-08 12:39:12 +02:00
Marc Zinnschlag
1548f4670a
drop part of resources drag and drop
2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d
more refactoring
2014-07-08 09:24:05 +02:00
Marc Zinnschlag
9d5956585c
added separate display type for colours
2014-07-08 09:08:01 +02:00
Marc Zinnschlag
b2ce94f28a
fixed exceptions
2014-07-08 08:56:28 +02:00
Marc Zinnschlag
b2c2342988
some refactoring (removing redundant code)
2014-07-08 08:53:39 +02:00
Marc Zinnschlag
c1bbefb840
enable dragging from resources tables
2014-07-07 15:20:05 +02:00
Marc Zinnschlag
df6996d4ae
filter resources files based on extension
2014-07-07 11:34:24 +02:00
Marc Zinnschlag
19828df799
added subviews for resources tables
2014-07-05 15:51:17 +02:00
Marc Zinnschlag
b2c957a56f
added resources tables
2014-07-05 15:50:47 +02:00
Marc Zinnschlag
42db9a5091
make modification column optional in table views
2014-07-05 15:50:17 +02:00
Marc Zinnschlag
4f6c7b0e84
resolved UniversalId naming ambiguity
2014-07-05 15:07:17 +02:00
Marc Zinnschlag
e171babd2f
added Feature_Constant to IdTable
2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3
injected new class IdTableBase between QAbstractItemModel and IdTable
2014-07-04 13:25:56 +02:00
Marc Zinnschlag
63d0fdee7f
removed leftover data member
2014-07-04 12:48:18 +02:00
Marc Zinnschlag
879ab49e9c
added resources manager
2014-07-04 12:46:57 +02:00
Marc Zinnschlag
1ce60fa13b
Merge branch 'tables'
2014-07-03 12:03:21 +02:00
Marc Zinnschlag
1745335982
body part table fix: forgot to include body parts in ID listings
2014-07-03 12:03:01 +02:00
Marc Zinnschlag
9ce92302d7
interpret empty filter strings as no filter instead of a broken filter ( Fixes #1311 )
2014-07-03 10:22:39 +02:00
Marc Zinnschlag
37a2b48fa2
added missing type columns to body part table
2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49
added body part table
2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18
added other missing columns for enchantment table; fixed dialogue subviews for enchantment records
2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a
added enchantment type column to enchantment table
2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b
Merge branch 'editorfixes' into tables
2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6
added enchantments table
2014-06-30 20:40:34 +02:00
Marc Zinnschlag
4f08efc4d7
added missing combat, magic and stealth columns for creatures (Feature #1312 )
2014-06-30 19:51:59 +02:00
Marc Zinnschlag
a25321f07e
update paged scene view according to changes made to cell records
2014-06-30 17:57:38 +02:00
Marc Zinnschlag
5fb2e1a877
do not render deleted exterior cells in scene view
2014-06-30 17:33:03 +02:00
Marc Zinnschlag
af59106533
for regular IdCollections when loading a record make the record a copy of the existing record first (adresses some incomplete records in some content files)
2014-06-30 12:35:34 +02:00
Marc Zinnschlag
2fe2def64c
added cell rendering in paged worldspaces
2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8
added cell rendering in unpaged worldspaces
2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d
added cell rendering class
2014-06-29 14:18:46 +02:00
Marc Zinnschlag
c35b87de95
various Object class fixes
2014-06-28 11:25:28 +02:00
Marc Zinnschlag
3541d03809
fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable)
2014-06-27 12:29:23 +02:00
Marc Zinnschlag
099c406226
Merge branch 'objects'
2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f
make preview watch for changes in modification state of relevant records
2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024
disabled preview function for deleted records
2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09
fixed some function names
2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68
refactored object rendering into a separate class
2014-06-27 09:12:26 +02:00
scrawl
e19bbfd1b5
Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text ( Fixes #1543 )
2014-06-26 20:49:22 +02:00
Marc Zinnschlag
06e89d8bd3
reduced loading batch size (making the the loading progress bars a bit more responsive
2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec
display record count in loading window
2014-06-26 11:41:21 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
Marc Zinnschlag
073cc3f02c
fixed base flag in content file loader code
2014-06-17 11:01:17 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
fd59a4a79e
Fix some doxygen typos
2014-06-15 16:11:22 +02:00
Marc Zinnschlag
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c
added extended versions of revert and delete
2014-06-11 11:43:38 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +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
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