1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 00:39:59 +00:00
Commit Graph

240 Commits

Author SHA1 Message Date
Marc Zinnschlag
de6e8b4cad Merge commit 'upstream/master' 2010-08-20 09:42:14 +02:00
Nicolay Korslund
104f3fdd50 Added path conversion for say() sounds 2010-08-20 09:36:34 +02:00
Marc Zinnschlag
b15c917c01 Merge commit 'upstream/master' 2010-08-19 16:13:16 +02:00
Nicolay Korslund
064bc4b6c9 Finished sound system 2010-08-19 16:05:48 +02:00
Marc Zinnschlag
67a067e49c changed name of teleport doors to the name of the destination cell 2010-08-19 13:19:23 +02:00
Marc Zinnschlag
6e46ddae33 more detailed report of unhandled info record fields 2010-08-19 13:06:15 +02:00
Marc Zinnschlag
3b49d6c826 added NPC stats 2010-08-19 12:49:13 +02:00
Nicolay Korslund
38ad2d98f9 Fixed windows issues + one minor optimization on to_utf8 2010-08-18 19:50:59 +02:00
Nicolay Korslund
358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 2010-08-18 18:45:44 +02:00
Nicolay Korslund
9a5e7816eb Renabled music. WILL CRASH WITH MPG123 v1.12.1. 2010-08-18 14:50:49 +02:00
Nicolay Korslund
65c2070086 Temporarily disabled music 2010-08-18 13:05:31 +02:00
Nicolay Korslund
9300e60514 Merge branch 'master' of http://github.com/zinnschlag/openmw 2010-08-18 11:22:51 +02:00
Nicolay Korslund
31017447eb Added --nosound switch 2010-08-18 11:16:15 +02:00
Marc Zinnschlag
4f3f174016 fixed a dialogue bug 2010-08-18 11:06:41 +02:00
Nicolay Korslund
304692dc8e Merge branch 'master' of http://github.com/zinnschlag/openmw 2010-08-18 10:49:55 +02:00
Marc Zinnschlag
6258654383 fixed a very sloppy merge 2010-08-18 09:32:36 +02:00
Marc Zinnschlag
2cfe5f0697 Merge branch 'master' into dialogue
Conflicts:
	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-18 09:25:07 +02:00
Marc Zinnschlag
e42f1bbc11 open dialogue window, if a matching greetings info record is found 2010-08-18 09:19:16 +02:00
Nicolay Korslund
6cdb0f1152 Enabled music streaming 2010-08-17 13:30:53 +02:00
Nicolay Korslund
88f10eb222 Merge branch 'sound_system' 2010-08-17 13:21:52 +02:00
Nicolay Korslund
f2b2fe560f Mangle update: Implemented streaming, fixed various bugs. 2010-08-17 13:18:37 +02:00
Nicolay Korslund
80383fe60e Merge branch 'master' of http://github.com/zinnschlag/openmw 2010-08-17 11:20:17 +02:00
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
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
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
912c8b1f2d Added mpg123 file reader 2010-08-13 22:30:22 +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
cf4185faef Added sound test (remember to git submodule update) 2010-08-13 14:43:57 +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
19c5ace602 added test for actor faction 2010-08-08 15:17:49 +02:00
Marc Zinnschlag
594d3cef4f added test for actor class 2010-08-08 15:12:53 +02:00
Marc Zinnschlag
11bc131417 added test for global variables 2010-08-08 15:09:44 +02:00
Marc Zinnschlag
fbe11956a6 added dummy test for select type '1' (Function); always yields false for now 2010-08-08 14:43:20 +02:00
Marc Zinnschlag
c7fab9aad6 added test for actor race 2010-08-08 14:36:45 +02:00
Marc Zinnschlag
2acfe22975 added test for actor ID 2010-08-08 14:28:35 +02:00
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
2010-08-08 14:14:43 +02:00