Marc Zinnschlag
|
9d25e74a05
|
on dialogue start run through the info records of dialogue record 'hello'; currently no testing done -> the first info recrod will match
|
15 years ago |
Armin Preiml
|
fa077ccdc4
|
Merge remote branch 'upstream/master'
|
15 years ago |
Armin Preiml
|
305563e595
|
disabled char encoding method for windows, although you'll need to add the iconv libs
|
15 years ago |
Marc Zinnschlag
|
7afc8ffd2e
|
Merge branch 'container'
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
15 years ago |
Marc Zinnschlag
|
2eee3d32f1
|
fixed World::disable function
|
15 years ago |
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
15 years ago |
Marc Zinnschlag
|
aa637cb9d4
|
added RemoveItem
|
15 years ago |
Marc Zinnschlag
|
db24a55e36
|
added sanity check for AddItem arguments
|
15 years ago |
Marc Zinnschlag
|
589f8b5ede
|
added GetItemCount
|
15 years ago |
Marc Zinnschlag
|
3ea85b4619
|
added AddItem instruction
|
15 years ago |
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
15 years ago |
Marc Zinnschlag
|
b5d59edd44
|
re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing)
|
15 years ago |
Marc Zinnschlag
|
d42747e85b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
15 years ago |
Marc Zinnschlag
|
c806415f08
|
changed namespace, class and function names to ensure consistent spelling
|
15 years ago |
Marc Zinnschlag
|
d6541d4f3c
|
changed file names to ensure consistent spelling
|
15 years ago |
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
15 years ago |
Marc Zinnschlag
|
8045320ac9
|
added dialog manager
|
15 years ago |
Marc Zinnschlag
|
7611572065
|
cleanup
|
15 years ago |
Marc Zinnschlag
|
6b1b3b20fd
|
store info records in dialogue records
|
15 years ago |
Marc Zinnschlag
|
d47de55ce9
|
read info records
|
15 years ago |
Marc Zinnschlag
|
10a63b10b5
|
Merge branch 'master' into container
Conflicts:
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/container.hpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
|
15 years ago |
Marc Zinnschlag
|
8e6a765603
|
fixed a stats bug (reducing modified stats via setModified didn't work correctly
|
15 years ago |
Marc Zinnschlag
|
c883921af3
|
minor cell change fix
|
15 years ago |
Marc Zinnschlag
|
1902dfb7b2
|
added activate instruction
|
15 years ago |
Marc Zinnschlag
|
15124601aa
|
stop local scripts from being run twice in case of activation
|
15 years ago |
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
15 years ago |
Marc Zinnschlag
|
f630157bf8
|
implemented basic object activation
|
15 years ago |
Marc Zinnschlag
|
2d695cc806
|
routed activate signal from input sub-system to engine-class
|
15 years ago |
Marc Zinnschlag
|
87c84e6fcd
|
limited activation range according to GMST settings
|
15 years ago |
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
15 years ago |
Marc Zinnschlag
|
e0a3b1b1db
|
implemented item count
|
15 years ago |
Marc Zinnschlag
|
7ba6bdb56c
|
prepared InterpreterContext for activation implementation
|
15 years ago |
Marc Zinnschlag
|
052d049a6c
|
integrated name-lookup into ape's code; added missing implementation of a function
|
15 years ago |
Marc Zinnschlag
|
5827591d05
|
Merge commit 'ape/master'
Conflicts:
apps/openmw/mwworld/world.hpp
|
15 years ago |
Marc Zinnschlag
|
69ea00455f
|
Merge branch 'poly'
Conflicts:
apps/openmw/mwworld/world.cpp
|
15 years ago |
Armin Preiml
|
adc209d135
|
Implemented the faced handle method to the engine. Faced handles will
be written to stdout every 10th frame.
|
15 years ago |
Armin Preiml
|
c000bfb43d
|
moved object focus code to mwscene
|
15 years ago |
Marc Zinnschlag
|
d1c000313f
|
added getPtr function that works via Ogre handle
|
15 years ago |
Marc Zinnschlag
|
002345270b
|
implemented teleport doors (only for the player for now)
|
15 years ago |
Marc Zinnschlag
|
7e5ddae3b3
|
modified action interface to allow other actors besides the player
|
15 years ago |
Marc Zinnschlag
|
c38b02bd5c
|
added action interface
|
15 years ago |
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
15 years ago |
Armin Preiml
|
b50c7e0788
|
Some experimental implementation of a RaySceneQuery.
|
15 years ago |
Marc Zinnschlag
|
f50ced4616
|
added missing record classes
|
15 years ago |
Marc Zinnschlag
|
0851044fa6
|
removed superfluous includes
|
15 years ago |
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
15 years ago |
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
15 years ago |
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
15 years ago |
Marc Zinnschlag
|
9d6e658e05
|
previous commit was missing some files
|
15 years ago |
Marc Zinnschlag
|
ca842d1b4d
|
reimplemented access to creature stats via new class interface
|
15 years ago |