Armin Preiml
|
a67b49be57
|
Merge remote branch 'upstream/master'
|
15 years ago |
Nicolay Korslund
|
358e1ca5a5
|
Added custom UTF8 converter. Removed iconv dependency.
|
15 years ago |
|
Armin Preiml
|
927879d23e
|
Merge remote branch 'upstream/master'
|
15 years ago |
|
Nicolay Korslund
|
9a5e7816eb
|
Renabled music. WILL CRASH WITH MPG123 v1.12.1.
|
15 years ago |
|
Nicolay Korslund
|
65c2070086
|
Temporarily disabled music
|
15 years ago |
|
Nicolay Korslund
|
9300e60514
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
|
Nicolay Korslund
|
31017447eb
|
Added --nosound switch
|
15 years ago |
Marc Zinnschlag
|
4f3f174016
|
fixed a dialogue bug
|
15 years ago |
|
Nicolay Korslund
|
304692dc8e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
|
Nicolay Korslund
|
ef9ed99622
|
Mangle update (not important)
|
15 years ago |
|
Marc Zinnschlag
|
6258654383
|
fixed a very sloppy merge
|
15 years ago |
|
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
|
15 years ago |
|
Marc Zinnschlag
|
e42f1bbc11
|
open dialogue window, if a matching greetings info record is found
|
15 years ago |
|
Marc Zinnschlag
|
bbfb134991
|
Merge commit 'ape/master'
|
15 years ago |
|
Armin Preiml
|
cd842f3e52
|
Merge remote branch 'upstream/master'
|
15 years ago |
|
Armin Preiml
|
47a28fe02b
|
If nif has a skeleton vertices are placed on the right position.
|
15 years ago |
|
Nicolay Korslund
|
6cdb0f1152
|
Enabled music streaming
|
15 years ago |
|
Nicolay Korslund
|
88f10eb222
|
Merge branch 'sound_system'
|
15 years ago |
|
Nicolay Korslund
|
f2b2fe560f
|
Mangle update: Implemented streaming, fixed various bugs.
|
15 years ago |
|
Nicolay Korslund
|
80383fe60e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
|
Marc Zinnschlag
|
e69a924036
|
Merge commit 'ape/master'
|
15 years ago |
|
Armin Preiml
|
6a936100a7
|
Merge remote branch 'upstream/master'
|
15 years ago |
|
Armin Preiml
|
d8f8bd12d3
|
Disabled loading skins.nif. NifLoader builds now a skeleton (if available)
|
15 years ago |
|
Marc Zinnschlag
|
05382f206e
|
Merge commit 'upstream/master'
|
15 years ago |
|
Nicolay Korslund
|
08289158d7
|
Added support for WAV files with libsndfile
|
15 years ago |
|
Marc Zinnschlag
|
5543c84586
|
bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change
|
15 years ago |
|
Nicolay Korslund
|
dbd42386da
|
temporary try/catch around sound loading
|
15 years ago |
|
Nicolay Korslund
|
9875d74abf
|
Implemented 3D sound placement. Sound management / lookup system not
done yet.
|
15 years ago |
|
Marc Zinnschlag
|
973ddc54e8
|
Merge branch 'class2'
|
15 years ago |
|
Marc Zinnschlag
|
6f28bd9adf
|
handle sounds when enabling/disabling
|
15 years ago |
|
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
15 years ago |
|
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
15 years ago |
|
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 |