Aesylwinn
85005626b1
Replace usage of deprecated function.
9 years ago
Aesylwinn
94d4fb0686
Add check for region weather chances to verifier.
9 years ago
Aesylwinn
9a495042cc
Fix indentation.
9 years ago
Aesylwinn
5e38fcac36
Add ability to edit region weather probabilities.
9 years ago
Marc Zinnschlag
60509875e8
Merge remote-tracking branch 'aesylwinn/editor_camera'
9 years ago
Aesylwinn
e07687ee01
Add button for camera mouse inversion in user preferences, and separate the
...
sensitivity settings for orbit and free cameras.
9 years ago
Aesylwinn
02f991c63e
Cleanup, fix comment
9 years ago
Marc Zinnschlag
8f699b5d39
avoid creating move tags for instances that exist only in the currently edited content file
9 years ago
Aesylwinn
08d055ca23
Allow setting precision of double preferences. Also increase precision of camera sensitivity.
9 years ago
Aesylwinn
35ff4ec4b1
Normalize default camera controls so that is appears as if the camera is
...
the object being moved. Also, allow mouse inversion for secondary movement.
9 years ago
Aesylwinn
bee8977e45
Add camera control customization options.
9 years ago
Marc Zinnschlag
1774f6d9bf
moved ref num assingment from instance creation to save procedure
9 years ago
Marc Zinnschlag
d5067201d0
Merge branch 'move'
9 years ago
Marc Zinnschlag
d6b8033b46
handle cell transitions when moving objects
9 years ago
scrawl
97526284f5
Allow setting the water level of an interior cell with sky ( Fixes #3244 )
9 years ago
Marc Zinnschlag
b2181fae20
safer handling of command macros
9 years ago
Marc Zinnschlag
7d8bd56e11
create new records with basic data in the same step without updates inbetween ( Fixes #3207 )
9 years ago
Marc Zinnschlag
9f14247562
Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements'
9 years ago
Aesylwinn
1ae402476d
Journal verifier
9 years ago
Aesylwinn
f4ed389496
InfoCondition autocompletion
9 years ago
Aesylwinn
20942e6658
Fixes to testing if condition is always or never true
9 years ago
Aesylwinn
5315866f61
Corrections to condition ranges and several other minor fixes
9 years ago
Aesylwinn
9d392487a9
Fix names to be unique and condition values to be set to 0
9 years ago
Aesylwinn
bdc99048bb
Missing header
9 years ago
Aesylwinn
8668eccd0b
Topic Info verifier with fixes to InfoSelectWrapper class
9 years ago
Aesylwinn
e89609e5b0
Changes to how Info Conditions are edited
9 years ago
scrawl
c4d38bb42d
Fix clang analyzer warnings
9 years ago
Aesylwinn
3f40346636
Implemented a wrapper for DialInfo::SelectStruct
9 years ago
scrawl
596fe56bfd
Make Land::loadData thread safe
9 years ago
scrawl
d12f24c321
Fix typo
9 years ago
Rob Cutmore
d43315fe4e
Add script editor line wrapping (Feature #2926 )
...
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
9 years ago
scrawl
b0431833a1
Fix some defects reported by Coverity CI
9 years ago
Aesylwinn
bbda5fe634
Removed hints from error messages and fixed naming to match conventions
9 years ago
Aesylwinn
1d86f705ba
gmst verifier
9 years ago
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
9 years ago
scrawl
091ca9743e
Do not write LandData twice ( Fixes #3140 )
9 years ago
Marc Zinnschlag
55627c0853
handling drops into cells that do not exist or are not shown
9 years ago
scrawl
fb849014bd
Pass the fallback map to CSMWorld::Data
9 years ago
scrawl
11496b8075
Read fallback settings in OpenCS
9 years ago
Marc Zinnschlag
5b9d6cce98
made drop distance configurable
9 years ago
Marc Zinnschlag
466f91db67
Fixed wrong GMST name for newly created game files ( Fixes #3132 )
9 years ago
scrawl
daa94cc50e
Fix cppcheck warnings
9 years ago
Marc Zinnschlag
2162f21550
Merge branch 'drop'
9 years ago
Aesylwinn
9bd14215d7
Expanded inventory check to creatures and NPCs
9 years ago
Aesylwinn
4c14117761
Added checks to verifier for container inventories
9 years ago
Marc Zinnschlag
6b626c2954
spelling fixes
9 years ago
scrawl
6ee7c61667
CSMPrefs: fix deadlock in toColor()
9 years ago
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
9 years ago
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
Marc Zinnschlag
c646533448
removed old user settings system
9 years ago
Marc Zinnschlag
67cf260144
final batch of changing over user settings usage to the new system
9 years ago
Marc Zinnschlag
44925e9fc8
fixed records settings (Text Only wasn't updating)
9 years ago
Marc Zinnschlag
591564566c
made user settings access thread-safe
9 years ago
Marc Zinnschlag
a3a2c2f476
second batch of changing over user settings usage to the new system
9 years ago
scrawl
fb9f5f8fe8
Fix typo
9 years ago
Marc Zinnschlag
0ffe4290fb
workaround for MOC's lack of namespace awareness
9 years ago
Marc Zinnschlag
04a11679fb
added category update function
9 years ago
Marc Zinnschlag
3a5238bebc
changed the settingChanged signature to accommodate queued connections
9 years ago
Marc Zinnschlag
8245b9e439
added interface for querying settings
9 years ago
Marc Zinnschlag
31b105ad9e
improved settings layout
9 years ago
Marc Zinnschlag
a907b4ab15
made Setting class non-abstract
9 years ago
Marc Zinnschlag
73ffdd5ac5
added colour settings
9 years ago
Marc Zinnschlag
590d6eba9b
added enum settings
9 years ago
Marc Zinnschlag
8050eba83b
added a few comments
9 years ago
Marc Zinnschlag
b0fb6d56f1
added bool settings
9 years ago
Marc Zinnschlag
9ca5a1b647
added double settings
9 years ago
Marc Zinnschlag
c61d717e41
added integer settings
9 years ago
Marc Zinnschlag
c158224314
fixed a faulty include
9 years ago
Marc Zinnschlag
5e40b4d2e8
page switching mechanism
9 years ago
Marc Zinnschlag
0dc3d10112
some simplification
9 years ago
scrawl
07b064f616
Rename to lowerCaseInPlace
9 years ago
scrawl
4dd4c5394b
Broken lower-casing fix
9 years ago
scrawl
42d68eb7fb
Build fix
9 years ago
Marc Zinnschlag
b37a2ac09c
user settings categories
9 years ago
Marc Zinnschlag
36ce8f97d7
basic framework for new user settings system
9 years ago
Marc Zinnschlag
99500f4021
make initial size of script error panel configurable ( Fixes #2996 )
9 years ago
scrawl
eb2f16d682
Support for loading .osg mesh format
9 years ago
scrawl
af4923577b
Fix double writing of Dialogue NAME in OpenCS
9 years ago
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
9 years ago
Marc Zinnschlag
b0d79ee790
Merge branch 'tooltip'
9 years ago
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
Marc Zinnschlag
01f4b8a182
added scene tooltips system (tag based)
9 years ago
cc9cii
7f477e2fae
Fix include file issue.
9 years ago
cc9cii
4af469511d
Fix some sub-tables becoming uneditable since commit 80869d
9 years ago
cc9cii
819fecd08e
Add a check for scale value of 0. Should resolve bug #2880 .
9 years ago
cc9cii
7c007d9c6d
Rename a variable to make it less confusing.
9 years ago
cc9cii
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
9 years ago
Marc Zinnschlag
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
9 years ago
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
9 years ago
cc9cii
77471d1592
Re-add mistakenly removed line and fix a silly typo.
9 years ago
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
9 years ago
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
9 years ago
cc9cii
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
9 years ago
cc9cii
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
9 years ago
Marc Zinnschlag
3f9db7ba3c
more reliable method of obtaining the cell coordinates in CSVRender::Cell
9 years ago
cc9cii
3bbcf6a916
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
9 years ago
cc9cii
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
9 years ago
Marc Zinnschlag
323f8bb29f
sensitivity settings
9 years ago
Marc Zinnschlag
d597bef2cd
refined selection related user settings
9 years ago
Marc Zinnschlag
62047b1868
Merge remote-tracking branch 'origin/master' into sceneinput
9 years ago
Marc Zinnschlag
7bef97bf33
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
9 years ago
Marc Zinnschlag
39b7340580
added mouse button settings for 3D scene (not in use yet)
9 years ago
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
9 years ago
cc9cii
1365b8edd1
Fix typo.
9 years ago
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
9 years ago
cc9cii
5a5e1a3b22
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
9 years ago
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
9 years ago
cc9cii
258b2ba29a
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
9 years ago
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
9 years ago
Marc Zinnschlag
5be176ee85
disable on-demand loading of land data (for now, maybe)
9 years ago
Marc Zinnschlag
23fde87816
fixed an indexing error
9 years ago
Marc Zinnschlag
584a7a66b9
various minor fixes
9 years ago
Marc Zinnschlag
09ec60fe2a
handle missing land texture records properly during merge
9 years ago
Marc Zinnschlag
73f6efddcc
fixed a texture indexing bug (only affects the editor)
9 years ago
Marc Zinnschlag
a8dc1c1198
merge land tables
9 years ago
Marc Zinnschlag
85f6bb892b
removed indirection in OpenMW-CS land record
9 years ago
Marc Zinnschlag
69b9eadb52
refactored loading of land data
9 years ago
Marc Zinnschlag
69045d7ec9
additional safety check for land texture listing merge stage
9 years ago
Marc Zinnschlag
890bbb6b11
merge land texture tables
9 years ago
Marc Zinnschlag
b7983d08ba
fixed merge stage order; added proper initialisation
9 years ago
Marc Zinnschlag
a97a632aa7
merge references tables
9 years ago
Marc Zinnschlag
845cafd61c
fixed record state issues after merge
9 years ago
Marc Zinnschlag
f95950e8d8
merge referenceables table
9 years ago
Marc Zinnschlag
9cf793c0b5
silenced a warning
9 years ago
Marc Zinnschlag
40753aa9a3
simplifying merge stage
9 years ago
Marc Zinnschlag
16dda281ce
made merge operation more fluent
10 years ago
Marc Zinnschlag
103073150e
added info tables and pathgrid table to merge operation
10 years ago
Marc Zinnschlag
c92898a5bc
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
10 years ago
Marc Zinnschlag
e76401d5ea
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
10 years ago
Stanislav Bas
ba4b7df99d
Add missing includes to columnimp.hpp
10 years ago
Stanislav Bas
720aca8f3d
Inform about State change (not a whole row) when modifying a table value
10 years ago
Stanislav Bas
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
10 years ago
Stanislav Bas
6d81ca07b5
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
10 years ago
scrawl
32ad8c86bf
Fix the ESM::LandTexture NAME being discarded on loading
10 years ago
scrawl
031d64d0d3
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
10 years ago
Stanislav Bas
aeb1acca51
Remove enum names for AiWanderRepeat column
10 years ago
Stanislav Bas
e14aedc7cd
ModifyCommand uses a proper name of a modified nested value
10 years ago
Marc Zinnschlag
3902513e65
merge id collections
10 years ago
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl
d1e1c0f38b
Editor: fix a typo in ESM::Light flag mappings
10 years ago
Marc Zinnschlag
47dd9505a9
copy meta data from game file when merging
10 years ago
Marc Zinnschlag
1b663f01af
create merged document and open a view for it (document is still empty at this point)
10 years ago
scrawl
e36ebc77d5
Editor: remove creature flag of unknown purpose from the UI
10 years ago
scrawl
c07ced4c8f
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
10 years ago
Marc Zinnschlag
d8655f2ff8
forgot to connect merge operation signals
10 years ago
Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
10 years ago
Marc Zinnschlag
23ccee0124
Merge remote-tracking branch 'dieho/master'
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
10 years ago
Marc Zinnschlag
7f10a7f24f
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
10 years ago
Stanislav Bas
ff2dab8d56
Remove check for an empty Particle from Magic effects verifier
10 years ago
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
10 years ago
taras.kudryavtsev
8ae7c63c45
#2730 and #2725
10 years ago
Stanislav Bas
8da9eecea7
Correct comparison of enum values in IdTableProxyModel
10 years ago
Stanislav Bas
0ea4d1981a
Add magic effect verifier
10 years ago
Stanislav Bas
33042c1464
Restore Modified status of a record when adding/removing nested rows
10 years ago
Stanislav Bas
25b653e316
Inform about Modified status change when modifying a value of a model
10 years ago
Stanislav Bas
afb36b73eb
Proper index for Modified column in ModifyCommand
10 years ago
Marc Zinnschlag
6a9218ee07
replaced State_Compiling (not requried anymore) with State_Merging
10 years ago
Marc Zinnschlag
2c1cee38b4
Merge remote-tracking branch 'smbas/feature-extended-configurator'
10 years ago
Stanislav Bas
03c2e11961
Update to upstream/master. Resolve merge conflicts
10 years ago
Marc Zinnschlag
420503d5fc
Merge remote-tracking branch 'smbas/fix-bug-2728'
10 years ago
Marc Zinnschlag
bafa86d3e9
Merge remote-tracking branch 'scrawl/master'
10 years ago
Stanislav Bas
812fffbadc
Don't inform about a nested row addition in proxy models for top-level tables
10 years ago
Stanislav Bas
86b7d2a43d
Inform about a row addition after re-sorting in InfoTableProxyModel
10 years ago
Stanislav Bas
37fd733deb
Create a custom signal to inform about a row addition in IdTableProxyModel
10 years ago
Stanislav Bas
c088cd4fa9
Proper index creation for nested data
10 years ago
scrawl
b3f5ac5dbb
Include cleanup
10 years ago
Stanislav Bas
f5b1447c92
IdTableProxyModel refreshes the filter when the source model data or rows changed
10 years ago
Stanislav Bas
a7b3248ee7
Proper sorting of columns with enum values
10 years ago
Stanislav Bas
daaff1284e
Remove unused includes
10 years ago
Stanislav Bas
13bb6be238
Load methods (for ESM records) accept a deleted flag in OpenCS
10 years ago
Stanislav Bas
1e8182220a
Fix build errors & warnings
10 years ago
Stanislav Bas
8e6a7be6f5
Implement saving of deleted records
10 years ago
Stanislav Bas
e04e32bcff
Delete infos of deleted dialogue when loading a content file
10 years ago
Stanislav Bas
a4d3e59e5c
Add a separate method to check whether a record is deleted or not for IdCollection
10 years ago
Marc Zinnschlag
cdfa3006a3
incorrect sBribe GMSTs for new omwgame files ( Fixes #2785 )
10 years ago
Marc Zinnschlag
b2ab0122ab
Merge branch 'scriptbuttons'
10 years ago
Marc Zinnschlag
8763a3b3c3
make compilation delay configurable via a user setting
10 years ago
scrawl
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
10 years ago
Marc Zinnschlag
9b12b4f1e2
refactored mapping from message severity enum to string
10 years ago
Stanislav Bas
3ba73f5fd9
Handle deleted records in RefCollection
10 years ago
Stanislav Bas
a1389b87ba
Return a correct index for a loaded record that was deleted
10 years ago
Stanislav Bas
5e623a2a1d
Rework RefIdData code. Update the index map when a new record is loaded
10 years ago
Marc Zinnschlag
fc6c14614b
added user settings option to toggle toolbars in single-record subviews
10 years ago
Stanislav Bas
71e5fc7f04
Remove INAM handling from InfoCollection
10 years ago
Marc Zinnschlag
749eff5259
renaming a few user settings categories
10 years ago
Stanislav Bas
74a055f3cc
Remove NAME and DELE handling from IdCollection
10 years ago
Stanislav Bas
42f9136141
Remove DELE and NAME handling from RefIdCollection and RefIdData
10 years ago
Marc Zinnschlag
6c5dc5c7a0
Merge remote-tracking branch 'smbas/fix-cell-creating'
10 years ago
Stanislav Bas
ceb3dea55c
Rewording of the user setting for extended configuration
10 years ago
Stanislav Bas
6162a46fbe
Update to upstream/master. Resolve the merge conflict
10 years ago
Stanislav Bas
3ffa0aa185
Count of nested columns can be retrieved for a collection with no records
10 years ago
scrawl
2385938485
Fix a typo
10 years ago
Stanislav Bas
fcf69555f4
Add the user setting for enabling the configuration of extended commands
10 years ago
Stanislav Bas
1afa22f443
Add the RecordType column to the MetaData table
10 years ago
Marc Zinnschlag
d3bcf0711c
Merge remote-tracking branch 'smbas/feature-cloning-enhancements'
10 years ago
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
Stanislav Bas
9d274ee156
Merge branch 'master' into feature-cloning-enhancements
10 years ago
Marc Zinnschlag
e27a75bd10
added user setting for cyclic prev/next
10 years ago
Stanislav Bas
f3bb00e3d9
Add the ability to add nested values to the Create command
10 years ago
Stanislav Bas
a7f31988d1
Add the ability to search a nested column index
10 years ago
Marc Zinnschlag
6d5823e8aa
killed some tabs
10 years ago
Marc Zinnschlag
fdf6645dbc
Merge remote-tracking branch 'smbas/fix-info-tables'
10 years ago
Marc Zinnschlag
2dada1a162
Merge branch 'meta'
10 years ago
Marc Zinnschlag
4487bda702
size limits for meta data strings
10 years ago
Marc Zinnschlag
a4c2c75d1f
fixed overwriting of meta data when loading project file
10 years ago
Marc Zinnschlag
1e033fa8fe
added meta data dialogue sub view
10 years ago
Marc Zinnschlag
5a37530c1c
added missing MetaData table UniversalId type
10 years ago
Marc Zinnschlag
1870b087e7
ported setting of meta data for saving to the new mechanism
10 years ago
Marc Zinnschlag
f3ff90e1fd
moved meta data into a new single-row table
10 years ago
Stanislav Bas
ea97b0a20c
Refine InfoTableProxyModel::getFirstInfoRow() code
10 years ago
Stanislav Bas
844e5c504d
Fix conversion to QString
10 years ago
Marc Zinnschlag
8fbc799655
Merge remote-tracking branch 'cc9cii/master'
10 years ago
cc9cii
c0f3d70f06
Use the new severity message attribute.
10 years ago
cc9cii
71f3b7ed4f
Fix crash when user preference is missing.
10 years ago
Marc Zinnschlag
6fbdbb11d5
added refrash menu item to report table ( Fixes #2620 )
10 years ago
Stanislav Bas
21f0b586ec
Rows with the same topic but in different letter case can be reordered
10 years ago
Marc Zinnschlag
b0aad9c8cb
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
10 years ago
Stanislav Bas
d1339a643a
Fix for NestedTableProxyModel::forwardDataChanged()
10 years ago
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
Stanislav Bas
dc37aea8eb
Add missing mappings to TableMimeData
10 years ago
Marc Zinnschlag
c644f15167
calm down travis
10 years ago
Marc Zinnschlag
b9f6baf317
add normal script warnings mode ( Fixes #2642 )
10 years ago
Marc Zinnschlag
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
10 years ago
Marc Zinnschlag
8791832c86
standarised on the use of the Message struct when passing operations messages around
10 years ago
Marc Zinnschlag
0e21c61297
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
10 years ago
Marc Zinnschlag
9a102f81c8
added setting for controlling script compiler warnings
10 years ago
Marc Zinnschlag
1ee1934053
framework for accessing user settings in operation stages
10 years ago
Stanislav Bas
ced4e237a8
Fix the sorting of Info tables when new row are added
10 years ago
Stanislav Bas
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
10 years ago
Stanislav Bas
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
10 years ago
Stanislav Bas
581ba55db9
Add Topic/Journal Id completion to InfoCreator
10 years ago
Marc Zinnschlag
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
10 years ago
Marc Zinnschlag
88d1f158d0
made double click behaviour in report tables configurable ( Fixes #2622 )
10 years ago
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
Stanislav Bas
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
10 years ago
Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
10 years ago
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
10 years ago
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
10 years ago
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
10 years ago
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
Stanislav Bas
281088c93b
Add check for an empty sound field to SoundGens verifier
10 years ago
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
10 years ago
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
10 years ago
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
10 years ago
cc9cii
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
10 years ago
Stanislav Bas
650e37dba1
RegionMap uses proper colors
10 years ago
Stanislav Bas
e516d37cbf
MapColourColumn::set() uses the correct color value
10 years ago
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago