scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9127839cc1 
								
							 
						 
						
							
							
								
								Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.  
							
							
							
						 
						
							2014-01-11 03:33:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								909494ff35 
								
							 
						 
						
							
							
								
								Implement Assault crimes. In other words, NPCs now fight back!  
							
							
							
						 
						
							2014-01-11 03:08:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d4a98ffc27 
								
							 
						 
						
							
							
								
								Increase fight rating when being the victim of a crime  
							
							
							
						 
						
							2014-01-11 02:27:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								727aa30347 
								
							 
						 
						
							
							
								
								Dead actors are unaware of everything  
							
							
							
						 
						
							2014-01-11 02:06:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3bf36515d5 
								
							 
						 
						
							
							
								
								Implement Trespassing crime  
							
							
							
						 
						
							2014-01-10 21:26:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								223c1d5a38 
								
							 
						 
						
							
							
								
								Use GMSTs for crime bounty  
							
							
							
						 
						
							2014-01-09 02:20:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5dc59176 
								
							 
						 
						
							
							
								
								Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.  
							
							
							
						 
						
							2014-01-08 23:37:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9baa1bef78 
								
							 
						 
						
							
							
								
								Expell player from faction when committing a crime against a faction member  
							
							
							
						 
						
							2014-01-08 19:26:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								19d63f392f 
								
							 
						 
						
							
							
								
								Clean up the NpcStats expelled interface. Show message box when expelled.  
							
							
							
						 
						
							2014-01-08 18:59:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								098f9712f1 
								
							 
						 
						
							
							
								
								Add getPlayerPtr() utility method. Reduces dependencies a lot.  
							
							
							
						 
						
							2014-01-08 18:39:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7b33f6f2ac 
								
							 
						 
						
							
							
								
								Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.  
							
							
							
						 
						
							2014-01-08 17:19:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b99ca92fee 
								
							 
						 
						
							
							
								
								Add missing line of sight check  
							
							
							
						 
						
							2014-01-08 17:18:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2bb21f2f76 
								
							 
						 
						
							
							
								
								Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.  
							
							
							
						 
						
							2014-01-08 02:35:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c85c2cff4e 
								
							 
						 
						
							
							
								
								Fix disposition changes from trades not applying properly  
							
							
							
						 
						
							2014-01-08 01:46:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0285d18fc2 
								
							 
						 
						
							
							
								
								Respect items belonging to a faction  
							
							
							
						 
						
							2014-01-07 20:24:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3c0080d2c1 
								
							 
						 
						
							
							
								
								Implement theft detection  
							
							
							
						 
						
							2014-01-07 19:58:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								887db76ed2 
								
							 
						 
						
							
							
								
								Don't consider swimming or in-air characters as sneaking  
							
							
							
						 
						
							2014-01-07 01:22:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								29c823b9d4 
								
							 
						 
						
							
							
								
								Implement awareness check function. Use this for combat AI and GetDetected instruction.  
							
							
							
						 
						
							2014-01-07 00:51:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								62774fcc4a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into HEAD  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp 
							
						 
						
							2014-01-06 00:23:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								44e96fcaaa 
								
							 
						 
						
							
							
								
								Implement Charm magic effect  
							
							
							
						 
						
							2014-01-05 01:56:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								14b70a3ce6 
								
							 
						 
						
							
							
								
								Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)  
							
							
							
						 
						
							2014-01-05 01:34:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b42240be6d 
								
							 
						 
						
							
							
								
								Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.  
							
							
							
						 
						
							2014-01-03 03:48:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								bfc9fcf2cd 
								
							 
						 
						
							
							
								
								Add starting spells when building player (F_PCStart flag)  
							
							
							
						 
						
							2014-01-01 21:34:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2a8ab932ef 
								
							 
						 
						
							
							
								
								Bug  #951 : Only recalculate derived stats when attributes change  
							
							
							
						 
						
							2013-12-28 17:19:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1c13a9037a 
								
							 
						 
						
							
							
								
								save and load dynamic records  
							
							
							
						 
						
							2013-12-07 13:17:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4b4025ed0f 
								
							 
						 
						
							
							
								
								Keep the player's CharacterController when changing cells. Fixes several glitches.  
							
							
							
						 
						
							2013-11-30 11:01:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								320ba98097 
								
							 
						 
						
							
							
								
								Correct getDerivedDisposition according to wiki (check if player expelled)  
							
							
							
						 
						
							2013-11-21 17:19:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8190fdb16c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2013-11-19 16:56:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e8dcd74741 
								
							 
						 
						
							
							
								
								Recharge enchanted items in player's inventory over time  
							
							
							
						 
						
							2013-11-19 16:42:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								11e254aac8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'gus/AICombat'  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp 
							
						 
						
							2013-11-19 09:10:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gus 
								
							 
						 
						
							
							
							
							
								
							
							
								dff3cf162d 
								
							 
						 
						
							
							
								
								ToggleAI script instruction  
							
							
							
						 
						
							2013-11-18 23:03:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0dc2e829dd 
								
							 
						 
						
							
							
								
								Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.  
							
							
							
						 
						
							2013-11-17 23:31:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2a11618ee7 
								
							 
						 
						
							
							
								
								Make sure the equipped weapon HUD icon is updated properly  
							
							
							
						 
						
							2013-11-17 23:31:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								992a8e9c36 
								
							 
						 
						
							
							
								
								Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.  
							
							
							
						 
						
							2013-11-14 14:41:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emanuel Guevel 
								
							 
						 
						
							
							
							
							
								
							
							
								2786530430 
								
							 
						 
						
							
							
								
								Edit InventoryStore::equip() to call the new unequipSlot function…  
							
							... 
							
							
							
							…to unequip previously equipped item. 
							
						 
						
							2013-11-10 02:45:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								84d259ab8e 
								
							 
						 
						
							
							
								
								Avoid reconstructing strings for updating the dynamic stats  
							
							... 
							
							
							
							Attributes still do this, but they change infrequently enough that it doesn't
matter. 
							
						 
						
							2013-08-28 10:50:29 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								281fdbd81b 
								
							 
						 
						
							
							
								
								Cleanup some redundancy  
							
							
							
						 
						
							2013-08-27 17:56:47 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								33c173a23a 
								
							 
						 
						
							
							
								
								Update the watched Ptr when changing it  
							
							
							
						 
						
							2013-08-27 17:22:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								189541aa72 
								
							 
						 
						
							
							
								
								Apply drowning damage based on the update duration  
							
							... 
							
							
							
							1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat. 
							
						 
						
							2013-08-27 17:08:23 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								5968165de0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'zini/master' into werewolf  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp 
							
						 
						
							2013-08-09 07:00:00 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								46bc7bd9c8 
								
							 
						 
						
							
							
								
								Some cleanup since NpcStats is now also CreatureStats  
							
							... 
							
							
							
							This isn't a thorough cleaning, so keep an eye out for more 
							
						 
						
							2013-08-09 01:14:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PLkolek 
								
							 
						 
						
							
							
							
							
								
							
							
								86020ad94d 
								
							 
						 
						
							
							
								
								Added underwater and drowning sounds.  
							
							
							
						 
						
							2013-08-08 20:57:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PLkolek 
								
							 
						 
						
							
							
							
							
								
							
							
								8f4506f5b6 
								
							 
						 
						
							
							
								
								Implemented drowning.  
							
							... 
							
							
							
							Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red. 
							
						 
						
							2013-08-07 16:46:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7dc30a01cd 
								
							 
						 
						
							
							
								
								Some changes suggested by cppcheck  
							
							
							
						 
						
							2013-07-31 18:46:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Torben Carrington 
								
							 
						 
						
							
							
							
							
								
							
							
								c8c1ddd927 
								
							 
						 
						
							
							
								
								Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.  
							
							
							
						 
						
							2013-05-24 20:10:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c41f119ba6 
								
							 
						 
						
							
							
								
								Added new game button  
							
							
							
						 
						
							2013-05-15 17:54:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								274f3c7b77 
								
							 
						 
						
							
							
								
								Force character state to update after switching view modes  
							
							
							
						 
						
							2013-04-25 07:08:11 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Glorf 
								
							 
						 
						
							
							
							
							
								
							
							
								f9deb593d1 
								
							 
						 
						
							
							
								
								Bugfix  #578  
							
							
							
						 
						
							2013-04-18 21:37:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2693b78536 
								
							 
						 
						
							
							
								
								Add initial player inventory when new game is started  
							
							
							
						 
						
							2013-04-15 02:56:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8bbfba3f43 
								
							 
						 
						
							
							
								
								Fix fatigue not being set to its maximum value when player is rebuilt  
							
							
							
						 
						
							2013-04-07 16:18:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								18e046e628 
								
							 
						 
						
							
							
								
								cleaned up race record struct  
							
							
							
						 
						
							2013-04-04 13:50:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								04aeb3dd07 
								
							 
						 
						
							
							
								
								Rename Mechanics' Activators to Objects  
							
							
							
						 
						
							2013-03-31 17:32:38 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								10d04c928c 
								
							 
						 
						
							
							
								
								Use the object's class to check if it's an actor  
							
							
							
						 
						
							2013-03-31 17:32:38 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								95e1cdc07d 
								
							 
						 
						
							
							
								
								Move getArmorRating to MWWorld::Class.  
							
							
							
						 
						
							2013-03-17 22:29:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								dd57eabc3e 
								
							 
						 
						
							
							
								
								Better use an enum for magic effect IDs  
							
							
							
						 
						
							2013-03-16 23:28:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1666bc7740 
								
							 
						 
						
							
							
								
								Armor rating  
							
							
							
						 
						
							2013-03-16 22:53:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								000128d084 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'zini/master' into misc-cleanup  
							
							
							
						 
						
							2013-02-25 10:38:08 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								48271e49ec 
								
							 
						 
						
							
							
								
								Properly update the Ptr object in the mechanics manager when moving across cells  
							
							
							
						 
						
							2013-02-25 09:57:34 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								88e8659a49 
								
							 
						 
						
							
							
								
								minor cleanup  
							
							
							
						 
						
							2013-02-25 16:52:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								73d48a95f6 
								
							 
						 
						
							
							
								
								Add message box when the player tries to move when being overencumbered.  
							
							
							
						 
						
							2013-02-25 16:31:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								2f8affc955 
								
							 
						 
						
							
							
								
								Make sure the player's controller is properly updated when they change  
							
							
							
						 
						
							2013-02-04 12:58:06 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								ee9b19d2ed 
								
							 
						 
						
							
							
								
								Make sure to remove a Ptr from the activators when requested  
							
							
							
						 
						
							2013-02-04 12:04:06 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								fdabef65a1 
								
							 
						 
						
							
							
								
								Use a method to update an object's cell in the mechanics manager  
							
							... 
							
							
							
							This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells. 
							
						 
						
							2013-01-29 00:19:24 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								8d98f3649c 
								
							 
						 
						
							
							
								
								Use a separate class to handle activator mechanics  
							
							
							
						 
						
							2013-01-28 23:39:11 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								d2f5a886c7 
								
							 
						 
						
							
							
								
								Handle playgroup and skipanim through mwmechanics  
							
							
							
						 
						
							2013-01-16 17:53:18 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								3c02e1ccc9 
								
							 
						 
						
							
							
								
								Run physics right after updating the actors  
							
							
							
						 
						
							2013-01-16 08:22:38 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eduard 
								
							 
						 
						
							
							
							
							
								
							
							
								2dc0064cc2 
								
							 
						 
						
							
							
								
								more string lowercase  
							
							
							
						 
						
							2013-01-09 20:51:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								5f5addf052 
								
							 
						 
						
							
							
								
								fixed an enum  
							
							
							
						 
						
							2012-12-09 00:12:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								75f64aa38b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into dialogue  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp 
							
						 
						
							2012-11-10 15:44:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								0ab4068fbd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/persuasion' into next  
							
							
							
						 
						
							2012-11-10 14:59:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d15eb6cd17 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'greye/player-model' into next  
							
							
							
						 
						
							2012-11-10 12:36:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								b1ef0026a9 
								
							 
						 
						
							
							
								
								race selection/inventory preview character model update  
							
							
							
						 
						
							2012-11-10 11:41:12 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								553ea08eae 
								
							 
						 
						
							
							
								
								consider temporary disposition change when trading  
							
							
							
						 
						
							2012-11-10 00:42:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								33b4b29fbc 
								
							 
						 
						
							
							
								
								persuasion mechanics, added reputation  
							
							
							
						 
						
							2012-11-10 00:29:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ace9ee9c83 
								
							 
						 
						
							
							
								
								persuasion dialog  
							
							
							
						 
						
							2012-11-09 20:18:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f6a9029c4b 
								
							 
						 
						
							
							
								
								bounty & disease disposition effect  
							
							
							
						 
						
							2012-11-09 18:33:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d53a7ade1e 
								
							 
						 
						
							
							
								
								method names, disposition uint->int  
							
							
							
						 
						
							2012-11-09 14:42:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b2afb1fd5c 
								
							 
						 
						
							
							
								
								Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp 
							
						 
						
							2012-11-08 23:16:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								322faf13e4 
								
							 
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2012-11-08 22:37:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								bf4e855260 
								
							 
						 
						
							
							
								
								fixed creatures  
							
							
							
						 
						
							2012-11-08 22:31:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								2a86432887 
								
							 
						 
						
							
							
								
								store birthsign in MWWorld::Player  
							
							
							
						 
						
							2012-11-08 18:50:23 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								0a883f4492 
								
							 
						 
						
							
							
								
								The player can now barter with merchants  
							
							
							
						 
						
							2012-11-08 13:38:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								83e758ee50 
								
							 
						 
						
							
							
								
								clean up interfaces  
							
							
							
						 
						
							2012-11-08 16:37:57 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								9dc9098fa7 
								
							 
						 
						
							
							
								
								update MWBase::World interface since records contains own id  
							
							
							
						 
						
							2012-11-08 01:52:34 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9621bca5 
								
							 
						 
						
							
							
								
								store player record data in ESMStore  
							
							
							
						 
						
							2012-11-08 01:36:43 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								bf98b95955 
								
							 
						 
						
							
							
								
								bugfix  
							
							
							
						 
						
							2012-11-06 13:10:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								2841d831a6 
								
							 
						 
						
							
							
								
								Disposition is now updated everyframe  
							
							
							
						 
						
							2012-11-05 23:16:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								9ebe9cb40c 
								
							 
						 
						
							
							
								
								Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes  
							
							
							
						 
						
							2012-11-05 19:55:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								86ad7a96f4 
								
							 
						 
						
							
							
								
								applying new interface vol.2, inconsistent  
							
							
							
						 
						
							2012-11-05 21:19:22 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								d205723a17 
								
							 
						 
						
							
							
								
								resolving m prefix/ESMStore movement  
							
							
							
						 
						
							2012-11-05 18:02:47 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								2057f5619e 
								
							 
						 
						
							
							
								
								move ESMStore to MWWorld  
							
							
							
						 
						
							2012-11-05 17:18:01 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								3c2ce25f5f 
								
							 
						 
						
							
							
								
								m prefix for mwworld/cellstore.hpp  
							
							
							
						 
						
							2012-11-05 16:07:59 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								f72f898bd9 
								
							 
						 
						
							
							
								
								implement barterOffer. It's used for travel only.  
							
							... 
							
							
							
							I've started to implement disposition, but it's very basic for now. 
							
						 
						
							2012-11-05 11:07:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								453f347ee8 
								
							 
						 
						
							
							
								
								Issue  #68 : added getdeadcount script function  
							
							
							
						 
						
							2012-10-27 11:33:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								bdca5aff87 
								
							 
						 
						
							
							
								
								Issue  #68 : simplified the dynamic stats interface  
							
							
							
						 
						
							2012-10-19 13:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								2fa4ac177a 
								
							 
						 
						
							
							
								
								initial resolving  
							
							
							
						 
						
							2012-10-01 00:23:49 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								872fcf3e3d 
								
							 
						 
						
							
							
								
								sleeping restoration of health, magicka, and fatigue  
							
							
							
						 
						
							2012-09-21 17:53:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								7606ebafd6 
								
							 
						 
						
							
							
								
								resolving conflicts, minor update  
							
							
							
						 
						
							2012-09-17 11:37:50 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e97d23e626 
								
							 
						 
						
							
							
								
								Issue  #361 : reset skill level in race selection stage  
							
							
							
						 
						
							2012-08-16 15:42:37 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								b68f9d6a28 
								
							 
						 
						
							
							
								
								Issue  #107 : MechanicsManager is accessed only through the interface class from now on  
							
							
							
						 
						
							2012-08-11 17:30:55 +02:00