| 
								
								
									 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 | 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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Armin Preiml | 181b538e4a | restructured ogre nif code (struct -> class with singleton), formated code | 2010-08-08 17:20:55 +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 |  | 
				
					
						| 
								
								
									 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 | 8f4359db08 | added test for select type '3' (Local) | 2010-08-08 13:21:03 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | a25c7bb2c0 | added test for cell name | 2010-08-08 11:37:59 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 9d25e74a05 | on dialogue start run through the info records of dialogue record 'hello'; currently no testing done -> the first info recrod will match | 2010-08-08 11:34:03 +02:00 |  |