Marc Zinnschlag
|
ab1510fd5e
|
fixed previous commit
|
15 years ago |
|
Marc Zinnschlag
|
4649d7fa41
|
stop sounds on cell change
|
15 years ago |
|
Marc Zinnschlag
|
a6858b0cc4
|
Merge branch 'master' into class2
|
15 years ago |
|
Marc Zinnschlag
|
0a8d0fed40
|
added cell-wide stopSound function
|
15 years ago |
|
Marc Zinnschlag
|
de2eeb4cde
|
integrated insertObject function into class hierarchy
|
15 years ago |
|
Marc Zinnschlag
|
1d91ac9d9e
|
sound manager interface enhancement
|
15 years ago |
Nicolay Korslund
|
05b3140740
|
Enabled crosshairs
|
15 years ago |
|
Nicolay Korslund
|
979ea4e607
|
Mangle update for const error
|
15 years ago |
|
Nicolay Korslund
|
912c8b1f2d
|
Added mpg123 file reader
|
15 years ago |
|
Nicolay Korslund
|
ebcbff255e
|
Changed how avcodec/avformat (ffmpeg) is included
|
15 years ago |
|
Marc Zinnschlag
|
76492ea60b
|
cmake improvements for sound options
|
15 years ago |
|
Nicolay Korslund
|
cad9712411
|
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
|
15 years ago |
|
Nicolay Korslund
|
5d4dba981f
|
Fixed mistake in NPC record struct
|
15 years ago |
|
Nicolay Korslund
|
cf4185faef
|
Added sound test (remember to git submodule update)
|
15 years ago |
|
Marc Zinnschlag
|
0d4f2ab3ef
|
disabled escape sequences in script strings (doesn't work with Windows paths)
|
15 years ago |
|
Marc Zinnschlag
|
b94e09e030
|
fixed a bug that prevented local scripts from running
|
15 years ago |
|
Nicolay Korslund
|
7516e4ca53
|
Added music playing as a test
|
15 years ago |
|
Nicolay Korslund
|
8067d62800
|
Decoupled SoundManager from Interpreter::Context
|
15 years ago |
|
Nicolay Korslund
|
34572f0b19
|
Compiled and linked in sound system (not yet functional)
|
15 years ago |
Armin Preiml
|
181b538e4a
|
restructured ogre nif code (struct -> class with singleton), formated code
|
15 years ago |
|
Marc Zinnschlag
|
19c5ace602
|
added test for actor faction
|
15 years ago |
|
Marc Zinnschlag
|
594d3cef4f
|
added test for actor class
|
15 years ago |
|
Marc Zinnschlag
|
11bc131417
|
added test for global variables
|
15 years ago |
|
Marc Zinnschlag
|
fbe11956a6
|
added dummy test for select type '1' (Function); always yields false for now
|
15 years ago |
|
Marc Zinnschlag
|
c7fab9aad6
|
added test for actor race
|
15 years ago |
|
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
15 years ago |
|
Marc Zinnschlag
|
8086933282
|
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
|
8d85211fa1
|
modified Npc and Creature class to let them store a copy of their own ID
|
15 years ago |
|
Marc Zinnschlag
|
8f4359db08
|
added test for select type '3' (Local)
|
15 years ago |
|
Marc Zinnschlag
|
a25c7bb2c0
|
added test for cell name
|
15 years ago |
|
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 |