| 
								
								
									 scrawl | 867fb620c3 | part 2 | 2012-11-08 19:25:06 +01:00 |  | 
				
					
						| 
								
								
									 scrawl | 00a2de432a | fix BulletShapeLoader namespace | 2012-11-08 18:48:07 +01:00 |  | 
				
					
						| 
								
								
									 scrawl | 4ca0eb93ee | fix markers used for raycasting and blocking activation | 2012-10-24 17:47:03 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | c64eb96952 | Merge branch 'Travel_Dialogue' into training_travel Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt | 2012-10-17 18:17:53 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 35d099a638 | disabling gcc extensions | 2012-10-09 17:10:25 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 044ab3d2b6 | fix error in framelistener with tcg enabled | 2012-09-28 17:02:18 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 1cb1259e18 | fixing some unrelated warnings | 2012-09-23 19:36:37 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 9d1a9520fc | Merge remote-tracking branch 'jhooks/physicsaedra3' into next | 2012-09-22 09:05:36 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | f365cab824 | Possible fix for a issue | 2012-09-21 16:10:08 -04:00 |  | 
				
					
						| 
								
								
									 scrawl | 845dddbab8 | fix a weird problem with the fading overlay | 2012-09-21 18:09:07 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 87a9373a56 | Merge remote-tracking branch 'scrawl/gamma' into next | 2012-09-20 09:01:58 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 32de090079 | Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities | 2012-09-19 19:34:02 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | a3c680d20a | Merge remote-tracking branch 'scrawl/sleep_wait' into next | 2012-09-19 09:41:32 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | bf5e30b24f | everything done except health/mana restore | 2012-09-19 02:53:06 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 4829f47a4f | rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI | 2012-09-18 21:04:43 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 4abb9a00da | Merge remote-tracking branch 'jhooks/physicsaedra3' into next | 2012-09-18 11:25:09 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | f01aae138f | Removing void | 2012-09-17 17:23:26 -04:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | b96485284a | removed some unneeded return values | 2012-09-17 13:41:15 +02:00 |  | 
				
					
						| 
								
								
									 Brother Brick | 05c3936797 | Merge remote-tracking branch 'upstream/master' into static | 2012-09-17 11:57:38 +02:00 |  | 
				
					
						| 
								
								
									 Brother Brick | ff54508633 | during cleanup we now delete all plugins created | 2012-09-17 11:57:29 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 05687c120f | protection for null cast | 2012-09-16 17:48:18 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 0fa1dea6c1 | Box size set; Set speed | 2012-09-16 17:29:16 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 192d634098 | Movement keys; View angles | 2012-09-16 13:19:38 -04:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 4eae810de3 | Merge remote-tracking branch 'edmondo/master' | 2012-09-16 10:37:45 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 76f2a82884 | More pmove stuff; Turned off broadphase, we could not fall in exteriors | 2012-09-15 22:48:24 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | f6384574da | Starting to introduce pmove | 2012-09-15 18:17:42 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | f586f53a42 | positioning | 2012-09-15 16:45:50 -04:00 |  | 
				
					
						| 
								
								
									 Edmondo Tommasina | f21faf197c | selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’ | 2012-09-15 22:19:44 +02:00 |  | 
				
					
						| 
								
								
									 Michael Mc Donnell | c161a3850f | Use correct type for iterator Fixes building on Windows with vs2010. | 2012-09-15 15:37:18 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 02bca98e9f | Setrotate working | 2012-09-15 13:23:49 -04:00 |  | 
				
					
						| 
								
								
									 scrawl | 2793096b50 | Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp | 2012-09-15 00:57:29 +02:00 |  | 
				
					
						| 
								
								
									 Brother Brick | 44c644dd7b | make it statically compilable | 2012-09-14 15:30:48 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 565aad3783 | changed a method for ogre 1.8.0 | 2012-09-14 14:49:56 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 1f7e044fad | removed some debug stuff | 2012-09-14 14:41:19 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 6ac2a12296 | item selection working on the preview | 2012-09-14 14:34:18 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | eef750e6b0 | race selection preview | 2012-09-13 19:03:31 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | a1a7733730 | Set scale implemented | 2012-09-12 18:30:32 -04:00 |  | 
				
					
						| 
								
								
									 scrawl | 2b339f6c0f | loading screen | 2012-09-11 16:37:54 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | c5b25ef70b | Very basic actor physics (no set scale/rotate functions) | 2012-09-10 20:29:24 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 3e3437f9c3 | Revised create and adjust rigid body functions | 2012-09-06 20:11:59 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 23777033fd | Starting to implement new PhysicActor | 2012-09-05 17:44:11 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 2efceba1fc | Tearing apart PhysicActor | 2012-09-03 20:32:20 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 0697c7f7f4 | Finally merged in master | 2012-09-01 17:28:12 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | b7697a62ad | Position set back to zero | 2012-08-29 18:35:39 -04:00 |  | 
				
					
						| 
								
								
									 scrawl | 19ae30ee68 | Merge branch 'master' into next Conflicts:
	apps/openmw/mwbase/inputmanager.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.hpp
	apps/openmw/mwinput/mouselookevent.cpp | 2012-08-19 22:09:22 +02:00 |  | 
				
					
						| 
								
								
									 greye | 40c7a850bf | fix pmove BB shape origin | 2012-08-17 15:19:44 +04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 8762f4a47a | boxrotation nif field; commented functions | 2012-08-15 16:47:26 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 7b8b4c366d | Set angle now working for npcs and creatures | 2012-08-14 20:29:48 -04:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 1f5bc229e0 | Separate adjustRigidBody function | 2012-08-14 18:04:58 -04:00 |  | 
				
					
						| 
								
								
									 scrawl | c4fe2e4e2a | Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem | 2012-08-12 23:01:25 +02:00 |  |