Marc Zinnschlag
|
73df51695c
|
Merge remote branch 'gus/Factions2'
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/statsextensions.cpp
|
2012-04-13 14:49:37 +02:00 |
|
Marc Zinnschlag
|
e16daeed23
|
added GetSpell script function
|
2012-04-13 13:17:57 +02:00 |
|
Marc Zinnschlag
|
b099e1baf5
|
added addspell and removespell script instructions
|
2012-04-13 11:12:53 +02:00 |
|
gugus
|
7edc5c733c
|
corrected a bug about rank.
|
2012-04-12 17:29:05 +02:00 |
|
gugus
|
0553227ee1
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/player.cpp
apps/openmw/mwworld/player.hpp
|
2012-04-09 14:43:35 +02:00 |
|
gugus
|
dd9a88cee2
|
clean up
|
2012-04-09 14:32:07 +02:00 |
|
gugus
|
6ca212b9e9
|
script instruction: PCJoinFaction
|
2012-04-09 14:30:42 +02:00 |
|
gugus
|
aa8418634f
|
add PCLowerRank script instruction
|
2012-04-09 14:26:53 +02:00 |
|
gugus
|
e5b1e27fa6
|
pcRaiseRank works. Player can now join factions.
|
2012-04-09 13:24:19 +02:00 |
|
gugus
|
aaa5368fe9
|
added script instruction pcraiserank. Does not work yet.
|
2012-04-04 22:14:38 +02:00 |
|
gugus
|
07ea63c10c
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-04-03 17:29:00 +02:00 |
|
scrawl
|
e0631dd9be
|
Merge branch 'master' into minimap
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-04-02 14:38:02 +02:00 |
|
Marc Zinnschlag
|
6022d3ab13
|
Merge remote branch 'corristo/pgrd-rendering'
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
|
2012-04-02 12:04:47 +02:00 |
|
scrawl
|
0a5757791c
|
Merge branch 'master' into minimap
|
2012-04-01 20:17:07 +02:00 |
|
Chris Robinson
|
977e7ac9a3
|
Remove the Play_Single flag. It's not correct.
|
2012-03-31 07:41:26 -07:00 |
|
Chris Robinson
|
ae308b9b5f
|
Use a set of flags instead of separate booleans
|
2012-03-31 07:31:55 -07:00 |
|
Nikolay Kasyanov
|
057c2f2e2a
|
Merge branch 'master' into pgrd-rendering
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-03-31 13:42:13 +04:00 |
|
scrawl
|
521b9eec6c
|
Merge branch 'master' into minimap
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/world.cpp
|
2012-03-30 15:31:07 +02:00 |
|
scrawl
|
d5c49fa036
|
getWaterLevel use CellStore ; attempted fix for morrowind without tribunal
|
2012-03-30 10:12:28 +02:00 |
|
Nikolay Kasyanov
|
b21a6291f7
|
Merge branch 'master' into pgrd-rendering
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
|
2012-03-30 02:50:30 +04:00 |
|
scrawl
|
8d224f009f
|
toggleFogOfWar script command
|
2012-03-29 19:45:19 +02:00 |
|
scrawl
|
79c2a2e465
|
implemented toggleWater (twa); formatting again
|
2012-03-29 18:33:08 +02:00 |
|
scrawl
|
2f096e131d
|
throw exception if water level is attempted to be modified in exterior
|
2012-03-29 16:23:02 +02:00 |
|
scrawl
|
5a19d4ec45
|
implement water script functions and save water height in CellStore
|
2012-03-29 15:50:15 +02:00 |
|
Nikolay Kasyanov
|
c3357c4396
|
Merge branch 'master' into pgrd-rendering
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
|
2012-03-29 13:27:13 +04:00 |
|
gugus
|
0c61f0d294
|
test stuff
|
2012-03-28 11:45:46 +02:00 |
|
Marc Zinnschlag
|
187b8e58d6
|
fixed handling of optional instruction/function arguments; removed choice workaround
|
2012-03-17 19:32:44 +01:00 |
|
gugus
|
042d87f77f
|
a lot of clean up
|
2012-03-16 17:53:34 +01:00 |
|
gugus
|
07d8d654cd
|
one step toward function filters and end choices.
|
2012-03-14 18:47:29 +01:00 |
|
Nikolay Kasyanov
|
11f957a64d
|
Feature #37 (In Progress) Render Path Grid
cubes for path grid points
strange crash when trying to get path grids from Debugging
|
2012-03-10 20:03:00 +04:00 |
|
Nikolay Kasyanov
|
6357adffcf
|
Fixed typo
|
2012-03-10 18:13:44 +04:00 |
|
Nikolay Kasyanov
|
5328853445
|
Feature #37 (In Progress) Render Path Grid
added "togglepathgrid" script command
|
2012-03-10 18:13:44 +04:00 |
|
gugus
|
82c6b0f92a
|
choice function. Do not work.
|
2012-03-07 18:52:27 +01:00 |
|
Marc Zinnschlag
|
69f0ec99f1
|
implemented dialogue scripts
|
2012-03-05 16:56:14 +01:00 |
|
Marc Zinnschlag
|
4bdfbb6d4f
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-03-05 11:34:06 +01:00 |
|
Marc Zinnschlag
|
739870489a
|
Merge remote branch 'scrawl/weather' into weather
Conflicts:
apps/openmw/CMakeLists.txt
|
2012-02-27 15:02:03 +01:00 |
|
scrawl
|
528cff5a59
|
implemented ChangeWeather script function
|
2012-02-26 11:51:02 +01:00 |
|
scrawl
|
d77d5080bd
|
implemented GetCurrentWeather script function
|
2012-02-25 21:34:38 +01:00 |
|
Marc Zinnschlag
|
26bd2be1e8
|
Merge branch 'equipment' into next
|
2012-02-23 13:02:20 +01:00 |
|
Marc Zinnschlag
|
1d551030d1
|
container related script instruction are using the new container interface now
|
2012-02-23 12:34:51 +01:00 |
|
scrawl
|
457d9fd9f8
|
updated vmformat.txt
|
2012-02-18 18:30:01 +01:00 |
|
scrawl
|
f81b615976
|
implemented script functions FadeIn, FadeOut, FadeTo
|
2012-02-18 18:25:28 +01:00 |
|
scrawl
|
899aa5b870
|
fix last commit, also reacts to ToggleWireframe and not only twf
|
2012-02-18 16:36:54 +01:00 |
|
scrawl
|
40e23fe26f
|
added twf console command
|
2012-02-18 16:06:03 +01:00 |
|
Marc Zinnschlag
|
d9945a976d
|
Merge remote branch 'gus/DialogueSystem' into dialogue
|
2012-02-12 13:47:04 +01:00 |
|
gugus
|
f1dc360720
|
added the script instruction addTopic
|
2012-02-10 22:02:24 +01:00 |
|
Marc Zinnschlag
|
00ac2deefb
|
Merge remote branch 'pvdk/cmakeogre' into cmakeogre
|
2012-02-10 14:36:34 +01:00 |
|
Marc Zinnschlag
|
c4e028effe
|
fixing a faulty include
|
2012-02-06 10:48:58 +01:00 |
|
Marc Zinnschlag
|
0b0254d30e
|
spelling fix
|
2012-02-06 10:48:14 +01:00 |
|
Marc Zinnschlag
|
c6761e3470
|
replaced NPC stats in ref data with new custom data implementation
|
2012-01-25 16:56:49 +01:00 |
|
Marc Zinnschlag
|
0c2de2c00c
|
Merge branch 'animation2'
|
2012-01-17 15:37:51 +01:00 |
|
Marc Zinnschlag
|
51d9c2c780
|
fixed argument type in ai related script instructions
|
2011-11-21 14:16:20 +01:00 |
|
Marc Zinnschlag
|
0f4adc39b3
|
added animation-related script instructions
|
2011-11-21 14:08:44 +01:00 |
|
Jacob Essex
|
9aac625000
|
Changes to move the mutable ESM::Position data to RefData
|
2011-11-08 00:08:00 +00:00 |
|
Marc Zinnschlag
|
39af941d6f
|
Issue #19: Moved code from Engine to WindowManager and ScriptManager
|
2011-10-09 12:05:13 +02:00 |
|
Marc Zinnschlag
|
aded4608c0
|
added GetButtonPressed function
|
2011-07-12 21:26:58 +02:00 |
|
Marc Zinnschlag
|
80691250ec
|
don't create a new virtual machine for each script and frame
|
2011-05-18 16:01:19 +02:00 |
|
Marc Zinnschlag
|
125319c441
|
splitting off console output from messageBox channel
|
2011-04-26 21:48:13 +02:00 |
|
Marc Zinnschlag
|
f52e6bd5ef
|
made toggle-type script instructions more verbose
|
2011-04-26 21:38:21 +02:00 |
|
Marc Zinnschlag
|
53e0e38862
|
added missing TCL instruction
|
2011-04-06 09:49:00 +02:00 |
|
Marc Zinnschlag
|
f321e549a4
|
added instruction GetPCCell
|
2011-04-04 15:10:37 +02:00 |
|
Marc Zinnschlag
|
e4a0702bb4
|
added journal-related script instructions
|
2011-04-04 14:49:26 +02:00 |
|
Marc Zinnschlag
|
72a84356e2
|
added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)
|
2011-03-16 09:09:45 +01:00 |
|
Marc Zinnschlag
|
8ebdd77772
|
Merge branch 'collision' into script
|
2011-03-16 08:48:13 +01:00 |
|
Marc Zinnschlag
|
eb93ef68f1
|
fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class
|
2011-03-13 22:33:55 +01:00 |
|
Marc Zinnschlag
|
9a3158675a
|
reworked cell changing mechanism
|
2011-02-10 10:38:45 +01:00 |
|
Marc Zinnschlag
|
18b8cdce29
|
added GetInterior script function
|
2011-01-17 10:18:12 +01:00 |
|
Marc Zinnschlag
|
46a8ccc2ff
|
changed collision mode instruction from enable/disable to toggle
|
2011-01-09 21:07:27 +01:00 |
|
Marc Zinnschlag
|
bb34f6e7fc
|
added Enable/DisableCollision instructions
|
2011-01-09 20:44:17 +01:00 |
|
Marc Zinnschlag
|
2ffe1206a6
|
merged opcode classes that came in explicit and implicit variants
|
2010-12-31 19:09:25 +01:00 |
|
Marc Zinnschlag
|
38ab9f7a3d
|
Merge branch 'newchar'
Conflicts:
components/esm_store/store.hpp
|
2010-10-22 10:27:32 +02:00 |
|
Marc Zinnschlag
|
a8c974d2e7
|
added set/get/mod instructions for skills
|
2010-10-20 11:31:42 +02:00 |
|
Marc Zinnschlag
|
1c4db82a0e
|
added --script-all switch
|
2010-10-06 14:52:53 +02:00 |
|
Marc Zinnschlag
|
9a0618fbb8
|
fixed a comment
|
2010-09-25 20:23:38 +02:00 |
|
Jan Borsodi
|
1907aeb6c6
|
The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager.
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
|
2010-09-15 14:48:19 +02:00 |
|
Marc Zinnschlag
|
db2b238328
|
adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border)
|
2010-09-11 12:21:55 +02:00 |
|
Marc Zinnschlag
|
5f84b680af
|
implemented exterior coc
|
2010-09-11 11:55:28 +02:00 |
|
Marc Zinnschlag
|
7ea6a75a26
|
another merge fix
|
2010-09-10 13:01:37 +02:00 |
|
Marc Zinnschlag
|
1dc805d0d4
|
Merge branch 'master' into exterior
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2010-09-08 15:38:19 +02:00 |
|
Marc Zinnschlag
|
6c4c90ef2d
|
Merge branch 'script'
|
2010-09-01 21:04:16 +02:00 |
|
Marc Zinnschlag
|
147dd57162
|
added Lock and Unlock instructions
|
2010-08-30 12:30:34 +02:00 |
|
Marc Zinnschlag
|
a899a290c0
|
modified code to avoid a warning on MSVC
|
2010-08-29 23:40:59 +02:00 |
|
Marc Zinnschlag
|
9e8251e6b4
|
finally got rid of the nasty coordinates bug
|
2010-08-22 21:30:48 +02:00 |
|
Marc Zinnschlag
|
f3bf46f1a9
|
fixed AiTravel and changed GetAiPackageDone to return 0 (returning one would interfere with character creation testing at this point)
|
2010-08-22 15:16:11 +02:00 |
|
Marc Zinnschlag
|
68a788b2c8
|
added instructions for enabling/disabling player controls (they don't do anything yet)
|
2010-08-22 15:11:40 +02:00 |
|
Marc Zinnschlag
|
14cf007a3f
|
added first batch of AI-related instructions and functions (they don't do anything at this point)
|
2010-08-22 14:49:25 +02:00 |
|
Marc Zinnschlag
|
b3cc3073a3
|
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
|
2010-08-22 13:15:56 +02:00 |
|
Marc Zinnschlag
|
17135a6403
|
routed message box output through window manager
|
2010-08-22 11:22:10 +02:00 |
|
Marc Zinnschlag
|
c6f4bcbf68
|
another coordinate system fix; still not working properly
|
2010-08-21 09:48:56 +02:00 |
|
Marc Zinnschlag
|
0111631ee9
|
very early implementation of exterior rendering
|
2010-08-20 13:33:03 +02:00 |
|
Nicolay Korslund
|
7516e4ca53
|
Added music playing as a test
|
2010-08-12 17:58:29 +02:00 |
|
Nicolay Korslund
|
8067d62800
|
Decoupled SoundManager from Interpreter::Context
|
2010-08-12 16:29:22 +02:00 |
|
Marc Zinnschlag
|
aa637cb9d4
|
added RemoveItem
|
2010-08-07 17:00:04 +02:00 |
|
Marc Zinnschlag
|
db24a55e36
|
added sanity check for AddItem arguments
|
2010-08-07 16:34:49 +02:00 |
|
Marc Zinnschlag
|
589f8b5ede
|
added GetItemCount
|
2010-08-07 16:21:07 +02:00 |
|
Marc Zinnschlag
|
3ea85b4619
|
added AddItem instruction
|
2010-08-07 15:11:31 +02:00 |
|
Marc Zinnschlag
|
1902dfb7b2
|
added activate instruction
|
2010-08-05 15:52:07 +02:00 |
|
Marc Zinnschlag
|
7ba6bdb56c
|
prepared InterpreterContext for activation implementation
|
2010-08-03 22:43:53 +02:00 |
|
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
2010-08-03 14:14:04 +02:00 |
|
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
2010-08-03 13:32:37 +02:00 |
|