Marek Kochanowicz
|
37d262b147
|
Splited very long line.
|
2014-02-14 15:12:34 +01:00 |
|
Marc Zinnschlag
|
7b8802588e
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
2014-02-14 14:28:30 +01:00 |
|
Marek Kochanowicz
|
aafde926d3
|
Documentation, corrections.
|
2014-02-14 14:04:36 +01:00 |
|
Marc Zinnschlag
|
e17af4231a
|
added script verifier
|
2014-02-14 13:38:30 +01:00 |
|
Marc Zinnschlag
|
0ff744c2ff
|
fixed CSMWorld::ScriptContext::isJournalId
|
2014-02-14 12:56:05 +01:00 |
|
gus
|
a315d5cc2b
|
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
|
2014-02-14 12:55:14 +01:00 |
|
Marek Kochanowicz
|
13c4c71995
|
reformating
|
2014-02-14 12:54:51 +01:00 |
|
Marek Kochanowicz
|
ae418f2538
|
nicer formatting
|
2014-02-14 12:51:50 +01:00 |
|
Marc Zinnschlag
|
0a8ffbfb1d
|
added missing implementation for CSMWorld::ScriptContext::getMemberType
|
2014-02-14 12:46:54 +01:00 |
|
Marek Kochanowicz
|
ace4252013
|
nicer formatting
|
2014-02-14 12:46:15 +01:00 |
|
Marc Zinnschlag
|
d213c6c36a
|
fixed a constness-issue
|
2014-02-14 12:23:00 +01:00 |
|
Marc Zinnschlag
|
910d62e4b8
|
added missing implementation for CSMWorld::ScriptContext::getGlobalType
|
2014-02-14 11:59:33 +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 |
|
Emanuel Guevel
|
7c981587fc
|
When searching object by id, search in active cells before searching in the player's inventory
|
2014-02-13 22:58:12 +01:00 |
|
Nikolay Kasyanov
|
c2fe0d480a
|
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
Conflicts:
CMakeLists.txt
|
2014-02-14 00:04:16 +04:00 |
|
Marc Zinnschlag
|
053b3dc371
|
Merge branch 'openmw-28'
Conflicts:
CMakeLists.txt
|
2014-02-13 20:57:28 +01:00 |
|
Emanuel Guevel
|
e597328b6b
|
Make enable/disable a no-op for items in containers
|
2014-02-13 20:24:27 +01:00 |
|
Marek Kochanowicz
|
40cc108e54
|
drag and drop works.
|
2014-02-13 20:19:51 +01:00 |
|
Marek Kochanowicz
|
1bcc6d6918
|
using new icon.
|
2014-02-13 19:14:17 +01:00 |
|
Marek Kochanowicz
|
2afe3f3e57
|
Introduced multitype icon.
|
2014-02-13 19:00:35 +01:00 |
|
Nikolay Kasyanov
|
58add97676
|
Merge branch 'master' into osx-ogre-19
Conflicts:
CMakeLists.txt
|
2014-02-13 20:34:06 +04:00 |
|
Marek Kochanowicz
|
6662560cbc
|
new displays for referencable table columns
|
2014-02-13 15:43:19 +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
|
e9238b456d
|
use case-insensitive sorting in columns
|
2014-02-13 15:01:10 +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 |
|
Marek Kochanowicz
|
09d3c7a446
|
Attempt to match types. Does not work at the moment.
|
2014-02-13 13:54:09 +01:00 |
|
Marc Zinnschlag
|
d73097c2e4
|
Merge remote-tracking branch 'scrawl/master'
|
2014-02-13 13:13:37 +01:00 |
|
gus
|
7c6e27e4f9
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
Conflicts:
apps/openmw/mwmechanics/aitravel.cpp
|
2014-02-13 12:59:04 +01:00 |
|
scrawl
|
ea90035eca
|
Enable irc notification for travis
|
2014-02-13 12:35:33 +01:00 |
|
scrawl
|
1ed1b43296
|
Enable release branches in Travis CI
|
2014-02-13 12:30:53 +01:00 |
|
scrawl
|
0fcec24c9b
|
Remove some bogus dependencies for travis build
|
2014-02-13 12:24:15 +01:00 |
|
scrawl
|
4e6507248b
|
Fix travis build
|
2014-02-13 12:19:21 +01:00 |
|
scrawl
|
d4a755d1aa
|
Fix some hardcoded literals
|
2014-02-13 11:15:55 +01:00 |
|
Marek Kochanowicz
|
71b2fc1c70
|
Introduced method to access display type.
|
2014-02-13 10:55:31 +01:00 |
|
Marc Zinnschlag
|
9c52820754
|
Merge remote-tracking branch 'scrawl/master'
|
2014-02-13 10:54:51 +01:00 |
|
Marek Kochanowicz
|
5f3f867a10
|
Implemented convertEnums function
|
2014-02-13 10:21:49 +01:00 |
|
scrawl
|
c6fb0f2d9b
|
Removed terrain component's dependency on ESM
|
2014-02-13 10:13:53 +01:00 |
|
scrawl
|
fb0c5be536
|
Don't suppress git error output
|
2014-02-13 10:13:03 +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
|
b3412b7eec
|
another case fix (remote member access again)
|
2014-02-12 15:22:17 +01:00 |
|