krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
10677 commits 35 branches 0 tags 65 MiB
Commit graph

1738 commits

Author SHA1 Message Date
Arthur Moore
b90e4db871 Actually read in XYZ_ROTATION_KEY data instead of discarding it. 2014-06-06 01:26:28 -04:00
dreamer-dead
e772bb88da Remove RTTI usage in NIF reader. 2014-06-05 20:22:20 +04:00
Marc Zinnschlag
5313862a46 Merge remote-tracking branch 'scrawl/master' 2014-06-04 15:14:29 +02:00
scrawl
7376cb9b61 Fix loading ESX files cleaned with testool (Fixes #1382) 2014-06-03 22:49:37 +02:00
scrawl
ce14a6413b Small optimization to ESM::Variant 2014-06-03 22:40:09 +02:00
scrawl
577ed3943b Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
Arthur Moore
576c06d791 Fix Bug #1371 
Not properly reading in the NIF file's QuaternionKeyList.
 2014-06-01 18:01:44 -04:00
scrawl
c018319940 Addition to 7c9c0830a9: don't create useless BaseWhite clones 2014-06-01 02:21:47 +02:00
scrawl
7c9c0830a9 Fix errors due to BaseWhite material being removed 2014-05-31 19:50:01 +02:00
scrawl
16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object 
Fixes #1360
 2014-05-31 13:01:11 +02:00
Marc Zinnschlag
ecf3d52b46 Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader' 2014-05-30 12:07:16 +02:00
Marc Zinnschlag
f5e587f566 Merge remote-tracking branch 'puppykevin/master' 2014-05-30 11:42:19 +02:00
cc9cii
11ce093a9e Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284. 2014-05-30 18:46:18 +10: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
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
50a72ed710 Fix ghosts in Cavern Of The Incarnate having -1 health 2014-05-29 18:09:13 +02:00
Kevin Poitra
18314b1707 We use spaces, not tabs. 2014-05-28 14:56:50 -05:00
Kevin Poitra
8e55eb8009 Fix some formatting. 2014-05-28 13:06:43 -05:00
Kevin Poitra
545c3c312c Remove a superfluous clear. 2014-05-28 13:03:40 -05:00
Marc Zinnschlag
f112c78858 Merge remote-tracking branch 'scrawl/master' 2014-05-28 19:47:36 +02:00
scrawl
e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame. 
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
 2014-05-28 19:23:50 +02:00
Marc Zinnschlag
bb011f278e Merge remote-tracking branch 'cc9cii/master' 2014-05-28 14:45:57 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
Arthur Moore
50a4d175da Read NIF interpolation type 4 (XYZ_ROTATION_KEY) 
Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible.

Partly implements Feature #1067
 2014-05-28 03:42:26 -04:00
Marc Zinnschlag
be39395ce7 Merge remote-tracking branch 'scrawl/master' 2014-05-27 21:09:24 +02:00
Marc Zinnschlag
12fc0aaecb removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly) 2014-05-27 21:08:29 +02:00
scrawl
3e2eed9269 Implement getFactionReaction function 
Strange bug when using value != 0 for the garbage argument?
 2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d Implement modFactionReaction instruction (Closes #1347) 2014-05-27 14:54:29 +02:00
scrawl
0966755a0c Store death animation index in CreatureStats 2014-05-26 20:52:32 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking 
Wrapped item charge handling in getItemHealth function
 2014-05-25 14:30:07 +02:00
scrawl
b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
 2014-05-23 08:39:48 +02:00
Marc Zinnschlag
244eb11651 Merge remote-tracking branch 'greye/widechar' 2014-05-23 07:48:26 +02:00
scrawl
e51300989c Handle NiBSPArrayController as alias for NiParticleSystemController 
The differences (if any) are unknown.

NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData?
 2014-05-22 23:07:06 +02:00
greye
663d5c314e be more verbose on change reasons 2014-05-22 16:35:57 +04:00
greye
4346e3b4d0 try to load plugins from relative paths 2014-05-20 21:42:51 +04:00
Marc Zinnschlag
d8440e1fdc implemented reference record merging 2014-05-20 09:02:22 +02:00
greye
444a07c01b workaround OgreLog Unicode path handling 2014-05-19 18:12:13 +04:00
greye
493f8c6050 fix opening BSA on Unicode path 2014-05-19 13:39:07 +04:00
greye
417e07fbce fix irrelevant error reporting 2014-05-19 10:59:36 +04:00
greye
6cb795ef7d attempt to fix LowLevelFile, minor code reuse 2014-05-19 10:47:02 +04:00
greye
2c82da8e6e load Ogre::ConfigFile from DataStream 2014-05-19 10:07:43 +04:00
scrawl
3dceb7ee4f Fix overwriting DialInfo 2014-05-18 18:58:32 +02:00
scrawl
0aa1042fd7 Optimized dialogue merging with a lookup map 2014-05-18 16:01:16 +02:00
scrawl
1677fcf324 Dialogue merging 2014-05-18 15:25:16 +02:00
scrawl
5b76c0893a Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	components/esm/inventorystate.hpp
 2014-05-18 12:55:43 +02:00
greye
e02b04536f fix most vexing parse issue 2014-05-18 14:55:05 +04:00
greye
424d06a6f8 open fstreams from boost::filesystem::path, vol.2 2014-05-18 14:55:05 +04:00
greye
2236216344 minor simplification 2014-05-18 14:55:05 +04:00
greye
a22ec223d8 open fstreams from boost::filesystem::path, vol.1 2014-05-18 14:55:05 +04:00
greye
b4950509bc use converted widechars in ini importer 2014-05-18 14:55:05 +04:00
greye
eafdefe999 using WindowsPath implies utf-8 for boost fs::path 2014-05-18 14:55:05 +04:00
greye
584c121f33 fix windows unicode path handling 2014-05-18 14:55:04 +04:00
scrawl
a872c9f83a Feature #1323: handle restocking levelled items 2014-05-18 12:53:21 +02:00
cc9cii
b36bb58e8c Bug #1324: Artem's solution 2014-05-18 07:34:13 +10:00
Marc Zinnschlag
f7c89015f9 Merge remote-tracking branch 'scrawl/master' 2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 2014-05-17 09:09:00 +02:00
scrawl
e266aff561 Savegame: store projectiles 2014-05-17 05:24:32 +02:00
scrawl
b3735981d6 Remove unused file_finder 2014-05-15 21:36:24 +02:00
Marc Zinnschlag
3b2ba4f6cd Merge remote-tracking branch 'scrawl/master' 2014-05-15 14:25:36 +02:00
scrawl
a76e391ad0 Savegame: store door movement state (Closes #747) 2014-05-15 09:54:10 +02:00
scrawl
471bbd0021 Savegame: store levelled creature state and move to actorIds 
(Closes #1332)
 2014-05-15 09:54:04 +02: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
scrawl
9b67fcc4d7 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57 Savegame: store ActiveSpells 2014-05-14 23:54:15 +02:00
scrawl
61187c2fef Savegame: store actorIds 2014-05-14 09:47:49 +02:00
scrawl
51020fdb5f Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future. 2014-05-14 09:17:30 +02:00
Thomas
cbcf0f6039 Changed AiEScort to use new PathTo function 2014-05-14 01:44:11 -04:00
slothlife
c160a04ede Revert "Fixes for warnings when building with MSVC" 
This reverts commit 46eb20b98c.
 2014-05-14 00:03:30 -05:00
Thomas
085fb2c5a2 Simplified documentation a bit 2014-05-13 14:13:05 -04:00
Thomas
a61d804de6 now that I've found the documentation, fixed some stuff for extensions 2014-05-13 13:53:06 -04:00
Thomas
77d365e196 Forced some function arguments to take in a specific array size 2014-05-13 13:25:22 -04:00
Thomas
9dbe53c722 Merge remote-tracking branch 'upstream/master' 2014-05-13 04:11:07 -04:00
Thomas
2c74ea381e Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue 2014-05-12 21:05:32 -04:00
scrawl
6cc691115b Savegame: store most of CreatureStats 2014-05-12 21:37:36 +02:00
Thomas
645d174a96 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwmechanics/aisequence.hpp
 2014-05-12 14:49:08 -04:00
scrawl
a4a9794417 Savegame: store fog of war (Closes #1177) 2014-05-11 02:07:58 +02:00
scrawl
041319c43e Fixes #1234: Store dynamic record counter in savegame to prevent name clashes 2014-05-11 00:32:22 +02:00
slothlife
46eb20b98c Fixes for warnings when building with MSVC 
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
 2014-05-09 08:32:52 -05:00
Thomas
dbf06d8c8b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwmechanics/aipursue.hpp
	apps/openmw/mwmechanics/aisequence.hpp
 2014-05-04 02:06:43 -04:00
scrawl
7bddfc0025 Fix some spelling mistakes. 2014-05-03 12:23:22 +02:00
scrawl
122e606e30 Crime: improvement to arrest on sight for large bounties 
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
 2014-05-03 12:17:44 +02:00
scrawl
8560b43464 Move to esm component 2014-05-02 12:48:07 +02:00
scrawl
17bb8d7f9a Fixes #1252: Add item/magic keybindings to savegame 2014-05-01 21:16:32 +02:00
scrawl
6f7fbc867f Fix several leaks 2014-05-01 16:55:15 +02:00
Thomas
8f90dd43ec Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier 2014-04-29 12:52:08 -04:00
Thomas
885228ec02 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
 2014-04-28 12:27:57 -04:00
scrawl
27a05027f4 Fixes #1172: Added basic loading/saving progress bar 
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
 2014-04-28 11:29:57 +02:00
Thomas
c2127845af Added onKnockdown command 2014-04-27 20:54:22 -04:00
scrawl
30666f2cce Fixes #1297: Store global map markers in savegame 2014-04-26 13:42:32 +02:00
scrawl
f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. 
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
 2014-04-26 12:04:37 +02:00
scrawl
45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 2014-04-26 11:36:27 +02:00
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 2014-04-23 05:19:34 -04:00
scrawl
6929e541dd Fix texture name issue with Vality's Bitter Coast Mod 2014-04-21 05:30:14 +02:00
scrawl
2cb9f38a45 Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent. 2014-04-20 19:34:58 +02:00
scrawl
262e959699 Remove unused slice_array 2014-04-20 19:28:39 +02:00
scrawl
d3d0b7362f Fix older savegame compatibility regarding new crime feature. 2014-04-18 12:34:26 +02:00