| 
								
								
									 scrawl | c4ee3219c7 | Merge branch 'master' into shadersystem | 2012-07-26 23:01:29 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | bb03121edd | Merge branch 'drop' | 2012-07-26 19:10:03 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7725190f89 | removed some redundant code | 2012-07-26 19:09:45 +02:00 |  | 
				
					
						| 
								
								
									 greye | d5e63a767e | replace sprintf() with boost::format | 2012-07-26 19:38:33 +04:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 04ae3cbadd | Merge remote branch 'scrawl/master' | 2012-07-26 17:29:30 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 620b6bf27b | change url to work without publickey | 2012-07-26 17:08:39 +02:00 |  | 
				
					
						| 
								
								
									 greye | aa5f63ffcc | disabled items placing handling | 2012-07-26 19:06:48 +04:00 |  | 
				
					
						| 
								
								
									 greye | 26595f22f6 | float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() | 2012-07-26 16:14:11 +04:00 |  | 
				
					
						| 
								
								
									 greye | b734460dc9 | Merge branch 'master' of https://github.com/zinnschlag/openmw | 2012-07-26 16:02:58 +04:00 |  | 
				
					
						| 
								
								
									 scrawl | 06bd2cd919 | Merge branch 'master' into shadersystem | 2012-07-25 23:54:22 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 37c7becb07 | some potential compability fixes | 2012-07-25 23:53:06 +02:00 |  | 
				
					
						| 
								
								
									 greye | 9f813aa26c | update resource naming in getObjectAABB() | 2012-07-25 23:28:42 +04:00 |  | 
				
					
						| 
								
								
									 scrawl | 3feb4ce61b | terrain lod morph fix | 2012-07-25 19:33:21 +02:00 |  | 
				
					
						| 
								
								
									 greye | cd04911f3c | dropping on the ground | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | 49b1d5e127 | fix object placing | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | e7666d3a7f | move responsibility for cell changing from CellStore::insertObject to Class::moveToCell | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | bcc47cd5fb | local scripts, move placing to World::placeObject(Ptr, CellStore, Position) | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | d5fe378a66 | Revert "local script registration" This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2. | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | aff05b9d36 | local script registration | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | e1c7d1f529 | fixed item sinking | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | 6a3a728a56 | Class::getModel implementation | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | 87050e48c8 | physics getObjectHeight(), MWWorld::Class::getModel() definition | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | 71253c64ab | moving part 2, adding position parameter, stable | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | 61cb012ee7 | moving Scene::insertObject to CellStore::insertObject, part 1 | 2012-07-25 20:31:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | dd196b013c | Merge branch 'master' of https://github.com/zinnschlag/openmw | 2012-07-25 20:29:46 +04:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | e078d438b1 | Merge remote branch 'zini/master' into nif-cleanup | 2012-07-25 01:47:22 -07:00 |  | 
				
					
						| 
								
								
									 Sebastian Wick | 0f40e6fc65 | find boost without components so we can use Boost_VERSION | 2012-07-25 00:47:08 +02:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 4f46c8a8db | Use a functor for the mismatch compare function | 2012-07-24 14:59:25 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 9f0c1eeb7b | Support playgroup mode 0 | 2012-07-24 14:54:12 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 13ab2baef0 | Use a struct to hold the current animation times and remaining loop count | 2012-07-24 14:42:01 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | fd1e3f6ec5 | Add support for playgroup mode 2 | 2012-07-24 14:14:32 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 20121f3b0a | Remove some unused stuff | 2012-07-24 13:56:28 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 9a7a629d0f | Add support for playing animation groups | 2012-07-24 13:51:48 -07:00 |  | 
				
					
						| 
								
								
									 Nikolay Kasyanov | 94ce95c679 | bug #348: works again on OS X | 2012-07-25 00:13:33 +04:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | f953d7f8c0 | Store text keys from base NIF animations | 2012-07-23 17:27:35 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 36be1536d9 | Return text keys from NIFs when creating entities | 2012-07-23 17:20:47 -07:00 |  | 
				
					
						| 
								
								
									 scrawl | 8c8228a15c | fix terrain num lights setting | 2012-07-24 00:08:53 +02:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 44975854e5 | Merge remote branch 'zini/master' into nif-cleanup Conflicts:
	apps/openmw/mwrender/sky.cpp | 2012-07-23 13:46:05 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | f67983bbee | Don't assume one sub-entity for the night sky entities | 2012-07-23 13:37:05 -07:00 |  | 
				
					
						| 
								
								
									 greye | 607c7cceee | Merge branch 'master' of https://github.com/zinnschlag/openmw | 2012-07-24 00:03:39 +04:00 |  | 
				
					
						| 
								
								
									 greye | b760225179 | wrong branch This reverts commit d36d6aacf4. | 2012-07-24 00:00:10 +04:00 |  | 
				
					
						| 
								
								
									 greye | d36d6aacf4 | move Scene::insertObject to CellStore::insertObject, part 1 | 2012-07-23 23:56:20 +04:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 2d080ce4ef | compile fix | 2012-07-23 21:47:53 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 483a6d8605 | Merge remote branch 'scrawl/shadersystem' | 2012-07-23 21:46:06 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 02a52c0ff1 | fixed some more settings bugs | 2012-07-23 21:39:22 +02:00 |  | 
				
					
						| 
								
								
									 greye | 9a2690f849 | Revert "wrong" This reverts commit 3aa53fea32. | 2012-07-23 23:07:28 +04:00 |  | 
				
					
						| 
								
								
									 greye | 3aa53fea32 | wrong | 2012-07-23 23:06:53 +04:00 |  | 
				
					
						| 
								
								
									 scrawl | 3ebc6fd590 | fixed a settings window bug | 2012-07-23 20:50:56 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | a70f93b024 | fix "Crash when running openmw with --start="XYZ", remove HLSL for windows | 2012-07-23 20:12:42 +02:00 |  | 
				
					
						| 
								
								
									 greye | a62c684222 | Merge branch 'master' of https://github.com/zinnschlag/openmw | 2012-07-23 20:44:03 +04:00 |  |