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
|
2014-01-24 18:28:35 +01:00 |
|
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.
|
2014-01-15 15:50:45 +01:00 |
|
scrawl
|
dff67bb0b6
|
StopCombat: mark as non-hostile
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
da3295d69c
|
Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations.
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
d0500e8124
|
Some unneeded includes cleanup
|
2014-01-15 14:53:28 +01:00 |
|
scrawl
|
b8583124e0
|
Correction for RemoveSoulgem instruction
|
2014-01-14 06:13:30 +01:00 |
|
Marc Zinnschlag
|
3e58eb34e4
|
Merge remote-tracking branch 'sergeyshambir/startcombat'
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2014-01-13 10:17:10 +01:00 |
|
scrawl
|
a2ba0dde31
|
Implemented GoToJail
|
2014-01-11 06:47:58 +01:00 |
|
scrawl
|
bf6d302fba
|
Confiscate stolen items when caught
|
2014-01-11 03:29:41 +01:00 |
|
scrawl
|
768d9f7237
|
Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)
|
2014-01-09 02:21:03 +01:00 |
|
scrawl
|
6f9113fe88
|
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
|
2014-01-09 01:49:58 +01:00 |
|
scrawl
|
372cd437d1
|
Add a utility function for counting items in a container
|
2014-01-08 23:00:29 +01:00 |
|
scrawl
|
c55f9bd0aa
|
GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.
|
2014-01-08 20:19:47 +01:00 |
|
scrawl
|
bf02b77c1d
|
Closes #1090: Don't throw an exception if a cell has no region in GetPCCell
|
2014-01-08 19:57:13 +01:00 |
|
scrawl
|
154fae9f25
|
Don't suppress exceptions thrown while running scripts
|
2014-01-08 19:52:57 +01:00 |
|
scrawl
|
19d63f392f
|
Clean up the NpcStats expelled interface. Show message box when expelled.
|
2014-01-08 18:59:00 +01:00 |
|
scrawl
|
098f9712f1
|
Add getPlayerPtr() utility method. Reduces dependencies a lot.
|
2014-01-08 18:39:44 +01:00 |
|
scrawl
|
7b33f6f2ac
|
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
|
2014-01-08 17:19:43 +01:00 |
|
Sergey Shambir
|
d5a0ff17fd
|
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
|
2014-01-07 05:06:20 +04:00 |
|
Sergey Shambir
|
5c7e39a92f
|
Implemented script commands StartCombat, StopCombat, GetTarget.
Also renamed one field of AIWander class because it's not longer
unknown.
|
2014-01-07 04:43:06 +04:00 |
|
scrawl
|
29c823b9d4
|
Implement awareness check function. Use this for combat AI and GetDetected instruction.
|
2014-01-07 00:51:09 +01:00 |
|
scrawl
|
62774fcc4a
|
Merge branch 'master' into HEAD
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
|
2014-01-06 00:23:17 +01:00 |
|
scrawl
|
b3764c504a
|
Implement GetPcJumping instruction
|
2014-01-05 19:08:12 +01:00 |
|
scrawl
|
14b70a3ce6
|
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
|
2014-01-05 01:34:35 +01:00 |
|
scrawl
|
2a7d610f87
|
Implement GetSpellReadied instruction
|
2014-01-03 22:55:17 +01:00 |
|
scrawl
|
55c5d7cee4
|
Implement Resurrect instruction
|
2014-01-03 15:54:23 +01:00 |
|
scrawl
|
b4230f716e
|
Implement RemoveEffects instruction
|
2014-01-03 05:19:10 +01:00 |
|
scrawl
|
7d8ca91286
|
Implement RemoveSpellEffects instruction
|
2014-01-03 05:18:44 +01:00 |
|
scrawl
|
366801f3d5
|
Implement explodeSpell instruction (like Cast, with caster = target)
|
2014-01-03 04:44:50 +01:00 |
|
scrawl
|
93e1a2df73
|
Implement Cast script instruction (shrines work now)
|
2014-01-03 04:09:52 +01:00 |
|
scrawl
|
b42240be6d
|
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
|
2014-01-03 03:48:43 +01:00 |
|
scrawl
|
32ff3b530c
|
Change all instances of skill/attribute values to use an appropriate typedef.
|
2014-01-03 01:59:15 +01:00 |
|
Marc Zinnschlag
|
a6e6411686
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-02 12:12:52 +01:00 |
|
scrawl
|
c558e12212
|
Don't try to move objects that are not in a cell
|
2014-01-02 03:06:48 +01:00 |
|
Marc Zinnschlag
|
e1355be47c
|
Merge remote-tracking branch 'lgro/valgrind_warnings'
|
2014-01-01 19:41:52 +01:00 |
|
Marc Zinnschlag
|
c3482b6f24
|
Merge remote-tracking branch 'scrawl/master'
Conflicts:
apps/openmw/mwmechanics/spellcasting.cpp
|
2014-01-01 15:05:42 +01:00 |
|
Marc Zinnschlag
|
5fa9aa5d1e
|
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/worldimp.cpp
|
2014-01-01 14:57:14 +01:00 |
|
Lukasz Gromanowski
|
e9844e1b37
|
Fixes #417: Apply weather instantly when teleporting
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-31 20:40:23 +01:00 |
|
scrawl
|
b02b966c44
|
Closes #994: Don't cap skills to 100 when set via console (except for modX variants)
|
2013-12-31 19:11:16 +01:00 |
|
Lukasz Gromanowski
|
1ce4663065
|
Updated compiler opcodes for COE, and setHello.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-31 18:13:38 +01:00 |
|
scrawl
|
2a8ab932ef
|
Bug #951: Only recalculate derived stats when attributes change
|
2013-12-28 17:19:35 +01:00 |
|
Marc Zinnschlag
|
3590fa40bd
|
store global script state in saved game files
|
2013-12-15 16:16:50 +01:00 |
|
Marc Zinnschlag
|
2a35c7d33a
|
fixed running global scripts a second time after they have been stopped
|
2013-12-12 13:16:32 +01:00 |
|
Marc Zinnschlag
|
74793c1c2f
|
globals script cleanup; fixed potential case folding bug
|
2013-12-12 13:15:38 +01:00 |
|
Marc Zinnschlag
|
b38bfe1f21
|
removed a redundant function for listing global variables
|
2013-12-10 15:22:38 +01:00 |
|
Lukasz Gromanowski
|
8d63f8eea2
|
Fixes #998: Setting the max health should also set the current health
Added setting current value of dynamic stat in OpSetDynamic class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-07 21:00:46 +01:00 |
|
Marc Zinnschlag
|
030c733e2d
|
Merge branch 'master' into savedgame
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
|
2013-12-07 12:27:06 +01:00 |
|
Marc Zinnschlag
|
e818d43bc3
|
removed an outdated typedef and some dead code
|
2013-12-05 13:21:26 +01:00 |
|
scrawl
|
bb4bd999ba
|
PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.
|
2013-11-30 08:29:22 +01:00 |
|
Marc Zinnschlag
|
b0eb5938bf
|
removed some redundant code
|
2013-11-28 09:13:54 +01:00 |
|