| 
								
								
									 Armin Preiml | fa077ccdc4 | Merge remote branch 'upstream/master' | 2010-08-08 10:09:10 +02:00 |  | 
				
					
						| 
								
								
									 Armin Preiml | 305563e595 | disabled char encoding method for windows, although you'll need to add the iconv libs | 2010-08-08 10:07:02 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7afc8ffd2e | Merge branch 'container' Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp | 2010-08-07 20:33:07 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 2eee3d32f1 | fixed World::disable function | 2010-08-07 20:29:10 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | a7fe28ecbe | implemented take action | 2010-08-07 20:25:17 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | aa637cb9d4 | added RemoveItem | 2010-08-07 17:00:04 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | db24a55e36 | added sanity check for AddItem arguments | 2010-08-07 16:34:49 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 589f8b5ede | added GetItemCount | 2010-08-07 16:21:07 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 3ea85b4619 | added AddItem instruction | 2010-08-07 15:11:31 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 0a60bde834 | added insertIntoContainer function to class hierarchy | 2010-08-06 22:20:20 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | b5d59edd44 | re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing) | 2010-08-06 19:25:26 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d42747e85b | Merge branch 'master' into dialogue Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp | 2010-08-06 19:20:05 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | c806415f08 | changed namespace, class and function names to ensure consistent spelling | 2010-08-06 19:16:44 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d6541d4f3c | changed file names to ensure consistent spelling | 2010-08-06 19:10:56 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 09c42589cc | implemented npc/creature activation (enters dialog gui mode for now) | 2010-08-06 18:15:46 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 8045320ac9 | added dialog manager | 2010-08-06 18:01:34 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7611572065 | cleanup | 2010-08-06 15:25:54 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 6b1b3b20fd | store info records in dialogue records | 2010-08-06 15:23:13 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d47de55ce9 | read info records | 2010-08-06 15:19:39 +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 | 8e6a765603 | fixed a stats bug (reducing modified stats via setModified didn't work correctly | 2010-08-05 16:40:21 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | c883921af3 | minor cell change fix | 2010-08-05 15:57:06 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 1902dfb7b2 | added activate instruction | 2010-08-05 15:52:07 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 15124601aa | stop local scripts from being run twice in case of activation | 2010-08-05 15:46:50 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7a313f24ab | integrated activation into script system | 2010-08-05 15:40:03 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | f630157bf8 | implemented basic object activation | 2010-08-05 13:51:26 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 2d695cc806 | routed activate signal from input sub-system to engine-class | 2010-08-05 13:36:33 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 87c84e6fcd | limited activation range according to GMST settings | 2010-08-05 13:29:49 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | ee7570f7e7 | added containerstore | 2010-08-04 14:37:23 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | e0a3b1b1db | implemented item count | 2010-08-04 14:04:22 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7ba6bdb56c | prepared InterpreterContext for activation implementation | 2010-08-03 22:43:53 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 052d049a6c | integrated name-lookup into ape's code; added missing implementation of a function | 2010-08-03 22:06:48 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 5827591d05 | Merge commit 'ape/master' Conflicts:
	apps/openmw/mwworld/world.hpp | 2010-08-03 21:52:19 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 69ea00455f | Merge branch 'poly' Conflicts:
	apps/openmw/mwworld/world.cpp | 2010-08-03 21:43:05 +02:00 |  | 
				
					
						| 
								
								
									 Armin Preiml | adc209d135 | Implemented the faced handle method to the engine. Faced handles will be written to stdout every 10th frame. | 2010-08-03 20:40:45 +02:00 |  | 
				
					
						| 
								
								
									 Armin Preiml | c000bfb43d | moved object focus code to mwscene | 2010-08-03 20:17:31 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d1c000313f | added getPtr function that works via Ogre handle | 2010-08-03 20:01:52 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 002345270b | implemented teleport doors (only for the player for now) | 2010-08-03 18:44:52 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7e5ddae3b3 | modified action interface to allow other actors besides the player | 2010-08-03 18:22:01 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | c38b02bd5c | added action interface | 2010-08-03 18:20:15 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 239498bcd4 | added getName function | 2010-08-03 17:11:41 +02:00 |  | 
				
					
						| 
								
								
									 Armin Preiml | b50c7e0788 | Some experimental implementation of a RaySceneQuery. | 2010-08-03 16:26:43 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | f50ced4616 | added missing record classes | 2010-08-03 15:24:44 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 0851044fa6 | removed superfluous includes | 2010-08-03 14:43:14 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | bfc282779b | added item health interface | 2010-08-03 14:14:04 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 93754b2851 | moved some includes around | 2010-08-03 13:32:37 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 33b6a0b800 | moved concrete record classes to separate sub-system (mwclass) | 2010-08-03 13:17:31 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 9d6e658e05 | previous commit was missing some files | 2010-08-03 13:03:08 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | ca842d1b4d | reimplemented access to creature stats via new class interface | 2010-08-03 11:49:12 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | a70c3876a2 | added foundation for esm record class hierarchy | 2010-08-03 11:14:57 +02:00 |  |