| 
								
								
									 Marc Zinnschlag | e7fa1d94b8 | Merge remote branch 'scrawl/shapefix' | 2012-03-05 10:51:18 +01:00 |  | 
				
					
						| 
								
								
									 scrawl | ba0365a427 | collision shape scale fix | 2012-03-02 16:47:39 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 12b7c6f1ac | Merge remote branch 'corristo/master' | 2012-03-02 12:11:53 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | be70d197e5 | Merge branch 'next' Conflicts:
	.gitignore
	cmake/FindOGRE.cmake | 2012-03-02 12:11:44 +01:00 |  | 
				
					
						| 
								
								
									 Nikolay Kasyanov | 70da2a2a99 | removed tabs | 2012-03-02 14:18:10 +04:00 |  | 
				
					
						| 
								
								
									 Nikolay Kasyanov | fa3fbf940c | Fix for OS X 10.6 support | 2012-03-02 14:10:11 +04:00 |  | 
				
					
						| 
								
								
									 scrawl | f2b807142a | update mangle | 2012-02-29 11:08:25 +01:00 |  | 
				
					
						| 
								
								
									 scrawl | f2c3616638 | Merge branch 'next' into terrain_next Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake | 2012-02-28 21:49:45 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 1652680e9b | mangle update (music workaround) | 2012-02-26 10:23:34 +01:00 |  | 
				
					
						| 
								
								
									 Nikolay Kasyanov | cb780720bb | fix for string.h: use our own strnlen only on OS X < 10.7 | 2012-02-25 17:43:30 +04:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 69a00df01a | submodule update (uncommon crash fix) | 2012-02-24 08:56:27 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | db205cf8aa | Merge remote branch 'scrawl/next' into test Conflicts:
	libs/openengine | 2012-02-20 14:54:08 +01:00 |  | 
				
					
						| 
								
								
									 scrawl | 60856b46e6 | moved the renderer update call from OMW::Engine to RenderingManager | 2012-02-19 23:22:29 +01:00 |  | 
				
					
						| 
								
								
									 scrawl | f81b615976 | implemented script functions FadeIn, FadeOut, FadeTo | 2012-02-18 18:25:28 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 4fcb721054 | openengine update (physics crash workaround | 2012-02-10 14:59:22 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 258ab0218a | submodule update (issue #131) | 2012-01-23 23:32:00 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7a1799d529 | submodule update | 2011-11-10 08:37:03 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7c8853f6fe | post-merge fixes | 2011-09-27 09:45:28 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 960654e58f | using new openengine version | 2011-09-06 09:56:45 +02:00 |  | 
				
					
						| 
								
								
									 Jan-Peter Nilsson | 6aa1f3efdd | Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) | 2011-04-27 12:34:52 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 57c3414fcd | OpenEngine update (bug-fix) | 2011-03-23 22:56:11 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 615f10b8c0 | OpenEngine update | 2011-03-22 21:52:27 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | bd08e308f8 | mangle update | 2011-03-22 14:12:45 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 68004630e9 | OpenEngine update | 2011-03-20 22:42:17 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 647e88003e | build and activation fix | 2011-03-19 19:54:37 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | c82a2fe37d | OpenEngine enhancements | 2011-03-09 19:30:16 +01:00 |  | 
				
					
						| 
								
								
									 gugus | 40193253b0 | fix some time bug | 2011-03-09 18:29:57 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | bf10471668 | various OpenEngine improvements (don't forget to update your submodules) | 2011-03-07 14:57:18 +01:00 |  | 
				
					
						| 
								
								
									 Jan-Peter Nilsson | e290f2f82f | Get physic fix in openengine and build nifbullet | 2011-02-27 00:47:56 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 1e9dc4b435 | de-Windownizing and some build-fixes | 2011-02-26 16:37:47 +01:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 940554b5fc | openengine update (remember to do a submodule update) | 2011-01-12 18:02:23 +01:00 |  | 
				
					
						| 
								
								
									 athile | c459eb7c55 | Visual Studio 2010 build fixes.  Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used.  MSVER is not necessarily defined on VS2010. | 2011-01-10 13:48:16 -07:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | b6e7de6527 | new mangle version (remember to update your subnodules) | 2011-01-09 09:39:13 +01:00 |  | 
				
					
						| 
								
								
									 Yuri Krupenin | 6b6ee5440e | Minimal set of fixes to build with MinGW. | 2011-01-03 17:00:53 +03:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 004541f5cf | Tested and applied Chris' sound patch. | 2010-09-14 13:27:20 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | aa91b0232f | submodule update | 2010-09-10 13:58:12 +02:00 |  | 
				
					
						| 
								
								
									 Jan Borsodi | ec8e92f7cd | Submodule update | 2010-09-10 13:38:17 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | fd5f4a5e5e | Mangle update (OpenAL bugfix) | 2010-09-10 11:00:26 +02:00 |  | 
				
					
						| 
								
								
									 athile | 11d0eb0bf2 | submodule updates | 2010-09-07 15:20:39 +01:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 5552c44753 | Cleaned up strnlen in esm_reader. Added -Werror switch to g++. | 2010-09-07 10:40:00 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | e30306f7c3 | Removed redundant custom exception class | 2010-09-02 22:30:39 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | d911653846 | Merge with athile's WIP windows build | 2010-09-02 12:55:27 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | ca13c09209 | Merged in athile's changes to mangle and openengine | 2010-09-02 12:53:35 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | e123fc1107 | OpenEngine update (fixed crash bug) | 2010-09-02 12:35:53 +02:00 |  | 
				
					
						| 
								
								
									 athile | 336fb1636c | Windows fixes | 2010-08-30 11:19:45 +01:00 |  | 
				
					
						| 
								
								
									 athile | 9e2129c4b3 | WIP Windows build | 2010-08-30 10:34:13 +01:00 |  | 
				
					
						| 
								
								
									 athile | 72fbeb9b9a | Mangle update | 2010-08-30 02:41:09 +01:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 064bc4b6c9 | Finished sound system | 2010-08-19 16:05:48 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 65c2070086 | Temporarily disabled music | 2010-08-18 13:05:31 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | ef9ed99622 | Mangle update (not important) | 2010-08-18 10:49:45 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | f2b2fe560f | Mangle update: Implemented streaming, fixed various bugs. | 2010-08-17 13:18:37 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 08289158d7 | Added support for WAV files with libsndfile | 2010-08-16 17:14:37 +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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 7516e4ca53 | Added music playing as a test | 2010-08-12 17:58:29 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 34572f0b19 | Compiled and linked in sound system (not yet functional) | 2010-08-12 16:13:54 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 925b5d29dd | Added back right version of libs/openengine/ submodule. Please run git submodule update. | 2010-07-21 16:24:23 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d72ed19460 | implemented script compiler for console | 2010-07-20 23:21:48 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | c61212202b | Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. | 2010-07-20 20:23:37 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | c84672a560 | Added MyGUI to OpenMW, fully working (with events and script hooks) | 2010-07-17 19:38:32 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 4eb2863db4 | Added input to apps/mygui_dev/ | 2010-07-16 21:49:36 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 13d3f9c87e | Integrated OpenEngine, replaces entire components/engine/ directory. | 2010-07-16 14:56:14 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 259908013e | Started integrating OE (NO-COMPILE) | 2010-07-16 10:28:19 +02:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 5005f5eb06 | Fixed platform/strings.h to work again on Linux | 2010-06-28 11:45:42 +02:00 |  | 
				
					
						| 
								
								
									 athile | b2485e8a52 | Windows build fixes | 2010-06-27 14:43:07 -07:00 |  | 
				
					
						| 
								
								
									 Nicolay Korslund | 91f5c9c01f | Moved mangle submodule. Running 'git submodule update' should be enough. | 2010-06-26 10:39:37 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | e4f85cb3e6 | directory structure reorganisation (still missing the mangle stuff) | 2010-06-25 22:28:59 +02:00 |  |