| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 9875d74abf | Implemented 3D sound placement. Sound management / lookup system not done yet. | 2010-08-14 21:01:20 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 3db61c8bdd | Added sound range function | 2010-08-14 18:50:42 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 49f0e4b75f | Added setPitch to Sound | 2010-08-14 13:02:41 +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 |  |