Marc Zinnschlag
|
05382f206e
|
Merge commit 'upstream/master'
|
2010-08-16 17:16:55 +02:00 |
|
Nicolay Korslund
|
08289158d7
|
Added support for WAV files with libsndfile
|
2010-08-16 17:14:37 +02:00 |
|
Marc Zinnschlag
|
5543c84586
|
bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change
|
2010-08-14 21:58:54 +02:00 |
|
Nicolay Korslund
|
dbd42386da
|
temporary try/catch around sound loading
|
2010-08-14 21:43:25 +02:00 |
|
Nicolay Korslund
|
9875d74abf
|
Implemented 3D sound placement. Sound management / lookup system not
done yet.
|
2010-08-14 21:01:20 +02:00 |
|
Marc Zinnschlag
|
973ddc54e8
|
Merge branch 'class2'
|
2010-08-14 11:40:34 +02:00 |
|
Marc Zinnschlag
|
6f28bd9adf
|
handle sounds when enabling/disabling
|
2010-08-14 11:39:32 +02:00 |
|
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
2010-08-14 11:27:13 +02:00 |
|
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
2010-08-14 10:02:54 +02:00 |
|
Marc Zinnschlag
|
ab1510fd5e
|
fixed previous commit
|
2010-08-14 09:30:43 +02:00 |
|
Marc Zinnschlag
|
4649d7fa41
|
stop sounds on cell change
|
2010-08-14 09:29:38 +02:00 |
|
Marc Zinnschlag
|
a6858b0cc4
|
Merge branch 'master' into class2
|
2010-08-14 09:26:12 +02:00 |
|
Marc Zinnschlag
|
0a8d0fed40
|
added cell-wide stopSound function
|
2010-08-14 09:26:00 +02:00 |
|
Marc Zinnschlag
|
de2eeb4cde
|
integrated insertObject function into class hierarchy
|
2010-08-14 09:20:47 +02:00 |
|
Marc Zinnschlag
|
1d91ac9d9e
|
sound manager interface enhancement
|
2010-08-14 07:54:51 +02:00 |
|
Nicolay Korslund
|
05b3140740
|
Enabled crosshairs
|
2010-08-13 23:41:58 +02:00 |
|
Nicolay Korslund
|
979ea4e607
|
Mangle update for const error
|
2010-08-13 23:01:23 +02:00 |
|
Nicolay Korslund
|
912c8b1f2d
|
Added mpg123 file reader
|
2010-08-13 22:30:22 +02:00 |
|
Nicolay Korslund
|
ebcbff255e
|
Changed how avcodec/avformat (ffmpeg) is included
|
2010-08-13 19:38:58 +02:00 |
|
Marc Zinnschlag
|
76492ea60b
|
cmake improvements for sound options
|
2010-08-13 18:16:38 +02:00 |
|
Nicolay Korslund
|
cad9712411
|
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
|
2010-08-13 17:11:03 +02:00 |
|
Nicolay Korslund
|
5d4dba981f
|
Fixed mistake in NPC record struct
|
2010-08-13 15:51:42 +02:00 |
|
Nicolay Korslund
|
cf4185faef
|
Added sound test (remember to git submodule update)
|
2010-08-13 14:43:57 +02:00 |
|
Marc Zinnschlag
|
0d4f2ab3ef
|
disabled escape sequences in script strings (doesn't work with Windows paths)
|
2010-08-12 19:41:40 +02:00 |
|
Marc Zinnschlag
|
b94e09e030
|
fixed a bug that prevented local scripts from running
|
2010-08-12 18:44:16 +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 |
|
Nicolay Korslund
|
34572f0b19
|
Compiled and linked in sound system (not yet functional)
|
2010-08-12 16:13:54 +02:00 |
|
Marc Zinnschlag
|
8d85211fa1
|
modified Npc and Creature class to let them store a copy of their own ID
|
2010-08-08 14:09:09 +02:00 |
|
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
|
2010-08-07 20:33:07 +02:00 |
|
Marc Zinnschlag
|
2eee3d32f1
|
fixed World::disable function
|
2010-08-07 20:29:10 +02:00 |
|
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
2010-08-07 20:25:17 +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
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
2010-08-06 22:20:20 +02:00 |
|
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
2010-08-06 18:15:46 +02:00 |
|
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
|
2010-08-06 14:37:53 +02:00 |
|
Marc Zinnschlag
|
8e6a765603
|
fixed a stats bug (reducing modified stats via setModified didn't work correctly
|
2010-08-05 16:40:21 +02:00 |
|
Marc Zinnschlag
|
c883921af3
|
minor cell change fix
|
2010-08-05 15:57:06 +02:00 |
|
Marc Zinnschlag
|
1902dfb7b2
|
added activate instruction
|
2010-08-05 15:52:07 +02:00 |
|
Marc Zinnschlag
|
15124601aa
|
stop local scripts from being run twice in case of activation
|
2010-08-05 15:46:50 +02:00 |
|
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
2010-08-05 15:40:03 +02:00 |
|
Marc Zinnschlag
|
f630157bf8
|
implemented basic object activation
|
2010-08-05 13:51:26 +02:00 |
|
Marc Zinnschlag
|
2d695cc806
|
routed activate signal from input sub-system to engine-class
|
2010-08-05 13:36:33 +02:00 |
|
Marc Zinnschlag
|
87c84e6fcd
|
limited activation range according to GMST settings
|
2010-08-05 13:29:49 +02:00 |
|
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
2010-08-04 14:37:23 +02:00 |
|
Marc Zinnschlag
|
e0a3b1b1db
|
implemented item count
|
2010-08-04 14:04:22 +02:00 |
|
Marc Zinnschlag
|
7ba6bdb56c
|
prepared InterpreterContext for activation implementation
|
2010-08-03 22:43:53 +02:00 |
|