Marc Zinnschlag
|
b0532e0c85
|
store NPC state in saved game files
|
2014-02-16 15:51:45 +01:00 |
|
Marc Zinnschlag
|
9f721fd144
|
store list of known topics in saved game files
|
2014-02-16 12:54:27 +01:00 |
|
Marc Zinnschlag
|
6ac64bbe15
|
Merge branch 'script'
Conflicts:
readme.txt
|
2014-02-16 12:12:56 +01:00 |
|
Nikolay Kasyanov
|
8f99da084b
|
OS X: plugins are now in Frameworks dir, not in Plugins
|
2014-02-16 14:13:12 +04: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 |
|
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 |
|
Nikolay Kasyanov
|
58add97676
|
Merge branch 'master' into osx-ogre-19
Conflicts:
CMakeLists.txt
|
2014-02-13 20:34:06 +04: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 |
|
Marc Zinnschlag
|
e0537a3253
|
made object state polymorphic
|
2014-01-28 13:53:24 +01:00 |
|
Marc Zinnschlag
|
a623f03850
|
reduced object state for objects in containers
|
2014-01-28 13:49:59 +01:00 |
|
mrcheko
|
e50e94af0b
|
remove CreatureStats::mAttackType, set/getAttackType()
|
2014-01-27 23:05:17 +02:00 |
|
Marc Zinnschlag
|
29c3a288e3
|
load and save of reference in cells (without CustomData state)
|
2014-01-27 13:27:42 +01:00 |
|
scrawl
|
e0de76a6f7
|
Save/load global map
|
2014-01-25 19:06:14 +01:00 |
|
scrawl
|
9c0ed69550
|
Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded.
|
2014-01-25 15:10:25 +01:00 |
|
scrawl
|
a1ac99463f
|
Fix an uninitialized value
|
2014-01-24 22:52:04 +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
|
295aed3533
|
Implement savegame screenshots
|
2014-01-24 17:49:16 +01:00 |
|
scrawl
|
786ed6ca5b
|
Include some required Ogre headers explicitely
|
2014-01-24 15:02:34 +01:00 |
|
pvdk
|
19bef4fce8
|
Distinguish between release and development builds
|
2014-01-23 13:18:05 +01:00 |
|
Marc Zinnschlag
|
419e3a7d30
|
write references in cells to saved game file
|
2014-01-23 12:51:42 +01:00 |
|
Marc Zinnschlag
|
dd7d80ffbc
|
removed a redundant field from object state
|
2014-01-23 12:51:25 +01:00 |
|
Marc Zinnschlag
|
22cb4784b5
|
store cell state in saved game files (no references yet)
|
2014-01-23 11:29:40 +01:00 |
|
pvdk
|
d92ded3bcd
|
Forgot adding the version header CMake file
|
2014-01-22 19:30:41 +01:00 |
|
pvdk
|
c95b8bcb39
|
Moved the generated version header stuff into components
|
2014-01-22 17:33:55 +01:00 |
|
scrawl
|
f89c400305
|
Don't complain about greetings with no sound
|
2014-01-22 00:02:43 +01:00 |
|
scrawl
|
bd34b61f2a
|
Set all keyframe-controlled bones as manually controlled
|
2014-01-20 13:37:34 +01:00 |
|
scrawl
|
4c0045b418
|
Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time)
|
2014-01-18 21:11:12 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
Marc Zinnschlag
|
ce00639d31
|
added missing birthsign field to player state record
|
2014-01-17 10:51:52 +01:00 |
|
Marc Zinnschlag
|
d8d4f1a15e
|
some fixes to record structs
|
2014-01-16 12:02:45 +01:00 |
|
scrawl
|
d544551f61
|
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
|
2014-01-15 15:50:45 +01:00 |
|
scrawl
|
0a8c61a7fe
|
Bug #1107: Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
79a6ffd216
|
Closes #1107: Do not create box shapes unless the box collision flag is enabled
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
3ea1407ed3
|
Closes #1109: Don't reset water level when loading a plugin that does include water level records
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
264736c139
|
Remove hopelessly outdated nifogre tests
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
d0500e8124
|
Some unneeded includes cleanup
|
2014-01-15 14:53:28 +01:00 |
|
Marc Zinnschlag
|
bf1a37dc38
|
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
|
2014-01-15 14:29:54 +01:00 |
|
Marc Zinnschlag
|
8c5f313546
|
added savedgame-specifc record structs for objects state
|
2014-01-14 15:29:55 +01:00 |
|
scrawl
|
52b9ebff9d
|
Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
|
2014-01-14 07:42:03 +01:00 |
|
scrawl
|
26d972280f
|
Fix a few text defines
|
2014-01-14 06:03:34 +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 |
|
Marc Zinnschlag
|
e453468eff
|
moved CellRef loading code to the CellRef class
|
2014-01-12 19:23:08 +01:00 |
|
Marc Zinnschlag
|
9025210965
|
Merge branch 'refnum' into savedgame
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
|
2014-01-12 16:58:06 +01:00 |
|
scrawl
|
1d19d36bd6
|
Remove unused magic effect flags and update esmtool output
|
2014-01-12 01:25:00 +01:00 |
|
scrawl
|
ce6aab89cf
|
Fix a possible permutation issue
|
2014-01-11 04:58:30 +01:00 |
|
scrawl
|
c64dc2c831
|
Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.
|
2014-01-11 00:51:03 +01:00 |
|
scrawl
|
bfdca3b738
|
Fix needTangents not being set for cached/shared materials
|
2014-01-09 23:13:31 +01:00 |
|
scrawl
|
aa855e9524
|
Include some required Ogre headers explicitely
|
2014-01-09 20:56:24 +01:00 |
|
scrawl
|
6f9113fe88
|
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
|
2014-01-09 01:49:58 +01:00 |
|