Marc Zinnschlag
|
d52e2f68cd
|
added searchExt function to cell RecList
|
2010-08-20 12:52:51 +02:00 |
|
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 |
|
Nicolay Korslund
|
3324f6494c
|
Added weak_ptr typedef to Sound (WSoundPtr), since this is commonly used
|
2010-08-19 15:42:00 +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 |
|
Armin Preiml
|
a67b49be57
|
Merge remote branch 'upstream/master'
|
2010-08-18 19:28:28 +02:00 |
|
Nicolay Korslund
|
358e1ca5a5
|
Added custom UTF8 converter. Removed iconv dependency.
|
2010-08-18 18:45:44 +02:00 |
|
Armin Preiml
|
927879d23e
|
Merge remote branch 'upstream/master'
|
2010-08-18 17:07:12 +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
|
200fab03ef
|
Improved WAV error checking
|
2010-08-18 12:59:21 +02:00 |
|
Nicolay Korslund
|
8f154ac622
|
Added custom WAV loader
|
2010-08-18 12:32:38 +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 |
|
Nicolay Korslund
|
ef9ed99622
|
Mangle update (not important)
|
2010-08-18 10:49:45 +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 |
|
Marc Zinnschlag
|
bbfb134991
|
Merge commit 'ape/master'
|
2010-08-18 00:33:41 +02:00 |
|
Armin Preiml
|
cd842f3e52
|
Merge remote branch 'upstream/master'
|
2010-08-17 19:24:57 +02:00 |
|
Armin Preiml
|
47a28fe02b
|
If nif has a skeleton vertices are placed on the right position.
|
2010-08-17 19:02:22 +02:00 |
|
Nicolay Korslund
|
27bef84091
|
Tested if exchanging sf_read with sf_readf in libsndfile help OpenMW crash (it did not)
|
2010-08-17 16:03:51 +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
|
cd4ed4e6bf
|
Implemented OpenAL streaming. Fixed bugs in SampleReader and elsewhere.
|
2010-08-17 13:17:39 +02:00 |
|
Nicolay Korslund
|
2e2f8e9725
|
Mangle update
|
2010-08-17 11:27:06 +02:00 |
|
Nicolay Korslund
|
932465442b
|
Moved OpenAL_Sound to cpp file, added delayed buffer creation (prelude for streaming)
|
2010-08-17 11:25:26 +02:00 |
|
Nicolay Korslund
|
80383fe60e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
2010-08-17 11:20:17 +02:00 |
|
Marc Zinnschlag
|
e69a924036
|
Merge commit 'ape/master'
|
2010-08-16 20:39:16 +02:00 |
|
Armin Preiml
|
6a936100a7
|
Merge remote branch 'upstream/master'
|
2010-08-16 20:11:38 +02:00 |
|
Armin Preiml
|
d8f8bd12d3
|
Disabled loading skins.nif. NifLoader builds now a skeleton (if available)
|
2010-08-16 19:31:59 +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 |
|
Nicolay Korslund
|
c982f701ca
|
Minor fix again
|
2010-08-16 17:07:27 +02:00 |
|
Nicolay Korslund
|
e8f01ae108
|
Fixed include guard
|
2010-08-16 17:04:44 +02:00 |
|
Nicolay Korslund
|
a0aafb9b1f
|
bleh
|
2010-08-16 17:01:11 +02:00 |
|
Nicolay Korslund
|
56ecc6585b
|
Added a manager for sndfile + mpg123, sorting on file type.
|
2010-08-16 16:52:33 +02:00 |
|
Nicolay Korslund
|
b0ded6a318
|
Minor changes to sample_reader
|
2010-08-16 16:26:24 +02:00 |
|
Nicolay Korslund
|
ddfbcecfcd
|
Added support for libsndfile (sound input)
|
2010-08-16 14:42:23 +02:00 |
|
Nicolay Korslund
|
a69938364f
|
Rewrote audiere to use new sample_reader
|
2010-08-16 14:13:13 +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 |
|