mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 07:53:53 +00:00
Code Issues Releases Wiki Activity
10314 commits 108 branches 66 tags 133 MiB
Commit graph

10314 commits

This branch
This branch
All branches
Author SHA1 Message Date
pvdk
0cc7c06262 Ensure the launcher is not shown when the wizard is run 2014-05-30 02:41:09 +02:00
pvdk
6348af586e Fixed some problems with the launcher and the wizard 2014-05-30 02:12:48 +02:00
pvdk
a390dde818 Fixed importing configurations of existing installations 2014-05-29 21:17:49 +02:00
pvdk
2a6a26c0d0 Minor fixes 2014-05-29 21:02:06 +02:00
pvdk
88064f4946 Fix for MOC error due to Boost includes 2014-05-29 20:35:07 +02:00
pvdk
5af12d193a Cleaned up old wizard stuff from launcher 2014-05-29 17:57:41 +02:00
pvdk
38d825b004 Merge remote-tracking branch 'upstream/master' into wizard 
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
 2014-05-29 16:42:16 +02: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
scrawl
42ea43c3d1 Fix container scripts not getting removed properly on cell change 
Broken by f99eda1a54
 2014-05-28 18:45:07 +02:00
Marc Zinnschlag
bb011f278e Merge remote-tracking branch 'cc9cii/master' 2014-05-28 14:45:57 +02:00
scrawl
56ff399f30 Say attack voiced dialogue *after* the target is set up 
Required for the CreatureTargetted filter to function properly
 2014-05-28 13:59:31 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
Marc Zinnschlag
d02f7ac775 Merge remote-tracking branch 'emperorarthur/nif_fix' 2014-05-28 11:15:01 +02:00
Marc Zinnschlag
3244f2197a updated credits file 2014-05-28 11:13:23 +02: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
Arthur Moore
9be219beba Fixes Bug #1348 "Evidence Chest unlocking when arrested." 2014-05-27 22:09:37 -04:00
cc9cii
eb1589fd54 Merge remote-tracking branch 'upstream/master' 2014-05-27 21:04:40 +01: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
0b45a9e6b2 Fix case folding for faction reaction from ESX records 2014-05-27 19:02:48 +02:00
scrawl
2b15b85af1 Fix position adjustment not working properly for rotated objects 2014-05-27 17:58:18 +02:00
scrawl
2fe86f2b85 Consider hit normal for item drop test (Fixes #995) 2014-05-27 17:39:04 +02:00
scrawl
f476aa4ade Remove MyGUI color codes when copying to system clipboard 2014-05-27 17:07:14 +02:00
scrawl
49a6579d3a Fixed esmtool 2014-05-27 15:37:04 +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
Marc Zinnschlag
27c795483b Merge remote-tracking branch 'ace/win-build-fix' 2014-05-27 14:32:20 +02:00
cc9cii
ad911d4d03 MSVC generates different symbols for class vs struct, confusing the linker. 2014-05-27 22:09:08 +10:00
scrawl
578adb4ef6 PcJoinFaction and friends: make sure the given faction exists 2014-05-27 13:54:25 +02:00
Alexander "Ace" Olofsson
d3357cc279 The MSVC linker is really pedantic with this. 
Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing...

unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)
 2014-05-27 13:27:18 +02:00
Marc Zinnschlag
1665822224 Merge remote-tracking branch 'puppykevin/master' 2014-05-27 12:42:48 +02:00
Kevin Poitra
beba58268c Fix a typo within the launcher. Fixes bug #1058. 2014-05-27 01:47:57 -05:00
Marc Zinnschlag
9e21da9636 Merge remote-tracking branch 'scrawl/master' 2014-05-27 08:34:54 +02:00
scrawl
cf68f6da96 Fix ESX dependencies not being checked except for the first one 2014-05-27 00:06:34 +02:00
scrawl
4caa8c5cca Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations) 2014-05-26 20:52:38 +02:00
scrawl
5660f283dd Fix actor models incorrectly being rotated on X/Y axes 2014-05-26 20:52:38 +02:00
scrawl
0966755a0c Store death animation index in CreatureStats 2014-05-26 20:52:32 +02:00
Marc Zinnschlag
3937cfcd8b Merge remote-tracking branch 'scrawl/master' 2014-05-26 19:02:13 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
scrawl
f629307f60 Fix frame delay for sound listener position (Fixes #1180) 2014-05-26 16:43:19 +02:00
scrawl
bfd91c0681 Fix potential NpcStats overwriting issue 2014-05-26 12:31:08 +02:00
Marc Zinnschlag
4aab4bae65 minor cleanup and silenced a warning 2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19 Merge remote-tracking branch 'mrcheko/master' 2014-05-26 10:08:40 +02:00
mrcheko
8fa7fcdbee fix bug http://bugs.openmw.org/issues/1335 (1304 as well) 
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
 2014-05-25 21:03:37 +04:00
scrawl
10d835a55c Some more missing isInCell checks 2014-05-25 15:07:35 +02:00
scrawl
f3ba31de2d Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwscript/cellextensions.cpp
 2014-05-25 14:58:47 +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
Marc Zinnschlag
130af28fa5 Merge remote-tracking branch 'cc9cii/master' 
Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c Merge branch 'openmw-30' 2014-05-25 11:55:25 +02:00