Marc Zinnschlag
604509ac7e
Merge remote-tracking branch 'scrawl/master'
2014-06-29 10:34:48 +02:00
scrawl
3b2358888b
Attempt to fix player position after using coc/coe
2014-06-28 15:19:32 +02:00
scrawl
2451eead8a
Some additional wrapping for faction rank instructions
2014-06-27 20:07:19 +02:00
Marc Zinnschlag
3100206b28
replaced an assert with an exception
2014-06-27 08:37:41 +02:00
scrawl
15b486e149
Don't trigger changed flag if a script with no locals is configured
2014-06-26 01:21:15 +02:00
scrawl
b259c5def2
Make GetFactionReaction garbage argument optional
2014-06-25 01:12:57 +02:00
scrawl
b52977e44c
Add dummy Face implementation for now (Bug #1541 )
2014-06-24 15:09:13 +02:00
scrawl
e23a7694f3
Don't throw exception when using ModDisposition on creatures ( Fixes #1548 )
2014-06-22 00:34:32 +02:00
scrawl
a4ce9d6a7f
Always show the script name when a script fails to compile
2014-06-20 23:56:21 +02:00
scrawl
9a26cf22e6
Implement toggleMenus
2014-06-20 18:51:00 +02:00
scrawl
ad0a182b7e
Improve error message for unknown cells
2014-06-19 20:08:53 +02:00
scrawl
4648524df4
Improve getLOS (use eye level). Also, don't crash when used with non-actors.
2014-06-19 04:53:25 +02:00
scrawl
c3e4160a0a
Don't crash in StatsWindow for invalid faction rank values
...
PcRaiseRank: don't allow to raise rank beyond max rank
2014-06-18 23:50:55 +02:00
scrawl
2477456f99
Implement Murder crimes and OnMurder instruction ( Fixes #1315 )
2014-06-17 04:05:27 +02:00
scrawl
2ce8323a42
Fix getDistance not detecting references in inactive cells properly
2014-06-16 20:05:47 +02:00
scrawl
77388fe2ce
Implement BetaComment instruction (dumps reference info)
2014-06-15 16:11:16 +02:00
scrawl
395f98e476
Fix triggering changed flag for all references when cell is visited
...
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.
Also clean up RefData interface slightly.
2014-06-15 14:18:16 +02:00
scrawl
797134aa51
Handle activation scripts in AiActivate ( Fixes #1478 )
2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5
Savegame: Store AiSequence
2014-06-13 02:26:52 +02:00
scrawl
3788fb042e
Implement MenuTest script instruction ( Fixes #1454 )
2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +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
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
578adb4ef6
PcJoinFaction and friends: make sure the given faction exists
2014-05-27 13:54:25 +02: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
cc9cii
4f94a31b54
Fix crash starting a new game.
2014-05-25 07:50:19 +10: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
Emanuel Guevel
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
scrawl
3a7e2f8bb5
Allow invoking Journal instruction with non-existing index
...
This is used by the MG_EscortScholar1 quest.
2014-05-21 14:18:14 +02:00
scrawl
6bd0bbb8df
Do not load (0,0) on new game
2014-05-19 14:09:16 +02:00
Marc Zinnschlag
56c4367c1a
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 18:42:23 +02:00
mrcheko
e1249f6a31
actor handle and id confusing fix
2014-05-18 20:13:46 +04:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
36d9ae17cc
Revert "Change all AI packages (except AiActivate) to use ActorIds"
...
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)
This reverts commit 2e9985c1a3
2014-05-16 12:11:34 +02:00
scrawl
028e00c98f
Add missing status report for some toggle commands
2014-05-16 09:21:28 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
2e9985c1a3
Change all AI packages (except AiActivate) to use ActorIds
...
More robust in case the target changes cell or there are multiple targets with the same RefId
2014-05-15 09:54:10 +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
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05: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
scrawl
dd9117809d
Say an attack phrase when combat starts
...
Move combat start to a helper method
Added some todo comments
2014-05-06 00:13:31 +02:00
scrawl
1fd7a07b5e
Merge branch 'master' of https://github.com/OpenMW/openmw into return
...
Conflicts:
apps/openmw/mwmechanics/aisequence.cpp
apps/openmw/mwmechanics/aiwander.cpp
2014-04-29 09:14:13 +02:00
scrawl
9b36a13821
Feature #1289 : NPCs return to default position
...
Make stationary NPCs return to their previous position once combat/crime AI finishes.
2014-04-29 09:09:51 +02:00
Marc Zinnschlag
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
2014-04-28 21:46:05 +02:00
scrawl
7f37f2c2be
Fixes #1187 : Make GetDistance handle actors in remote cells gracefully
2014-04-28 19:23:25 +02:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
scrawl
84961d7843
Fixes #1254 : PcRank should return first rank if not in the faction
2014-04-28 15:31:18 +02:00
