1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:19:55 +00:00
Commit graph

179 commits

Author SHA1 Message Date
dteviot
7aa0f887c0 Minor changes to ESM::RefNum
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
5f00a3d5c3 Reset lastHitObject when it is retrieved rather than every frame
This seems to be how vanilla MW does it.
2014-12-11 22:00:31 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
scrawl
f49fde3d5d Add support for undeleting references (Fixes #2193)
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
2014-12-06 21:08:18 +01:00
MiroslavR
6e1a11f322 Queue screen fade operations invoked by scripts 2014-12-01 19:13:04 +01:00
scrawl
4fd3a994e9 Add model and script information to BetaComment 2014-11-28 16:27:18 +01:00
MiroslavR
925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 2014-10-24 19:04:47 +02:00
scrawl
8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 2014-10-12 17:18:27 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
scrawl
603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 2014-09-26 14:16:46 +02:00
scrawl
f3d4b63aaf Fix AI moving load doors and throw an exception when trying to do this (Fixes #1907) 2014-09-11 05:53:56 +02:00
scrawl
457b96a8af Reset bounty and crime immediately when going to jail (Fixes #1892) 2014-09-09 00:00:55 +02:00
scrawl
d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 2014-08-17 03:58:04 +02:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
scrawl
543bb22e8f Implement collision script instructions (Fixes #1111) 2014-07-29 19:01:40 +02:00
scrawl
ca45a63cf7 Close doors instantly when using Lock instruction 2014-07-22 17:55:54 +02:00
scrawl
df62c06acf Print exterior grid position in betaComment 2014-07-01 21:41:23 +02:00
Marc Zinnschlag
3100206b28 replaced an assert with an exception 2014-06-27 08:37:41 +02:00
scrawl
77388fe2ce Implement BetaComment instruction (dumps reference info) 2014-06-15 16:11:16 +02:00
scrawl
797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 2014-06-13 02:26:52 +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
039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +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
028e00c98f Add missing status report for some toggle commands 2014-05-16 09:21:28 +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
Thomas
cac8e52154 Seperated locked and lock level, to allow for relocking doors to previous lock level.
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Marc Zinnschlag
a91b386381 Merge remote-tracking branch 'jeffreyhaines/master' 2014-04-20 13:34:58 +02:00
Jeffrey Haines
6733a1541e Fixes to Crime System
Victimless crimes were removed because victims may not exist in the
case of stealing items.

Is class now uses case insensitive comparison.

Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Jeffrey Haines
b1abef7a38 Cleaned up code 2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be Crime is now checked every frame call 2014-04-03 00:50:09 -04:00
Jeffrey Haines
6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 2014-04-02 12:23:38 -04:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 2014-02-13 09:52:44 +01:00
Marc Zinnschlag
32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 2014-02-02 15:35:18 +01:00
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
2014-02-01 18:16:32 +01:00
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
851a7d5014 Feature #957: Handle area effects for "on touch" range 2014-01-21 12:30:15 +01:00
scrawl
b8583124e0 Correction for RemoveSoulgem instruction 2014-01-14 06:13:30 +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
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +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
2a7d610f87 Implement GetSpellReadied instruction 2014-01-03 22:55:17 +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
Marc Zinnschlag
b38bfe1f21 removed a redundant function for listing global variables 2013-12-10 15:22:38 +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
71436b1160 changed interface for global variable access 2013-11-28 09:10:38 +01:00
scrawl
bab657fe2b Add a utility function to add items to a ContainerStore by RefID 2013-11-21 17:14:30 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef Move some deleteObject logic from OpDelete to MWWorld::deleteObject 2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297 Call ContainerStore::remove() to remove items from inventory
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
mckibbenta
eef9df504a fiddlings 2013-08-29 20:25:36 -04:00
mckibbenta
60fa69139e minor changes 2013-08-25 19:20:14 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
vorenon
3bf3bd4b8c Silenced some warnings 2013-08-21 13:53:49 +02:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
c1dfa980bf Combine ShowVarsImplicit and ShowVarsExplicit
Also removes an unnecessary else statement
2013-08-13 17:31:15 -07:00
Chris Robinson
30973352e8 Implement ShowVars (SV) console function 2013-08-13 04:54:41 -07:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Emanuel Guevel
48d2554ac3 Auto-equip when items are added to the inventory
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
2013-08-07 15:17:55 +02:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
Chris Robinson
1174b85ac8 Implement Disable/EnableTeleporting script functions 2013-07-27 00:14:55 -07:00
Chris Robinson
3298eb1b37 Implement HitOnMe script function 2013-07-26 10:50:23 -07:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
scrawl
7d61459ccd Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway. 2013-04-28 11:13:21 +02:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
scrawl
1f3df4df0f Perform a sanity check on count arguments 2013-04-06 19:25:29 +02:00
Tom Mason
8486a51535 fixed drop amounts thanks to zinnschlag 2013-01-09 22:55:28 +00:00
Tom Mason
3517635cfd added Drop and DropSoulGem functions 2013-01-09 21:16:45 +00:00
Marc Zinnschlag
c6ff58d5b5 Merge remote-tracking branch 'scrawl/videoplayback'
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2013-01-08 11:17:19 +01:00
Tom Mason
4c5ed43cc9 added removesoulgem, and fixed addsoulgem 2013-01-07 21:08:04 +00:00
Tom Mason
c2901fe6cc added addsoulgem scripting function 2013-01-07 18:16:50 +00:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
644dacf603 suggestion by Zini for SetDelete 2012-11-28 01:30:18 +01:00
scrawl
d6dd212ce8 GetWerewolfKills, ModScale, SetDelete, GetSquareRoot 2012-11-27 06:54:13 +01:00
scrawl
e68dc19256 GetCurrentTime, HasSoulGem 2012-11-25 01:54:37 +01:00
scrawl
0db48b29c7 GetSpellEffects, GetRace 2012-11-25 01:26:29 +01:00
scrawl
70aa7459f5 GetWeaponDrawn 2012-11-24 03:04:26 +01:00
scrawl
600ed5f38a GetAttacked 2012-11-24 02:48:53 +01:00
scrawl
50baf6dac7 moved to controlextensions 2012-11-24 02:45:25 +01:00
scrawl
d7811624d5 GetEffect 2012-11-24 02:15:55 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
scrawl
10329c780d GetLocked 2012-11-23 21:31:10 +01:00