Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								918316168f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'greye/store' into next
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp 
							
						 | 
						
							2012-11-07 19:34:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									emoose
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a7825577a
								
							
						 | 
						
							
							
								
								Changed: use MWWorld::Ptr for PhysicsSystem arguments
							
							
							
							
							
						 | 
						
							2012-11-05 19:37:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c2ce25f5f
								
							
						 | 
						
							
							
								
								m prefix for mwworld/cellstore.hpp
							
							
							
							
							
						 | 
						
							2012-11-05 16:07:59 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									emoose
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c8e941f0d
								
							
						 | 
						
							
							
								
								fix kdevelop indentation again...
							
							
							
							
							
						 | 
						
							2012-11-02 21:21:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									emoose
								
							 
						 | 
						
							
							
							
							
								
							
							
								96b56d9803
								
							
						 | 
						
							
							
								
								fixes: containers: key id case comparison
							
							
							
							
							
						 | 
						
							2012-11-02 21:18:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fa4ac177a
								
							
						 | 
						
							
							
								
								initial resolving
							
							
							
							
							
						 | 
						
							2012-10-01 00:23:49 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f2668b45b
								
							
						 | 
						
							
							
								
								Task #400 Review GMST access
							
							
							
							
							
						 | 
						
							2012-09-22 21:35:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								7606ebafd6
								
							
						 | 
						
							
							
								
								resolving conflicts, minor update
							
							
							
							
							
						 | 
						
							2012-09-17 11:37:50 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								89ad2af1d9
								
							
						 | 
						
							
							
								
								key usage to open doors or containers
							
							
							
							
							
							
							
							to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara) 
							
						 | 
						
							2012-09-10 17:44:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdc2a7433c
								
							
						 | 
						
							
							
								
								remove the wrong container open sound
							
							
							
							
							
						 | 
						
							2012-09-10 15:01:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								6813bafbfc
								
							
						 | 
						
							
							
								
								added missing sound effect for chest opening; minor cleanup
							
							
							
							
							
						 | 
						
							2012-09-04 15:42:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Douglas Diniz
								
							 
						 | 
						
							
							
							
							
								
							
							
								82e7c04c0a
								
							
						 | 
						
							
							
								
								Changing sounds to Action.
							
							
							
							
							
							
							
							Adding onActor to Action to choose between playSound and playSound3D. 
							
						 | 
						
							2012-08-19 20:11:50 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								6534c2a55a
								
							
						 | 
						
							
							
								
								Issue #107: WindowManager is accessed only through the interface class from now on
							
							
							
							
							
						 | 
						
							2012-08-12 18:11:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bd48d12af
								
							
						 | 
						
							
							
								
								Issue #107: SoundManager is accessed only through the interface class from now on
							
							
							
							
							
						 | 
						
							2012-08-09 14:33:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								26595f22f6
								
							
						 | 
						
							
							
								
								float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
							
							
							
							
							
						 | 
						
							2012-07-26 16:14:11 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7666d3a7f
								
							
						 | 
						
							
							
								
								move responsibility for cell changing from CellStore::insertObject to Class::moveToCell
							
							
							
							
							
						 | 
						
							2012-07-25 20:31:39 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a3a728a56
								
							
						 | 
						
							
							
								
								Class::getModel implementation
							
							
							
							
							
						 | 
						
							2012-07-25 20:31:39 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a7b95bf7a
								
							
						 | 
						
							
							
								
								Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp
							
							
							
							
							
						 | 
						
							2012-07-03 13:15:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c39fefd1e
								
							
						 | 
						
							
							
								
								Issue #107: World is accessed only through the interface class from now on; some include cleanup
							
							
							
							
							
						 | 
						
							2012-07-03 12:30:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fcd41c69d
								
							
						 | 
						
							
							
								
								Issue #107: Detemplateised CellStore; some include cleanup
							
							
							
							
							
						 | 
						
							2012-06-29 18:54:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								76174098c7
								
							
						 | 
						
							
							
								
								Issue #107: CellStore moved from ESMS to MWWorld
							
							
							
							
							
						 | 
						
							2012-06-29 16:48:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								de3daf3dc1
								
							
						 | 
						
							
							
								
								allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind
							
							
							
							
							
						 | 
						
							2012-06-18 00:21:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9ea1fba4e
								
							
						 | 
						
							
							
								
								fixed typo getCapacity method
							
							
							
							
							
						 | 
						
							2012-05-15 22:31:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								0063387979
								
							
						 | 
						
							
							
								
								Merge branch 'master' into inventoryGUI
							
							
							
							
							
						 | 
						
							2012-05-15 21:48:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e00fea18b
								
							
						 | 
						
							
							
								
								added getEncumbrance function
							
							
							
							
							
						 | 
						
							2012-05-15 21:34:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6493fb133
								
							
						 | 
						
							
							
								
								added getCapacity function
							
							
							
							
							
						 | 
						
							2012-05-15 21:17:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gugus
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e8f80807e
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp 
							
						 | 
						
							2012-05-11 10:40:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b5bfc52a1
								
							
						 | 
						
							
							
								
								Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp 
							
						 | 
						
							2012-04-24 02:02:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								35f478071e
								
							
						 | 
						
							
							
								
								Issue #255: deleted the old environment class and using the new one instead
							
							
							
							
							
						 | 
						
							2012-04-23 15:27:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								cdd4d83d9e
								
							
						 | 
						
							
							
								
								moved the tooltip info to the appropriate MWWorld::Class classes
							
							
							
							
							
						 | 
						
							2012-04-16 22:58:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gugus
								
							 
						 | 
						
							
							
							
							
								
							
							
								a38db39e88
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/CMakeLists.txt 
							
						 | 
						
							2012-04-15 17:54:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gugus
								
							 
						 | 
						
							
							
							
							
								
							
							
								b309d245c5
								
							
						 | 
						
							
							
								
								cleaning up hircine work
							
							
							
							
							
						 | 
						
							2012-04-15 17:52:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae308b9b5f
								
							
						 | 
						
							
							
								
								Use a set of flags instead of separate booleans
							
							
							
							
							
						 | 
						
							2012-03-31 07:31:55 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Papageorgiou
								
							 
						 | 
						
							
							
							
							
								
							
							
								703e484a92
								
							
						 | 
						
							
							
								
								Doors and Containers sounds, now in 3D
							
							
							
							
							
						 | 
						
							2012-03-13 14:17:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Papageorgiou
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe977fe313
								
							
						 | 
						
							
							
								
								More container and door trap fixes
							
							
							
							
							
						 | 
						
							2012-02-27 16:59:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Papageorgiou
								
							 
						 | 
						
							
							
							
							
								
							
							
								28fdfb0f99
								
							
						 | 
						
							
							
								
								Added container locked and trapped activation sounds
							
							
							
							
							
						 | 
						
							2012-02-27 16:37:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								f2972b1ca0
								
							
						 | 
						
							
							
								
								turned ContainerStore from a template into a simple struct
							
							
							
							
							
						 | 
						
							2012-01-28 11:45:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								8de6761a79
								
							
						 | 
						
							
							
								
								general cleanup
							
							
							
							
							
						 | 
						
							2012-01-27 15:11:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c081160591
								
							
						 | 
						
							
							
								
								replaced container store in ref data with new custom data implementation
							
							
							
							
							
						 | 
						
							2012-01-27 14:55:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jason Hooks
								
							 
						 | 
						
							
							
							
							
								
							
							
								7319f7a8c6
								
							
						 | 
						
							
							
								
								Many bugs fixed related to changing cells
							
							
							
							
							
						 | 
						
							2011-11-19 01:01:19 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jason Hooks
								
							 
						 | 
						
							
							
							
							
								
							
							
								15fcdc8b72
								
							
						 | 
						
							
							
								
								Physics working
							
							
							
							
							
						 | 
						
							2011-11-17 19:38:52 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jason Hooks
								
							 
						 | 
						
							
							
							
							
								
							
							
								4dc59dfbdd
								
							
						 | 
						
							
							
								
								Scenenode flip
							
							
							
							
							
						 | 
						
							2011-11-17 17:10:27 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jason Hooks
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7dadec840
								
							
						 | 
						
							
							
								
								Updating the rest of mwclass
							
							
							
							
							
						 | 
						
							2011-11-11 23:01:12 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jacob Essex
								
							 
						 | 
						
							
							
							
							
								
							
							
								9aac625000
								
							
						 | 
						
							
							
								
								Changes to move the mutable ESM::Position data to RefData
							
							
							
							
							
						 | 
						
							2011-11-08 00:08:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								88b0908104
								
							
						 | 
						
							
							
								
								adding physics when insertering objects into the OGRE scene
							
							
							
							
							
						 | 
						
							2011-01-29 17:33:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bb2041418
								
							
						 | 
						
							
							
								
								made rendering more robust (no more crashes, even if Ogre throws an exception)
							
							
							
							
							
						 | 
						
							2010-08-25 09:43:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								967f85875d
								
							
						 | 
						
							
							
								
								reimplemented class-dependend rendering code in MWClass
							
							
							
							
							
						 | 
						
							2010-08-14 10:02:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								10a63b10b5
								
							
						 | 
						
							
							
								
								Merge branch 'master' into container
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/container.hpp
	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-06 14:37:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a313f24ab
								
							
						 | 
						
							
							
								
								integrated activation into script system
							
							
							
							
							
						 | 
						
							2010-08-05 15:40:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee7570f7e7
								
							
						 | 
						
							
							
								
								added containerstore
							
							
							
							
							
						 | 
						
							2010-08-04 14:37:23 +02:00 | 
						
						
							
							
							
								
							
							
						 |