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

92 commits

Author SHA1 Message Date
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