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

174 commits

Author SHA1 Message Date
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
Thomas
085fb2c5a2 Simplified documentation a bit 2014-05-13 14:13:05 -04:00
Thomas
a61d804de6 now that I've found the documentation, fixed some stuff for extensions 2014-05-13 13:53:06 -04:00
Thomas
8f90dd43ec Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier 2014-04-29 12:52:08 -04:00
Thomas
c2127845af Added onKnockdown command 2014-04-27 20:54:22 -04:00
scrawl
f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
452b522bc3 Fix typos 2014-03-22 19:01:41 +01:00
scrawl
c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 2014-03-16 23:49:06 +01:00
Marc Zinnschlag
0d84adb2c6 allow x->(y) instead of (x->y) 2014-02-15 12:50:40 +01:00
Marc Zinnschlag
fd665a1994 ignore conditions after an else (only works if condition is put in parentheses) 2014-02-15 12:45:50 +01:00
Marc Zinnschlag
d213c6c36a fixed a constness-issue 2014-02-14 12:23:00 +01:00
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 2014-02-14 11:15:16 +01:00
Marc Zinnschlag
e76ef92669 also allow the use of keywords as remote local variables in set statements 2014-02-14 09:06:06 +01:00
Marc Zinnschlag
2086ebe410 fix for inappropriate disable (2nd attempt) 2014-02-14 08:48:26 +01:00
Marc Zinnschlag
b01c6dad37 Revert "allow disable as an alias for getDisabled (in most cases)"
This reverts commit f7ff4fbd51.
2014-02-14 08:29:18 +01:00
Marc Zinnschlag
f7ff4fbd51 allow disable as an alias for getDisabled (in most cases) 2014-02-13 15:31:07 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
Marc Zinnschlag
309573a3ac allow the use of the keyword end as a variable name in an expression 2014-02-13 14:15:48 +01:00
Marc Zinnschlag
ac8290c4d3 fixed problem with line endings in case of a local variable redeclaration 2014-02-13 09:59:22 +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
87b51e47a9 fixed another case issue in remote member access 2014-02-13 09:40:07 +01:00
Marc Zinnschlag
c03bd8ebb6 allow [] as aliases for () 2014-02-13 08:59:33 +01:00
Marc Zinnschlag
0313876d88 allow leaving out if in a top-level if-statement 2014-02-13 08:49:40 +01:00
Marc Zinnschlag
2eeb0eb4f3 allow lines to continue with other instructions after an legit else 2014-02-13 08:38:26 +01:00
Marc Zinnschlag
749136bf33 ignore attempts to set non-existing variables 2014-02-12 20:23:47 +01:00
Marc Zinnschlag
a85d3c7dcb ignore unused explicit references for functions 2014-02-12 13:53:59 +01:00
Marc Zinnschlag
6e2e4d1adf ignore stray begin 2014-02-12 13:45:01 +01:00
Marc Zinnschlag
93d4743012 interpret instruction keywords as names within expressions 2014-02-12 09:56:25 +01:00
Marc Zinnschlag
c0a6acfe6c allow the use of keywords as variable names in more places 2014-02-12 09:23:23 +01:00
Marc Zinnschlag
b1b0877122 allow additional numeric argument for AiFollow and ignore it 2014-02-12 09:14:32 +01:00
Marc Zinnschlag
bfb0e62c4a ignore additional string argument after enable/disable 2014-02-12 09:10:05 +01:00
Marc Zinnschlag
61626e90da allow additional string argument for stopcombat and addspell (ignored) 2014-02-12 08:53:37 +01:00
Marc Zinnschlag
6a5d88b640 ignore stray else and endif in scripts 2014-02-12 08:42:42 +01:00
Marc Zinnschlag
697bda6371 allow (and discard) explicit reference on instructions that do not accept explicit references 2014-02-11 14:55:31 +01:00
Marc Zinnschlag
f26aa4f645 fixed while loop implementation 2014-02-11 13:31:04 +01:00
Emanuel Guevel
8c8f4cd420 Fix typo 2014-02-10 22:53:16 +01:00
Marc Zinnschlag
5c0071f320 fixed spelling of an error message 2014-02-10 14:59:20 +01:00
Marc Zinnschlag
3b990795c4 added access to remote access of local variables of global scripts 2014-02-10 14:45:55 +01:00
Marc Zinnschlag
3147aebf75 factored out declaration parser 2014-02-10 13:01:52 +01:00
Marc Zinnschlag
2b2ac6f62b allow declaration of local variables with keywords as names 2014-02-02 15:43:48 +01:00
Marc Zinnschlag
32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 2014-02-02 15:35:18 +01:00
Marc Zinnschlag
914ab1b8ab allow 'x' instead of 'getjournalindex x' 2014-02-02 15:08:27 +01:00
Marc Zinnschlag
cd9b137129 allow elseif without matching if (grrrrr) 2014-02-02 14:24:58 +01:00
Marc Zinnschlag
8bcdf54570 added warning mode to script compiler error handler 2014-02-02 13:55:03 +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
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
6f9113fe88 Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions 2014-01-09 01:49:58 +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