mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 09:56:38 +00:00
Code Issues Releases Wiki Activity
14052 commits 115 branches 76 tags 128 MiB
Commit graph

2298 commits

Author SHA1 Message Date
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
cc9cii
d28f257ada Fix for bug #2428. Set default flag value (mandatory) for containers. 2015-03-06 11:53:46 +11:00
dteviot
80fe24207c correction from Scrawl. 
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
 2015-03-05 20:21:22 +13:00
Marc Zinnschlag
4e1c086d6a load start up script records 2015-03-03 14:31:59 +01:00
Marc Zinnschlag
bf92d5cde9 removed redundant mScript field in ESM::StartScript 2015-03-03 13:04:57 +01:00
scrawl
a8cb4e807b Warning fix 2015-03-03 11:24:23 +01:00
scrawl
17e3069896 Minor efficiency fix 2015-03-02 22:33:37 +01:00
scrawl
f6509fe53e Another crash fix for land record without data 2015-03-02 22:23:00 +01:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
scrawl
0ad514b29b Fix collision for nodes with MRK extra data (Fixes #2415) 2015-03-02 01:03:03 +01:00
cc9cii
1ee6153940 Remove unnecessary boolean passing between objects. 2015-03-02 06:51:31 +11:00
cc9cii
c4625b94e5 Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS. 2015-03-01 12:52:43 +11:00
dteviot
5e2839977b file extension comparison needs to be case insensitive. 2015-02-28 20:25:03 +13:00
dteviot
54e3ebde63 addon list in launcher shows addon files with no dependencies (Fixes #2348) 
Also, game files must end with ".esm" or ".omwgame".
 2015-02-28 17:13:21 +13:00
Marc Zinnschlag
44d1f43b2b Merge remote-tracking branch 'sandstranger/fixes-for-android' 2015-02-27 10:34:41 +01:00
Marc Zinnschlag
093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 2015-02-26 19:05:30 +01:00
sylar
70398e2f9f change Jni name method 2015-02-26 18:30:14 +04:00
dteviot
9d61457956 AddOn files can be checked if game file is checked, but dependencies do not exist. 2015-02-25 20:54:52 +13:00
dteviot
6878e317a7 launcher: decouple Combo Box model from Plug-ins model. 
fixes bug reported by scrawl
1. openmw.cfg had content files in order 'Bloodmoon.esm, Tribunal.esm, Morrowind.esm'
2. Blank_ESM_2.0.esm is in the Data Files directory
3. Do an ini file import.
4. Imported profile will have Blank_ESM_2.0.esm as the game file.  Should be Morrowind.esm.

Root cause: Game File combo box and Plugins Grid shared same data model, so changing plug-in file order also changed order of Game File combo box.
 2015-02-24 20:06:06 +13:00
dteviot
63af9d848a Add constraint: Bloodmoon.esm requires Tribunal.esm. 2015-02-23 19:58:31 +13:00
dteviot
6dc202cba3 Removed unneeded parameter from ContentModel::setContentList() 2015-02-23 19:41:41 +13:00
scrawl
387969bf42 Remove an old .gitignore 2015-02-22 18:05:46 +01:00
dteviot
accc078e0e Morrowind.ini import progress bar. (Fixes #2344) 
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
 2015-02-22 08:46:12 +13:00
Marc Zinnschlag
8686ffcedb Merge remote-tracking branch 'scrawl/master' 2015-02-17 11:55:12 +01:00
Marc Zinnschlag
6cc9fa2b3f Merge remote-tracking branch 'slothlife/cmake-release-build-fix' 2015-02-15 09:52:13 +01:00
scrawl
96a295c44f Fix for deleting all items in a levelled list 2015-02-13 17:37:56 +01:00
scrawl
8b417c06db Fix missing clear in ESM::Spell::load (Fixes #2368) 2015-02-13 17:26:33 +01:00
scrawl
a139e4efb0 Grey out completed quests in journal quests list 2015-02-13 16:51:34 +01:00
Kamil Bar
3b7a23aa72 Fixed charge checks for light and other objects, corrected CellRef charge union comments 2015-02-13 13:11:10 +01:00
scrawl
49d912e5b6 Don't rely on subrecord order part 2 
Nice side effects:
 - Subrecord name comparison now uses magic number instead of string (faster)
 - Improves the error message for unknown subrecords: will print the record in question instead of failing to read the next record with a strange error
 2015-02-12 05:43:22 +01:00
slothlife
cfe81bafe8 Remove setting CMAKE_BUILD_TYPE to Debug 
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
 2015-02-11 21:46:00 -06:00
scrawl
9009889d24 Don't rely on subrecord order when reading (Fixes #2361) 2015-02-10 23:19:33 +01:00
scrawl
3ccf4642b4 Implement ToggleScripts 2015-02-10 20:25:57 +01:00
jacmoe
ee574e08ef MIT License header added to all terrain component files. 2015-02-09 20:16:29 +01:00
scrawl
03257ecae5 QString encoding fix 2015-02-09 20:15:41 +01:00
scrawl
4c6b9f8266 Remove redundant decoder in ContentModel 2015-02-06 01:27:17 +01:00
scrawl
cff0127ce7 Update comment on merging levelled lists 2015-02-06 01:27:17 +01:00
scrawl
d18d2a1882 Skip rest of LEVI record if it has no items (Bug #2348) 2015-02-06 01:27:17 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
f8b4ff3004 Documentation fix 2015-02-05 04:18:43 +01:00
scrawl
ab9100fa90 Prevent dropping item on itself in ContentModel (Fixes #2334) 
Also improves the drop indicator, it is now shown in between items instead of on an item.
 2015-02-05 04:18:43 +01:00
scrawl
27dc49a135 Rewrite game settings manager 
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
 2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
2abc033655 ConstrainedDataStream: print the name of the file in exceptions 2015-01-31 22:40:42 +01:00
scrawl
51e451e249 Tabs to spaces 2015-01-31 22:40:42 +01:00
scrawl
d541bc8064 Remove unused functions in nifstream 2015-01-31 22:40:42 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead 
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
 2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file 
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
 2015-01-31 22:40:39 +01:00
scrawl
ef3ba12cb6 Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
scrawl
081c8c8615 ESSImport: convert to utf8, based on encoding setting in openmw.cfg 2015-01-31 22:40:38 +01:00
scrawl
e712b0353b Terrain refactoring, reduce game startup time and memory usage 2015-01-29 03:39:01 +01:00
scrawl
62a32220ff Use low-LOD heightmap for world map rendering 
Add vanilla-accurate colour palette (thanks Hrnchamd)
 2015-01-29 03:39:01 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
875df46ae9 ESSImport: convert journal indices 2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b Improve INFO struct naming 2015-01-27 23:12:21 +01:00
scrawl
9d3f0b2ed5 Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
scrawl
d34086ac8f ESSImport: convert running global scripts 2015-01-27 23:05:20 +01:00
scrawl
4921c6ef9e Split window caption bars so that the caption can be transparent (Fixes #531) 
Fix transparent window background not applying to the header bar (Fixes #2294)
 2015-01-27 23:05:19 +01:00
dteviot
946dd16696 Fixed Windows warning. 
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
 2015-01-26 13:57:22 +13:00
dteviot
f95743ccc3 Fixed MSVC warning. 
warning C4305: 'return' : truncation from 'double' to 'float'
 2015-01-26 13:18:21 +13:00
dteviot
e02bab67ba Fixed MSVC warnings. 
warning C4099: 'ESM::ESMReader' : type name first seen using 'class' now seen using 'struct'
warning C4099: 'ESM::CellId' : type name first seen using 'struct' now seen using 'class'
 2015-01-26 13:17:16 +13:00
Nathan Aclander
33ce03dfc5 Should be compared against uint only 2015-01-24 17:17:05 -08:00
scrawl
b1bd236345 ESSImport: convert script local variables 
Had to add special reading code to openmw, because the variable names are not stored.
 2015-01-24 16:45:36 +01:00
Marc Zinnschlag
7f905470fa fixed moved reference loading 2015-01-24 15:01:38 +01:00
scrawl
7d76213374 Fix loading faction reactions for older savegames (Fixes #2301) 2015-01-24 14:32:02 +01:00
Marc Zinnschlag
89998a6a03 save MVRF subrecords 2015-01-24 14:22:29 +01:00
scrawl
79d2eebe54 Store selected enchant item in savegame (Fixes #1702) 2015-01-23 16:45:47 +01:00
scrawl
a619cff615 Implement EnableLevelupMenu to trigger level-up 2015-01-23 15:34:47 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0 Fix wrong magic number for JOUR in openmw savegames 2015-01-23 15:34:47 +01:00
scrawl
e203127952 ESSImport: read script variables (not converted yet) 2015-01-23 15:34:47 +01:00
scrawl
1e92cab3e7 ESSImport: read dialogue/journal records, not converted yet 2015-01-23 15:34:14 +01:00
scrawl
69676906ae Don't clear known spells when reading from the savegame 
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
 2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix"" 
This reverts commit b95748d044.
 2015-01-23 15:33:39 +01:00
scrawl
d13335ba40 Ensure the item can be equipped in the given slot when loading inventory 2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0 Revert "Change save format to store relative equipment index" 
This reverts commit 89d9649b50.
 2015-01-23 02:32:43 +01:00
scrawl
b95748d044 Revert "Light charge handling fix" 
This reverts commit 5e0428243b.
 2015-01-23 02:32:38 +01:00
Marc Zinnschlag
a97f599e65 fixed ref num saving in non-wide format 2015-01-22 13:41:09 +01:00
Marc Zinnschlag
764c155cec moved code for writing/reading ref nums into RefNum struct 2015-01-22 13:33:23 +01:00
Marc Zinnschlag
fa4718283d Merge remote-tracking branch 'scrawl/contentselector' 2015-01-21 15:23:38 +01:00
Marc Zinnschlag
cd62dbc5b7 Merge remote-tracking branch 'scrawl/essimporter' 2015-01-21 15:12:04 +01:00
scrawl
5e0428243b Light charge handling fix 2015-01-21 01:59:45 +01:00
scrawl
db64ff6645 Fix actorId initialization 2015-01-21 01:34:00 +01:00
scrawl
89d9649b50 Change save format to store relative equipment index 
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
 2015-01-20 23:55:26 +01:00
scrawl
d473629dcd Improve ESMReader error messages 2015-01-20 19:29:55 +01:00
scrawl
06736e9e03 ESSImport: convert faction reactions and known dialogue topics 2015-01-20 15:56:07 +01:00
Marc Zinnschlag
a266dffb4b Merge remote-tracking branch 'scrawl/essimporter' 2015-01-20 15:53:48 +01:00
scrawl
5104a5a023 Add missing setFactionReaction instruction, use absolute storage instead of difference 
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).

This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
 2015-01-20 00:53:31 +01:00
scrawl
9014dc48ee Don't require the object type id for reading references from savegames 
This is redundant, since we can look it up from the RefID.
 2015-01-20 00:42:25 +01:00
scrawl
8e1eeccbe1 ESSImport: container state 2015-01-19 13:16:12 +01:00
scrawl
a7b82e5107 ESSImport: inventory loading works, equipment slots need more work 2015-01-19 12:22:51 +01:00
scrawl
f7e32a24c9 Fix terrain assertion 2015-01-19 12:03:30 +01:00
scrawl
235683e449 Remove LightState from openmw save format to streamline inventory loading 2015-01-19 11:36:00 +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 ad609bff78.

Revert "Made incorrect nif get error message more informative."

This reverts commit 9909c4abad.

Revert "Build the nif file tester by default"

This reverts commit c1315ed90c.

Revert "Converted most nifstream "get multiple" functions to the templated version"

This reverts commit 2619d57bb6.

Revert "Add a templated option for getting vectors to NIFStream"

This reverts commit f318ee0b8c.

Revert "Made NIFStream getters templated"

This reverts commit 4edc4142f3.
 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
Arthur Moore
c1315ed90c Build the nif file tester by default 
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
 2015-01-01 22:49:33 -05:00
Arthur Moore
2619d57bb6 Converted most nifstream "get multiple" functions to the templated version 2015-01-01 22:49:05 -05:00
Arthur Moore
f318ee0b8c Add a templated option for getting vectors to NIFStream 2015-01-01 22:45:55 -05:00
Arthur Moore
4edc4142f3 Made NIFStream getters templated 2015-01-01 21:39:44 -05:00
Thoronador
9cc219ff76 fix uninitialized members in Pathgrid::Point 2015-01-02 01:22:53 +01:00
Thoronador
87fac78823 fix uninitialized members in Cell and structures 2015-01-02 01:01:37 +01:00
dteviot
fb671fed20 Corrected issues found by Scrawl. 2015-01-01 15:53:35 +13:00
scrawl
01652bbcc5 Store original actor position in AiWander package (Fixes #2200) 2015-01-01 03:38:49 +01:00
dteviot
43dd9aee94 Fix for more errors found by Travis CI. 2015-01-01 10:13:27 +13:00
dteviot
93bbd7463a Fixed errors and warnings from Travis CI. 2015-01-01 09:40:42 +13:00
dteviot
dfbd470613 Adjust plug-in order to match profile loading. 
Also marks plug-ins with load order problems in red and changes tool tip to describe error.
 2014-12-31 19:19:54 +13:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
Marco Schulze
3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout 
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
 2014-12-30 18:37:33 -03:00
scrawl
e2346d7c37 Store permanent magic effects in savegame (Fixes #1648) 2014-12-30 01:36:31 +01:00
Marc Zinnschlag
82af524a58 Merge remote-tracking branch 'dteviot/master' 2014-12-26 16:21:18 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
b35f87ae7e Improve font file error handling 2014-12-24 15:45:13 +01:00
scrawl
c7be850162 Add messagebox escape characters for spell/weapon cycling hotkeys 2014-12-24 15:45:13 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
dteviot
ad5d884761 omwlauncher crash when can't read file in active profile (Fixes #1069) 2014-12-24 10:22:26 +13:00
MiroslavR
3cc32b641a Fix some memory leaks 2014-12-23 20:44:25 +01:00
Marc Zinnschlag
120873a66d another workaround for script translation messup 2014-12-18 10:40:51 +01:00
Marc Zinnschlag
057d0913d6 Merge branch 'scriptfixes' 2014-12-18 10:22:07 +01:00
Marc Zinnschlag
fc1d42a7d2 fixed exclusion for certain characters at the start of names 2014-12-18 09:55:26 +01:00
Marc Zinnschlag
b951251572 handle junk in argument lists (Fixes #2206) 2014-12-17 15:03:05 +01:00
Marc Zinnschlag
5cb94da9c5 compensate for incorrect minus character in translated dialogue script (Fixes #2207) 2014-12-17 11:56:54 +01:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
84b0dcf2e3 Work around particles not being rendered in the first frame 2014-12-15 18:19:05 +01:00
scrawl
8f29f2667e Fix rotation order for XYZ rotation keys (Fixes #1067) 2014-12-13 15:49:32 +01:00
Marc Zinnschlag
ed5387fb8c replaced stay [ ignoring implementation with one that does not interfere with other workarounds (Fixes #2205) 2014-12-13 15:43:40 +01:00
Marc Zinnschlag
e4f75267d0 in case of arguments not separated with comma the fist token of the next argument was put back incorrectly 2014-12-13 15:40:24 +01:00
Marc Zinnschlag
33d905dc03 Merge remote-tracking branch 'scrawl/master' 2014-12-13 12:37:57 +01:00
scrawl
0ca11eab1c Ignore extra argument for removeItem (Fixes #2208) 2014-12-13 02:39:56 +01:00
Arthur Moore
b8edd9bac3 Get a nif file's version string regardless of its length. 2014-12-12 02:01:46 -05:00
Arthur Moore
cd835152e1 Fix spacing issue for NIF file errors. 2014-12-12 02:01:46 -05:00
Arthur Moore
018f4e6895 Fail early if trying to read a string larger than the nif file size. 
This is much better than failing after a few minutes with an out of memory error.
 2014-12-12 02:01:46 -05:00
scrawl
2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-11 22:44:58 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
Marc Zinnschlag
cda0363f29 allow a space in the middle of multi-character comparison operators (Fixes #2185) 2014-12-11 13:51:37 +01:00
scrawl
fb1aa096be Settings: reduce scope for better readability 2014-12-10 21:46:36 +01:00
scrawl
6eebe9b44c Read NiFogProperty, but don't use it yet (Feature #920) 2014-12-10 20:51:32 +01:00
scrawl
e0c6f84546 AiFollow: target has to be seen in order to start following (Fixes #1637) 2014-12-09 22:25:28 +01:00
Marc Zinnschlag
0649373d2e Merge branch 'report' 2014-12-08 19:01:38 +01:00
Marc Zinnschlag
109fbab546 changed column/row numbering in script compiler error messages from being starting at 0 to starting at 1 2014-12-07 16:02:28 +01:00
scrawl
9a1b7cbe52 Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row (Fixes #1986) 2014-12-06 16:50:09 +01:00
scrawl
3f0bc6eecb Ignore extra bytes after the SCVR string list (Fixes #2184) 2014-12-05 23:36:06 +01:00
scrawl
5a25649076 Implement XYZ rotation keys support (Fixes #1067) 2014-12-05 20:58:03 +01:00
scrawl
65536f0857 Load initial particle system state from NIF files (Fixes #2178) 2014-12-05 18:00:30 +01:00
Marc Zinnschlag
eb6e1576be Merge remote-tracking branch 'scrawl/master' 2014-12-03 20:17:34 +01:00
scrawl
b650338d69 Implement drawMode of NiStencilProperty (Feature #1057) 2014-12-03 18:28:35 +01:00
scrawl
e6c59f5585 Revert "Allow NIF rotation matrices that include scale values" 
This reverts commit f57ddec6a2.

Conflicts:
	components/nif/nifstream.hpp

(Fixes #2168)
 2014-12-03 18:28:35 +01:00
root
85b8fca1f0 fixes 2014-12-03 01:11:50 +04:00
root
4e756a2f4a path to game get through jni 2014-12-03 01:03:27 +04:00
scrawl
59cde9b431 Don't use transparency override if there's no transparency (rug fix for Bug #2050) 2014-12-01 23:09:46 +01:00
scrawl
077c619611 Implement Clamp mode for NiTexturingProperty (Fixes #2050) 2014-12-01 23:09:46 +01:00
scrawl
dffa8c6c14 Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170) 2014-11-30 22:02:25 +01:00