Commit Graph

519 Commits (cd131e7f867fbc0c9a8d28259960dab40a23f248)

Author SHA1 Message Date
Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
11 years ago
Jeffrey Haines 940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
11 years ago
Jeffrey Haines b1abef7a38 Cleaned up code 11 years ago
Jeffrey Haines 58b135a2be Crime is now checked every frame call 11 years ago
Jeffrey Haines 6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 11 years ago
Jeffrey Haines 7c0b51fb7e Ai pursue now controls guards pursuit of crimes
Should extend AiActivate in the future
11 years ago
Jeffrey Haines 4037f3705e Feature 1154 & 73: NPCs react to crime 11 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl 793649c854 ToggleAI: Report current status on toggle 11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
cc9cii b2e3fa70c2 Fix spelling errors in comments. 11 years ago
scrawl 12de0afb03 Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
Marc Zinnschlag b72c1c2c58 encapsulated water level 11 years ago
Marc Zinnschlag 7693f712bc started making CellStore into a proper class; encapsulated mCell member 11 years ago
Marc Zinnschlag 451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 11 years ago
Marc Zinnschlag d6e212a02b Merge branch 'master' into script 11 years ago
Marc Zinnschlag dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 11 years ago
Marc Zinnschlag b3412b7eec another case fix (remote member access again) 11 years ago
Marc Zinnschlag dc433a3c09 fixed case handling problem for local variable access 11 years ago
Marc Zinnschlag 388735046f fixed broken remote member variable access 11 years ago
Emanuel Guevel 8824af30b4 Allow to display message box outside of dialogue window 11 years ago
Emanuel Guevel 70d35da116 Unset selected spell when removed 11 years ago
Marc Zinnschlag 9de2922d22 fixed case problem in remote member variable access 11 years ago
Marc Zinnschlag 3b990795c4 added access to remote access of local variables of global scripts 11 years ago
Marc Zinnschlag 32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 11 years ago
Marc Zinnschlag 914ab1b8ab allow 'x' instead of 'getjournalindex x' 11 years ago
Marc Zinnschlag 4ee43612f6 added new switch: --script-warn 11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
scrawl 23ffb8a4dc Fixes #1143: Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame.
This makes the Mehra Milo script work properly.
11 years ago
mrcheko fe0268062d merge with master 11 years ago
scrawl b1066de81d Revert "Merge remote-tracking branch 'mrcheko/master'"
This reverts commit 4e360136b1, reversing
changes made to 047bbe43b2.

Conflicts:

	apps/openmw/mwmechanics/aicombat.cpp
11 years ago
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
scrawl 2e6e0fd0a0 Fix GetPcCell bug 11 years ago
scrawl ea21d8fec3 Fix CreatureTargetted function 11 years ago
scrawl 851a7d5014 Feature #957: Handle area effects for "on touch" range 11 years ago
scrawl 4e360136b1 Merge remote-tracking branch 'mrcheko/master'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
11 years ago
scrawl 589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 11 years ago
mrcheko 969340d61b fixed StartCombat script 11 years ago
scrawl c04a8afc8b Make sure onPcEquip is also set for Equip script instruction 11 years ago
mrcheko df4df5b094 fixed weapRange for creatures/startcombat script(?) 11 years ago
mrcheko f2ad1c18f2 fix merging problem/some logic fixes 11 years ago
scrawl d544551f61 Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
11 years ago
scrawl dff67bb0b6 StopCombat: mark as non-hostile 11 years ago
scrawl da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 11 years ago
scrawl d0500e8124 Some unneeded includes cleanup 11 years ago
scrawl b8583124e0 Correction for RemoveSoulgem instruction 11 years ago
Marc Zinnschlag 3e58eb34e4 Merge remote-tracking branch 'sergeyshambir/startcombat'
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
11 years ago
scrawl a2ba0dde31 Implemented GoToJail 11 years ago