scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								190512156d
								
							
						 | 
						
							
							
								
								Use some more GMSTs for enchanting
							
							
							
							
							
						 | 
						
							2014-01-29 15:37:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								3298eb1b37
								
							
						 | 
						
							
							
								
								Implement HitOnMe script function
							
							
							
							
							
						 | 
						
							2013-07-26 10:50:23 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c4a963132
								
							
						 | 
						
							
							
								
								Container UI rewrite
							
							
							
							
							
						 | 
						
							2013-05-11 18:38:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								78596cad83
								
							
						 | 
						
							
							
								
								Fix enchantment points value
							
							
							
							
							
						 | 
						
							2013-04-29 10:19:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								2693b78536
								
							
						 | 
						
							
							
								
								Add initial player inventory when new game is started
							
							
							
							
							
						 | 
						
							2013-04-15 02:56:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								beb1858a57
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'glorf/bugfix'
							
							
							
							
							
						 | 
						
							2013-04-10 17:39:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad49d1ecab
								
							
						 | 
						
							
							
								
								Sixth minor fix
							
							
							
							
							
						 | 
						
							2013-04-10 15:24:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c22e123f4
								
							
						 | 
						
							
							
								
								Bugfix #691 changes
							
							
							
							
							
						 | 
						
							2013-04-08 22:10:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3c8cd2065
								
							
						 | 
						
							
							
								
								Don't buy/sell keys which are set to open a lock
							
							
							
							
							
						 | 
						
							2013-04-07 21:38:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								48d9885554
								
							
						 | 
						
							
							
								
								Started bugfix #691
							
							
							
							
							
						 | 
						
							2013-04-05 15:42:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								d29a42dcbe
								
							
						 | 
						
							
							
								
								Fixed enchanting mechanics
							
							
							
							
							
						 | 
						
							2013-03-31 23:18:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								86275e5bd4
								
							
						 | 
						
							
							
								
								Some enchanting fixes
							
							
							
							
							
						 | 
						
							2013-03-29 12:00:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb88463b94
								
							
						 | 
						
							
							
								
								Some enchanting fixes
							
							
							
							
							
						 | 
						
							2013-03-28 23:39:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								6643fe789c
								
							
						 | 
						
							
							
								
								Enchanting system
							
							
							
							
							
						 | 
						
							2013-03-28 17:41:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0b0227e8a
								
							
						 | 
						
							
							
								
								enchanting
							
							
							
							
							
						 | 
						
							2013-03-16 19:00:14 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f1e09d2c1
								
							
						 | 
						
							
							
								
								make Class::use method return an equip action for equippable items, add sound for equipping
							
							
							
							
							
						 | 
						
							2012-05-16 16:08:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ee4e8fb5a
								
							
						 | 
						
							
							
								
								Merge branch 'itemstacking' into inventoryGUI
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwclass/armor.hpp
	apps/openmw/mwclass/clothing.hpp
	apps/openmw/mwclass/weapon.hpp
	apps/openmw/mwworld/class.hpp 
							
						 | 
						
							2012-05-12 18:32:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b0251b09f
								
							
						 | 
						
							
							
								
								item stacking
							
							
							
							
							
						 | 
						
							2012-05-12 16:17:03 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5a7d418dd
								
							
						 | 
						
							
							
								
								added getValue function to Class hierarchy
							
							
							
							
							
						 | 
						
							2012-04-07 19:53:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c616d005e8
								
							
						 | 
						
							
							
								
								fixed a spelling mistake
							
							
							
							
							
						 | 
						
							2012-03-15 14:31:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Papageorgiou
								
							 
						 | 
						
							
							
							
							
								
							
							
								947288e13a
								
							
						 | 
						
							
							
								
								Merge master and rewrite around the new detection function
							
							
							
							
							
						 | 
						
							2012-03-14 00:38:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Papageorgiou
								
							 
						 | 
						
							
							
							
							
								
							
							
								db9085ae59
								
							
						 | 
						
							
							
								
								Pickup sounds for weapons
							
							
							
							
							
						 | 
						
							2012-03-13 20:40:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								cbbc295eb6
								
							
						 | 
						
							
							
								
								implemented new equipment functions in MWClass
							
							
							
							
							
						 | 
						
							2012-03-13 15:35:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								699246e54b
								
							
						 | 
						
							
							
								
								removed insertIntoContainer function from MWWorld::Class hierarchy
							
							
							
							
							
						 | 
						
							2012-02-23 12:53:48 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jason Hooks
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc58ef28cd
								
							
						 | 
						
							
							
								
								Made corrections
							
							
							
							
							
						 | 
						
							2011-11-12 15:58:22 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jason Hooks
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7dadec840
								
							
						 | 
						
							
							
								
								Updating the rest of mwclass
							
							
							
							
							
						 | 
						
							2011-11-11 23:01:12 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								967f85875d
								
							
						 | 
						
							
							
								
								reimplemented class-dependend rendering code in MWClass
							
							
							
							
							
						 | 
						
							2010-08-14 10:02:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7fe28ecbe
								
							
						 | 
						
							
							
								
								implemented take action
							
							
							
							
							
						 | 
						
							2010-08-07 20:25:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a60bde834
								
							
						 | 
						
							
							
								
								added insertIntoContainer function to class hierarchy
							
							
							
							
							
						 | 
						
							2010-08-06 22:20:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a313f24ab
								
							
						 | 
						
							
							
								
								integrated activation into script system
							
							
							
							
							
						 | 
						
							2010-08-05 15:40:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								239498bcd4
								
							
						 | 
						
							
							
								
								added getName function
							
							
							
							
							
						 | 
						
							2010-08-03 17:11:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfc282779b
								
							
						 | 
						
							
							
								
								added item health interface
							
							
							
							
							
						 | 
						
							2010-08-03 14:14:04 +02:00 | 
						
						
							
							
							
								
							
							
						 |