Sebastian Wick
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1fea97c3b
								
							
						 | 
						
							
							
								
								use SDL for resolution -> multimonitor support
							
							
							
							
							
						 | 
						
							2013-06-23 03:49:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c8a04d9cb
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp 
							
						 | 
						
							2013-06-15 17:41:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcf35d3871
								
							
						 | 
						
							
							
								
								Removed the UI cursor sensitivity slider
							
							
							
							
							
						 | 
						
							2013-06-12 20:27:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								403704b92a
								
							
						 | 
						
							
							
								
								Use openmw.png for SDL_SetWindowIcon
							
							
							
							
							
						 | 
						
							2013-06-12 16:15:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd08677a7f
								
							
						 | 
						
							
							
								
								Merge branch 'openmw24'
							
							
							
							
							
						 | 
						
							2013-06-12 10:37:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								daab4f55a3
								
							
						 | 
						
							
							
								
								Use Morrowind's fonts
							
							
							
							
							
						 | 
						
							2013-06-06 22:26:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3595a6a2e
								
							
						 | 
						
							
							
								
								Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
							
							
							
							
							
						 | 
						
							2013-06-02 21:43:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								de5a08a07d
								
							
						 | 
						
							
							
								
								Version should be 100 for GLSLES
							
							
							
							
							
						 | 
						
							2013-05-25 05:40:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2c88acc7b
								
							
						 | 
						
							
							
								
								GLSLES: only the fragment shader needs precision explicitely set.
							
							
							
							
							
						 | 
						
							2013-05-25 04:26:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc747d8ae4
								
							
						 | 
						
							
							
								
								GLSL ES: precision qualifiers are required
							
							
							
							
							
						 | 
						
							2013-05-25 04:23:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e7cf4ae1c
								
							
						 | 
						
							
							
								
								GLES2 experiment
							
							
							
							
							
						 | 
						
							2013-05-25 04:15:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									riothamus
								
							 
						 | 
						
							
							
							
							
								
							
							
								885d12e867
								
							
						 | 
						
							
							
								
								updated hud layout
							
							
							
							
							
						 | 
						
							2013-05-22 22:06:22 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									riothamus
								
							 
						 | 
						
							
							
							
							
								
							
							
								39bd8894a9
								
							
						 | 
						
							
							
								
								Bug 787
							
							
							
							
							
						 | 
						
							2013-05-20 16:39:24 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								54f56b0515
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'graffy76/usersettings'
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp 
							
						 | 
						
							2013-05-16 18:04:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c4a963132
								
							
						 | 
						
							
							
								
								Container UI rewrite
							
							
							
							
							
						 | 
						
							2013-05-11 18:38:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								90b7df439f
								
							
						 | 
						
							
							
								
								Fix image buttons
							
							
							
							
							
						 | 
						
							2013-05-08 13:55:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6203cac2a
								
							
						 | 
						
							
							
								
								update for master
							
							
							
							
							
						 | 
						
							2013-05-07 20:33:42 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								8845c0cee1
								
							
						 | 
						
							
							
								
								Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
							
							
							
							
							
						 | 
						
							2013-05-07 17:38:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1413ca56b
								
							
						 | 
						
							
							
								
								Synced font code ranges.
							
							
							
							
							
						 | 
						
							2013-05-06 15:17:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef9f0b2fc0
								
							
						 | 
						
							
							
								
								Fix size of quest index
							
							
							
							
							
						 | 
						
							2013-05-05 11:56:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								78e6dab9d2
								
							
						 | 
						
							
							
								
								Dialogue history rewrite WIP
							
							
							
							
							
						 | 
						
							2013-05-04 14:15:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								03f4e91ceb
								
							
						 | 
						
							
							
								
								Unrelated shadows fix
							
							
							
							
							
						 | 
						
							2013-05-03 23:08:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f58edb9db
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
							
							
							
							
							
						 | 
						
							2013-05-03 18:17:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1a659e2ac
								
							
						 | 
						
							
							
								
								Bugfix #730
							
							
							
							
							
						 | 
						
							2013-05-02 14:49:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a42556aa5
								
							
						 | 
						
							
							
								
								Merge branch 'master' into HEAD
							
							
							
							
							
						 | 
						
							2013-04-30 14:54:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nathan Jeffords
								
							 
						 | 
						
							
							
							
							
								
							
							
								718af692c9
								
							
						 | 
						
							
							
								
								reworked journal to match bethesda's implemenation
							
							
							
							
							
						 | 
						
							2013-04-24 20:20:01 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nathan Jeffords
								
							 
						 | 
						
							
							
							
							
								
							
							
								85595245ab
								
							
						 | 
						
							
							
								
								Updated journal layout to match Bethesda's version more closely
							
							
							
							
							
						 | 
						
							2013-04-24 20:20:00 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Emanuel Guevel
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0102954f1
								
							
						 | 
						
							
							
								
								Add non-breaking space to font code range
							
							
							
							
							
						 | 
						
							2013-04-25 01:42:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								23b477a938
								
							
						 | 
						
							
							
								
								Fix normal maps with spaces in filename not getting loaded
							
							
							
							
							
						 | 
						
							2013-04-12 04:36:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c70074dd7
								
							
						 | 
						
							
							
								
								Fix combinedAlpha
							
							
							
							
							
						 | 
						
							2013-04-11 15:17:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d29921913
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'zini/master' into nifogre
							
							
							
							
							
						 | 
						
							2013-04-09 15:12:19 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e7d555cdf
								
							
						 | 
						
							
							
								
								Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.
							
							
							
							
							
						 | 
						
							2013-04-09 20:31:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								01a1a0b846
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'zini/master' into nifogre
							
							
							
							
							
							
							
							Conflicts:
	components/nifogre/ogrenifloader.cpp 
							
						 | 
						
							2013-04-08 11:46:57 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								343e2027af
								
							
						 | 
						
							
							
								
								Support NIF detail maps
							
							
							
							
							
						 | 
						
							2013-04-08 15:17:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								3768e04a0c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'zini/master' into nifogre
							
							
							
							
							
						 | 
						
							2013-04-07 17:24:47 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								88c81bfb24
								
							
						 | 
						
							
							
								
								Apply polygon_mode to objects
							
							
							
							
							
						 | 
						
							2013-04-07 07:38:43 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								4daaa4030d
								
							
						 | 
						
							
							
								
								Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
							
							
							
							
							
						 | 
						
							2013-04-07 00:12:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								e50b6b1cfe
								
							
						 | 
						
							
							
								
								Apply texture matrix 0 in the object shader
							
							
							
							
							
						 | 
						
							2013-04-06 09:45:26 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								75b462b974
								
							
						 | 
						
							
							
								
								If alpha rejection was forced, we also need to force depth_write and depth_check
							
							
							
							
							
						 | 
						
							2013-04-05 18:24:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								8dd7f0c53a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'scrawl/normalmap'
							
							
							
							
							
						 | 
						
							2013-04-03 19:46:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9b56eedc3
								
							
						 | 
						
							
							
								
								Support NIF "glow maps", which are basically an emissive channel.
							
							
							
							
							
						 | 
						
							2013-04-03 18:51:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Glorf
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae3e4ecf8b
								
							
						 | 
						
							
							
								
								Finished enchanting
							
							
							
							
							
						 | 
						
							2013-04-03 18:02:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								5625d73d84
								
							
						 | 
						
							
							
								
								Bump texture support
							
							
							
							
							
						 | 
						
							2013-04-03 17:16:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								857f2b33db
								
							
						 | 
						
							
							
								
								Fix companion layout align
							
							
							
							
							
						 | 
						
							2013-03-31 14:48:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc6e1fd981
								
							
						 | 
						
							
							
								
								Add missing files
							
							
							
							
							
						 | 
						
							2013-03-31 14:36:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0199c703c
								
							
						 | 
						
							
							
								
								Companion UI
							
							
							
							
							
						 | 
						
							2013-03-31 13:13:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								a031c77619
								
							
						 | 
						
							
							
								
								Improved enchanting layout
							
							
							
							
							
						 | 
						
							2013-03-30 15:56:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a359ba6a2f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'scrawl/graphics'
							
							
							
							
							
						 | 
						
							2013-03-30 11:18:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									vorenon
								
							 
						 | 
						
							
							
							
							
								
							
							
								a49e524541
								
							
						 | 
						
							
							
								
								Reduced width of textboxes in race menu
							
							
							
							
							
							
							
							The width of the text box was too large and MyGui didn't align the texts properly. Fixed with the help of the MyGui layout editor. 
							
						 | 
						
							2013-03-30 03:07:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									vorenon
								
							 
						 | 
						
							
							
							
							
								
							
							
								f93cefa201
								
							
						 | 
						
							
							
								
								Changed Y position of the textboxes
							
							
							
							
							
						 | 
						
							2013-03-29 21:26:40 +01:00 | 
						
						
							
							
							
								
							
							
						 |