Commit graph

1527 commits

Author SHA1 Message Date
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
d73097c2e4 Merge remote-tracking branch 'scrawl/master' 2014-02-13 13:13:37 +01:00
scrawl
d4a755d1aa Fix some hardcoded literals 2014-02-13 11:15:55 +01:00
Marc Zinnschlag
9c52820754 Merge remote-tracking branch 'scrawl/master' 2014-02-13 10:54:51 +01:00
scrawl
c6fb0f2d9b Removed terrain component's dependency on ESM 2014-02-13 10:13:53 +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
scrawl
0cc1cd8f7e Fix message box formatting bug 2014-02-05 05:18:11 +01:00
scrawl
2c0d46525b Fast-forward particle systems to make cell loads less obvious. 2014-02-05 05:18:09 +01:00
scrawl
cf3812188f Fix bounding box assertions due to negative particle life time
Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)
2014-02-05 05:18:09 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +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
f89b3cac02 Feature #764: Store the actor that gave the dialog response 2014-02-01 18:42:01 +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
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
scrawl
bbd15b185d Skip inactive controllers. Fixes those bloody bone boots again. 2014-01-31 05:59:58 +01:00
scrawl
5b300c1052 Handle controllers for the root node. Fixes #1147 (incorrect dwemer crossbow rotation) 2014-01-31 05:06:35 +01:00
scrawl
305a471c5a Fix VisController in ascended sleeper's death animation 2014-01-31 05:06:08 +01:00
Marc Zinnschlag
900532a6ca store additional state of lights in saved game files 2014-01-30 12:37:33 +01:00