Marc Zinnschlag
a266dffb4b
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-20 15:53:48 +01:00
scrawl
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
2015-01-19 09:29:21 +01:00
scrawl
19ed047dec
ESSImport: add some subrecords to CellRef and others, most files should load now, importacdt/cellref class structure need some refactoring
2015-01-18 23:15:36 +01:00
scrawl
08ad4d73bb
ESSImport: player is placed in correct cell, npc cellrefs work
2015-01-18 20:01:50 +01:00
Marc Zinnschlag
e9af9b991d
Merge remote-tracking branch 'dteviot/master'
2015-01-18 09:50:56 +01:00
dteviot
71700d2cb1
Bugfix: OpenCS segfault when plug-in dependency not found.
...
When a file that a plug-in depends on cannot be found, the OpenCS file dialog crashes.
Similar problem exists in omwlauncher's "Data Files" dialog.
2015-01-18 11:55:58 +13:00
dteviot
017e4cd4ef
OpenCS shows plug-ins with load order issues.
...
1. FileDiaog in OpenCS now shows warning icon beside .esm./.esp files with load order problems.
2. omwlaucher -> replaced "stop" icon with "warning" icon for files with load order problems.
2015-01-17 18:11:03 +13:00
scrawl
cbf56dbb47
ESSImport: work on cell fog of war
2015-01-17 03:07:24 +01:00
scrawl
031eec4550
Starting ESS importer for Morrowind save files
2015-01-17 00:16:49 +01:00
scrawl
fc663addfa
Fix null character issue in ESMReader::getString
2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
375d426dd0
check for premature end of scripts more consistently
2015-01-15 11:35:17 +01:00
scrawl
d387c207d1
Fix initial scaling for btCompoundShape children ( Fixes #2234 )
2015-01-14 18:49:25 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
scrawl
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
2015-01-13 17:19:39 +01:00
Marc Zinnschlag
7cc1ebc05b
Merge remote-tracking branch 'scrawl/master'
2015-01-13 10:38:02 +01:00
scrawl
7b4665c623
Terrain: documentation update
2015-01-13 05:37:44 +01:00
scrawl
261da8dd0a
Terrain: use 32-bit indices if necessary
2015-01-13 05:37:43 +01:00
scrawl
f7bac58b39
Terrain: change index buffer flags to unsigned
2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
2015-01-12 23:29:58 +01:00
scrawl
04d6cead3b
Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node ( Fixes #2133 )
2015-01-12 23:29:57 +01:00
Marc Zinnschlag
763e058ed2
Merge remote-tracking branch 'dteviot/master'
2015-01-12 10:41:04 +01:00
dteviot
e95b513cfc
Use icon to show files with problem ( Fixes #2268 )
...
Launcher now indicates files with problem using an icon.
Using red text for files with load order issue removed because it doesn't work well with dark themes.
2015-01-12 21:17:41 +13:00
Marc Zinnschlag
7c959c8494
Merge remote-tracking branch 'dteviot/Bug811'
2015-01-11 12:30:32 +01:00
dteviot
7aa0f887c0
Minor changes to ESM::RefNum
...
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
Marc Zinnschlag
e439065897
Merge remote-tracking branch 'scrawl/master'
2015-01-10 11:33:04 +01:00
dteviot
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
2015-01-10 18:46:47 +13:00
scrawl
efbc8742a0
Remove some unnecessary includes
2015-01-09 21:13:57 +01:00
Marc Zinnschlag
d254bb0a34
Merge remote-tracking branch 'dteviot/FixLoadOrderReset'
2015-01-09 09:32:23 +01:00
scrawl
ef7e0070a6
Don't right-shift signed integers which is implementation-defined
2015-01-08 16:27:13 +01:00
Marc Zinnschlag
4b88ef5891
fixed QuickFileParser handling of begin line (skip it instead of trying to make sense of it)
2015-01-08 13:59:03 +01:00
dteviot
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
2015-01-08 12:15:48 +13:00
dteviot
083de62be5
Fixed issues found by Zinnschlag.
...
1. Errors found are added to default tool tip text. (Instead of replacing it.)
2. If multiple errors are found, all are shown in tool tip text, not just first one.
3. Load Order Errors are updated when files are activated/deactivated, not just when the files have their position in list changed.
2015-01-08 11:18:42 +13:00
Marc Zinnschlag
38a413a483
Merge remote-tracking branch 'scrawl/master'
2015-01-07 20:22:15 +01:00
Marc Zinnschlag
83e454e493
Merge remote-tracking branch 'marcoschulze/git-version-retrieval-fix'
2015-01-07 12:29:09 +01:00
scrawl
e19ab77d00
Store camera first person state in savegame ( Fixes #2255 )
2015-01-07 02:34:24 +01:00
scrawl
c6c7d102d0
Revert "components/nif/base.hpp now uses the templated get() function"
...
This reverts commit ad609bff7822abffc76de9ae01b50cb9df97b093.
Revert "Made incorrect nif get error message more informative."
This reverts commit 9909c4abadbe4c0aedc24a50155908c5e7e39b13.
Revert "Build the nif file tester by default"
This reverts commit c1315ed90c87a457f17e6076c149465da3fa6c3a.
Revert "Converted most nifstream "get multiple" functions to the templated version"
This reverts commit 2619d57bb6afc5c31bf1a90b8c033d66f29a9a58.
Revert "Add a templated option for getting vectors to NIFStream"
This reverts commit f318ee0b8c68a46d53a0fdd216ae8d6b371eedc2.
Revert "Made NIFStream getters templated"
This reverts commit 4edc4142f3b4f1cde4d99392045d5d25858e6bf7.
2015-01-06 23:36:15 +01:00
scrawl
f267497c03
Allow separate summoned creature instances for each spell ID ( Fixes #2194 )
2015-01-06 16:11:05 +01:00
scrawl
afc961d19c
Workaround for random AABB assertion due to zero-sized particles ( Fixes #1663 )
2015-01-05 20:32:26 +01:00
Marc Zinnschlag
365bb3d3f0
Merge remote-tracking branch 'scrawl/unused'
2015-01-05 20:05:23 +01:00
scrawl
d919a0186e
Comment out unused opSkipOnZero
2015-01-05 18:54:52 +01:00
scrawl
4a734f5cd3
Fall back to top-level directory when looking for resources ( Fixes #2169 )
2015-01-03 19:10:15 +01:00
Marc Zinnschlag
ac7c2a1473
some cleanup
2015-01-03 13:59:59 +01:00
Marc Zinnschlag
bbbf431ae3
double bug in script name handling workaround ( Fixes #1730 )
2015-01-03 13:54:46 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Thoronador
773669952b
remove initializing constructors from "dumb structs"
...
As suggested by Marc Zinnschlag:
https://github.com/OpenMW/openmw/pull/423#issuecomment-68526701
2015-01-02 16:30:14 +01:00
Arthur Moore
ad609bff78
components/nif/base.hpp now uses the templated get() function
2015-01-02 01:19:34 -05:00
Arthur Moore
9909c4abad
Made incorrect nif get error message more informative.
2015-01-02 01:16:47 -05:00
