| 
								
								
									 scrawl | 3ba24aee0d | Merge branch 'alchemy' into next | 2012-05-25 13:37:40 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 0ca7a52975 | Merge branch 'master' into next | 2012-05-25 13:37:33 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 9b623a79ff | Merge branch 'master' into alchemy | 2012-05-25 13:14:27 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 09c870ad68 | first alchemy window layout (not pretty) | 2012-05-25 12:58:28 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7f6835f59f | Merge remote branch 'scrawl/guimode_stacking' | 2012-05-24 19:14:43 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 51b8a76a68 | merged by branches together, starting with alchemy window Merge branch 'guimode_stacking' into next
Conflicts:
	apps/openmw/mwgui/mode.hpp | 2012-05-24 15:57:23 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | c2b818373e | adjust tooltip skin, now is never transparent | 2012-05-24 15:11:45 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | a3a22e9096 | ingredient tooltip shows possible effects | 2012-05-24 14:47:57 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 38208653be | Merge pull request #4 from ChrisKCat/sound-volume-updates Sound volume updates | 2012-05-24 05:41:45 -07:00 |  | 
				
					
						| 
								
								
									 Chris Robinson | 05fd8f0211 | Update the actual sounds and music volume when settings change | 2012-05-24 05:30:22 -07:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 684208dfc9 | Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager | 2012-05-24 13:26:07 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | c0ee382c72 | Issue #176: made actor deregistration more robust | 2012-05-24 13:21:52 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 57d834b14b | fixed an issue with interactive messagebox | 2012-05-24 12:05:43 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 6ea7bdb224 | vsync & fps buttons, sound volume apply fix | 2012-05-24 11:50:48 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | cbe89f7e32 | copy&paste mistake | 2012-05-24 08:56:45 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 189b044392 | small correction | 2012-05-24 04:37:41 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 9b94edd561 | audio tab with volume sliders | 2012-05-24 04:34:53 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | cb35f4d208 | some unrelated gui cleanup | 2012-05-24 03:50:02 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | a1907e7b88 | cleaning up mwgui/widgets part 1 | 2012-05-24 03:48:02 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 7ebbc099b3 | allow stacking gui modes | 2012-05-23 12:23:35 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 689cf7ce05 | ConfirmationDialog | 2012-05-23 05:28:25 +02:00 |  | 
				
					
						| 
								
								
									 Jason Hooks | 0066ef9b54 | Some cleanup | 2012-05-22 21:40:24 -04:00 |  | 
				
					
						| 
								
								
									 scrawl | 656a8f1be9 | working menu transparency slider | 2012-05-23 01:32:36 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 972c035e97 | TabControl skin, settings window categories | 2012-05-22 23:35:05 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 313294c522 | settings window (hotkey F2) which does nothing. Yay! | 2012-05-22 21:40:42 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | b25d62a7e2 | rename antialiasing mode "MSAA 0" to "none" to avoid confusion. | 2012-05-22 20:52:38 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | ad46049ee0 | got the launcher working with the new settings system. | 2012-05-22 20:37:18 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 355268dae1 | make the launcher build and run again, but it doesn't change settings | 2012-05-22 19:36:50 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 343bbaf0fd | integrated video settings in the settings file, the launcher is now useless | 2012-05-22 03:36:03 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | b494533bb2 | another change to the readme file | 2012-05-21 12:54:23 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7aad0cc069 | updated readme file | 2012-05-21 12:44:57 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 3673cd2531 | increased version number | 2012-05-21 12:41:15 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 7938566004 | Merge remote branch 'scrawl/graphics' Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp | 2012-05-21 11:24:36 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 76d733d2b3 | Merge remote branch 'scrawl/inventoryGUI' | 2012-05-21 11:17:11 +02:00 |  | 
				
					
						| 
								
								
									 gugus | dac98b2213 | Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling | 2012-05-21 11:02:10 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | bda90b77bc | oops, forgot something | 2012-05-21 10:59:06 +02:00 |  | 
				
					
						| 
								
								
									 gugus | ca9224ed7f | starting scale function | 2012-05-21 10:58:04 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 157dd81524 | removed script instruction, will be in the settings window later | 2012-05-21 10:57:49 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 5f6e8224f4 | skill progress | 2012-05-21 10:48:25 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 3e85151c9d | Merge remote branch 'scrawl/inventoryGUI' Conflicts:
	apps/openmw/CMakeLists.txt | 2012-05-21 10:13:27 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 8f2c8bbea4 | Merge branch 'master' into graphics | 2012-05-21 09:50:46 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 789dfe1c88 | fix a bug with water reflection plane height | 2012-05-21 09:50:02 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | b2d207130d | vastly improved look of the GUI, skin background textures now use tiling instead of stretching | 2012-05-21 08:14:22 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 40c52c5d09 | max faction rank crashfix | 2012-05-21 05:19:20 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 1079bb2677 | finished tooltips for everything in the stats window, some gui refactoring | 2012-05-21 05:14:07 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 76d71f86bc | fixed a faction case folding issue | 2012-05-21 03:10:55 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 4a009fc2bb | faction tooltip (doesn't handle player having max. rank) | 2012-05-21 02:58:06 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 8ce4727424 | skill tooltips | 2012-05-21 01:58:11 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 6518eb7794 | some cleanup | 2012-05-20 22:55:14 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 1c7110fbf5 | birthsign tooltip | 2012-05-20 22:45:30 +02:00 |  |