Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								be70d197e5 
								
							 
						 
						
							
							
								
								Merge branch 'next'  
							
							... 
							
							
							
							Conflicts:
	.gitignore
	cmake/FindOGRE.cmake 
							
						 
						
							2012-03-02 12:11:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								4c2fffdd61 
								
							 
						 
						
							
							
								
								temporarily disabled multi data path support in OpenMW  
							
							
							
						 
						
							2012-02-28 09:27:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8b5da06fce 
								
							 
						 
						
							
							
								
								Merge branch 'next' into weather  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp 
							
						 
						
							2012-02-20 18:33:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e02cba58b1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into next  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwclass/light.cpp 
							
						 
						
							2012-02-20 14:34:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8186445de9 
								
							 
						 
						
							
							
								
								fix for a very silly bug  
							
							
							
						 
						
							2012-02-16 21:06:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8244ed5860 
								
							 
						 
						
							
							
								
								workaround for space in paths problem  
							
							
							
						 
						
							2012-02-16 09:26:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e1defd3595 
								
							 
						 
						
							
							
								
								adjusted the globally installed openmw.cfg file  
							
							
							
						 
						
							2012-02-14 09:25:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								7bf8497215 
								
							 
						 
						
							
							
								
								Fixed CMake problem with Ogre plugins path  
							
							
							
						 
						
							2012-02-07 21:41:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								705b2955a0 
								
							 
						 
						
							
							
								
								Feature  #162  - Need to create app bundle using CMake, not by hand.  
							
							... 
							
							
							
							In progress, working towards plugins support. 
							
						 
						
							2012-01-30 00:28:02 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								6716bf649e 
								
							 
						 
						
							
							
								
								Some stylesheet improvements and a drop-shadow for the scroll background  
							
							
							
						 
						
							2011-06-26 23:16:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								24947d800a 
								
							 
						 
						
							
							
								
								Fixed launcher config and style location. Launcher will be started when opening bundle  
							
							
							
						 
						
							2011-06-26 21:04:17 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								db20186e50 
								
							 
						 
						
							
							
								
								Added newline to the end of some files, GitHub was complaining about it  
							
							
							
						 
						
							2011-06-24 21:46:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								118765a274 
								
							 
						 
						
							
							
								
								Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files  
							
							
							
						 
						
							2011-06-24 21:42:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								409bd0fe7e 
								
							 
						 
						
							
							
								
								Moved the stylesheet to main.cpp and made some stylesheet-related changes  
							
							
							
						 
						
							2011-05-10 22:47:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								2b0dabe669 
								
							 
						 
						
							
							
								
								Changed profile switching again; Some stylesheet modifications  
							
							
							
						 
						
							2011-05-03 02:46:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								557e659e15 
								
							 
						 
						
							
							
								
								CMake modifications, stylesheet gets copied to destination dir now  
							
							
							
						 
						
							2011-05-02 20:07:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d47abff25d 
								
							 
						 
						
							
							
								
								create local openmw.cfg file for uninstalled version  
							
							
							
						 
						
							2011-04-28 21:55:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								eaea48011d 
								
							 
						 
						
							
							
								
								Now working mac app bundle generated during build  
							
							... 
							
							
							
							(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated. 
							
						 
						
							2011-04-28 21:55:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								943eea8104 
								
							 
						 
						
							
							
								
								.app bundle finally works  
							
							
							
						 
						
							2011-03-08 22:27:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								527ac956a7 
								
							 
						 
						
							
							
								
								More correct MacOS X bundle generation  
							
							
							
						 
						
							2011-03-07 06:03:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								4028600768 
								
							 
						 
						
							
							
								
								Builds on OS X now  
							
							
							
						 
						
							2011-03-07 05:09:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jan-Peter Nilsson 
								
							 
						 
						
							
							
							
							
								
							
							
								753a4f681e 
								
							 
						 
						
							
							
								
								Search for plugins in orgre lib directory  
							
							
							
						 
						
							2011-01-13 21:18:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jan-Peter Nilsson 
								
							 
						 
						
							
							
							
							
								
							
							
								4221824681 
								
							 
						 
						
							
							
								
								Build debian package using cpack if dpkg is available  
							
							... 
							
							
							
							Derive version from last tag and get name and email for package maintainer from user's git config if .git is available 
							
						 
						
							2011-01-12 18:18:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jan-Peter Nilsson 
								
							 
						 
						
							
							
							
							
								
							
							
								d1b482d64a 
								
							 
						 
						
							
							
								
								Update plugins.cfg based on where cmake found ogre libraries  
							
							
							
						 
						
							2011-01-12 18:18:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jan Borsodi 
								
							 
						 
						
							
							
							
							
								
							
							
								0f860e2fbd 
								
							 
						 
						
							
							
								
								openmw.cfg is now created with a configurable path (via cmake), the default is still "data"  
							
							
							
						 
						
							2010-09-10 13:38:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ardekantur 
								
							 
						 
						
							
							
							
							
								
							
							
								25ba9933f6 
								
							 
						 
						
							
							
								
								Mac Build - heinous additions for bundle management  
							
							
							
						 
						
							2010-06-25 21:28:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								6b6e42b641 
								
							 
						 
						
							
							
								
								removed unused BSP scene manager from plugins.cfg  
							
							
							
						 
						
							2010-06-11 19:59:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								9a041d7c01 
								
							 
						 
						
							
							
								
								added data option and openmw.cfg file  
							
							
							
						 
						
							2010-06-11 19:53:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nicolay Korslund 
								
							 
						 
						
							
							
							
							
								
							
							
								e8c6caa0b5 
								
							 
						 
						
							
							
								
								Fixed DOS line endings on certain files  
							
							
							
						 
						
							2010-06-06 18:04:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e973270f9b 
								
							 
						 
						
							
							
								
								fixed minor bug in previous commit; more clean up  
							
							
							
						 
						
							2010-06-06 13:04:23 +02:00