mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 13:26:38 +00:00
Code Issues Releases Wiki Activity
5948 commits 115 branches 76 tags 128 MiB
Commit graph

266 commits

Author SHA1 Message Date
Pieter van der Kloet
6a2bcddef5 Changed the way the launcher exits and polished the error handling code 2012-06-20 23:25:22 +02:00
Marc Zinnschlag
1b368506d4 Merge remote branch 'pvdk/filedialog' 2012-06-20 16:05:20 +02:00
Pieter van der Kloet
d162445e68 Got rid of some unwanted warnings and did some cleanup on the launcher 2012-06-20 13:35:05 +02:00
Marc Zinnschlag
95d9c99d0d Merge remote branch 'pvdk/filedialog' 2012-06-20 09:28:43 +02:00
Pieter van der Kloet
e21442f6cc Fix for Bug #306: launcher now creates the config dir and returns proper error codes 2012-06-20 02:28:49 +02:00
scrawl
61ec56debc don't add duplicate resolutions 2012-06-19 16:02:28 +02:00
scrawl
c9e76d3e90 remove extra tokens at the end of the resolution string, if present 2012-06-19 15:57:58 +02:00
Marc Zinnschlag
4a726f272b Merge remote branch 'pvdk/filedialog' 2012-06-17 09:58:39 +02:00
Pieter van der Kloet
f81e127701 Created custom directory dialog which only accepts Data Files dirs 2012-06-17 06:48:32 +02:00
scrawl
b831c3313d render system was not written on launcher exit 2012-06-17 00:47:45 +02:00
Pieter van der Kloet
0bcec32c70 Changed launcher logo to the new one done by Necrod 2012-06-11 02:50:29 +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
Pieter van der Kloet
4488be33ce Added missing slash to launcher CMakeLists.txt 2012-03-29 00:12:34 +02:00
Marc Zinnschlag
2b2eb34f8f Merge remote branch 'corristo/master' into next 2012-03-28 18:07:21 +02:00
Nikolay Kasyanov
66b31d3d43 Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces 2012-03-28 12:04:42 +04:00
Pieter van der Kloet
155cd76f37 Changed Launcher font to EB Garamond and added license info 2012-03-24 20:43:35 +01:00
Pieter van der Kloet
73a1b256a8 Changed warning dialog text to be less ambiguous 2012-03-22 12:42:08 +01:00
Pieter van der Kloet
fd4826d06f Fix for Bug #222, config is always written to user location now 2012-03-22 12:34:43 +01:00
Pieter van der Kloet
0b517d15c1 Made missing data files dialog less scary and added exception handling for esmreader 2012-03-20 02:49:59 +01:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Pieter van der Kloet
1ed1c29db9 Fix Boost path problem for Boost versions below 1.43 2012-03-12 14:46:48 +01:00
Pieter van der Kloet
96c0b8760e Got rid of the console showing up on Windows and removed libpng stuff 2012-03-12 02:37:40 +01:00
Pieter van der Kloet
2429f3960f Merge remote-tracking branch 'upstream/master' into launcher 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
 2012-03-05 23:43:59 +01:00
Nikolay Kasyanov
b283ad86fb revert to old launcher stylesheet location on OS X 2012-03-01 17:16:44 +04:00
Pieter van der Kloet
5ffa3264b2 Appended resources/ to the stylesheet path 2012-03-01 04:38:37 +01:00
Pieter van der Kloet
11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 2012-02-28 22:45:03 +01:00
Pieter van der Kloet
b320733e45 Fixed Qt exits, this time for all occurrences 2012-02-28 21:00:02 +01:00
Pieter van der Kloet
5b54a658d8 Launcher improvements: ask for data dir and write it to cfg if none is found 
and prevent removal of the default profile
 2012-02-28 17:19:44 +01:00
Pieter van der Kloet
1512481c07 Changed the way whitespace was removed from retrieved Ogre values 2012-02-28 17:18:01 +01:00
Marc Zinnschlag
7aaa7f185f same for launcher 2012-02-28 09:46:48 +01:00
Nikolay Kasyanov
d58b408ae1 Deploying Qt image format plugins on OS X considered useless 2012-02-27 19:00:06 +04:00
Lukasz Gromanowski
c9a1789db8 Bug fix for processing data paths in OpenMW Launcher. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-25 10:20:42 +01:00
Pieter van der Kloet
280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 2012-02-22 08:34:47 +01:00
Marc Zinnschlag
547d6a0639 Merge remote branch 'lgro/config' into config 2012-02-21 11:50:23 +01:00
Lukasz Gromanowski
0c0b594090 Issue #168 - Configuration cleanup 
Removed unnecessary path methods - according to forum disscusion:

http://openmw.org/forum/viewtopic.php?f=6&t=448

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-20 00:02:00 +01:00
Marc Zinnschlag
d9c1ed3d5e Merge remote branch 'corristo/osx-packaging' into config 2012-02-15 10:32:16 +01:00
Nikolay Kasyanov
2020d916ec added missing comment 2012-02-15 11:30:35 +04:00
Nikolay Kasyanov
57a4b19880 Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete 2012-02-15 11:27:51 +04:00
Marc Zinnschlag
27caee664e Merge remote branch 'lgro/config' into config 
Conflicts:
	components/files/path.hpp
 2012-02-13 16:36:57 +01:00
Nikolay Kasyanov
5a42c6c6f5 Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher 2012-02-13 10:31:43 +04:00
Pieter van der Kloet
eea8773be1 Changed the order of preference for the configuration files 2012-02-10 21:45:46 +01:00
Nikolay Kasyanov
472d88e2c5 Feature #162 - Need to create app bundle using CMake, not by hand WIP 2012-02-01 20:48:13 +04:00
Lukasz Gromanowski
7c24ae9ac7 Issue #168 - Configuration cleanup - WIP 
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-01-21 01:31:20 +01:00
Marc Zinnschlag
9794c4b928 Merge branch 'cmake' 2011-11-06 14:42:18 +01:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Marc Zinnschlag
4e25200844 fixed usage of Qt exit 2011-11-03 09:08:40 +01:00
Jacob Essex
0e3859385d Now ensures that the directory to the config file exists before Ogre tries to access it 2011-11-02 11:11:27 +00:00
Pieter van der Kloet
5dbbc5bb7b Changed error handling for Ogre config and made the launcher exit cleanly 2011-10-12 23:02:27 +02:00
Pieter van der Kloet
9e34f30500 Merge remote-tracking branch 'upstream/master' 2011-10-04 00:40:41 +02:00
Marc Zinnschlag
22514cbd4c Merge branch 'debfix' 2011-09-30 09:36:21 +02:00
Marc Zinnschlag
9872c89539 packaging fixes for .deb packages 2011-09-30 09:36:06 +02:00
Pieter van der Kloet
6bfaf221e8 Created working icon for Windows and removed QMake file (not parsed by CMake) 2011-09-28 02:57:57 +02:00
Marc Zinnschlag
7c8853f6fe post-merge fixes 2011-09-27 09:45:28 +02:00
Alexander "Ace" Olofsson
0defc590bc Quick fix for always using OpenGL rendering, no matter the selected rendersystem 2011-09-07 10:17:46 +02:00
Pieter van der Kloet
ada552ed1f Added tooltip with plugin info and visual indication of missing masters 2011-09-06 21:37:08 +02:00
Pieter van der Kloet
b7ae31d5fe Fixed a context menu bug which caused an assert on empty view 2011-09-06 20:45:45 +02:00
Pieter van der Kloet
c9be134226 Fixed config file writing when file does not exist 2011-09-06 15:57:40 +02:00
Pieter van der Kloet
3e6658428b Removed commented line 2011-09-06 03:54:37 +02:00
Pieter van der Kloet
889e7d6c2e Config file handling changes to use the right priority and behave like openmw 2011-09-06 03:50:40 +02:00
Pieter van der Kloet
b60bb408fd Added some useful error messages when things go wrong with Ogre 2011-09-06 02:02:34 +02:00
Pieter van der Kloet
ccfd011df6 Modified write function to always use user location for openmw.cfg 2011-09-06 02:00:18 +02:00
Lukasz Gromanowski
d43455fd57 Issue #168: Configuration cleanup, part 2 
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-09-02 22:45:21 +02:00
Lukasz Gromanowski
54cb6deab9 Issue #168: Configuration cleanup, part 2 2011-09-02 20:01:24 +02:00
Pieter van der Kloet
ceb8190121 Modified config saving to use Ogre's own methods instead of custom stuff 2011-09-01 05:53:08 +02:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
Pieter van der Kloet
50773448d9 Small change in the way config files are found, now includes global config and error handling 2011-08-13 22:35:06 +02:00
Alexander "Ace" Olofsson
a931124a2f Changed the confg writer, it now creates configs identical to those created by Ogre itself. This seems to have solved a small issue with Ogre always using OpenGL rendering even when Direct3D was selected in Windows. 2011-08-02 19:54:19 +02:00
Alexander "Ace" Olofsson
141e779e81 Some small launcher fixes 2011-08-02 19:21:27 +02:00
Pieter van der Kloet
b51ab69ab7 Merge remote-tracking branch 'upstream/newlauncher' into newlauncher 2011-07-31 19:51:27 +02:00
Pieter van der Kloet
88edbad717 Changed plugins.cfg lookup code to include the global directory 2011-07-31 19:17:52 +02:00
Pieter van der Kloet
8c4a246abd Disabled Ogre debug output to stdout/stderr 2011-07-31 18:13:24 +02:00
Pieter van der Kloet
3fb99fa4b5 Modified Ogre exception handling to get rid of a compiler warning 2011-07-31 17:43:16 +02:00
Marc Zinnschlag
14704e65a1 minor fix 2011-07-31 10:42:42 +02:00
Pieter van der Kloet
1b536d69f3 Added and removed some debugging information 2011-07-30 19:19:24 +02:00
Pieter van der Kloet
18d8d89bdb Removed all debug messages 2011-07-30 03:09:29 +02:00
Pieter van der Kloet
c9c54fed8f Modified Boost fix to work with Boost ≥ 1.46 2011-07-29 21:39:20 +02:00
Marc Zinnschlag
0acf34a0de boost compatibility fix 2011-07-28 10:03:44 +02:00
Pieter van der Kloet
57a18d4a24 Combobox hack should be applied to the play tab, not the data files tab. Fixed it. 2011-07-16 15:40:40 +02:00
Pieter van der Kloet
53d778762e Added dirty hack to get the combobox to work on Mac and GTK platforms 2011-07-15 15:04:06 +02:00
Pieter van der Kloet
7cbed6c58a Replaced some costly string-comparisons with QLatin1String 2011-06-26 23:35:23 +02: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
1278ce2514 Fixed problem with png images 2011-06-26 15:37:06 +02:00
Pieter van der Kloet
9f88796648 Appended a space to the Current Profile: label 2011-06-26 02:07:35 +02:00
Nikolay Kasyanov
d2a0d3dd67 Launcher: small fix for mac 2011-06-26 01:35:46 +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
8b58e53be9 Removed debug messages and cleaned up some old code 2011-06-24 18:01:24 +02:00
Pieter van der Kloet
dcf4d242a5 Added warning message if Ogres config cannot be read 2011-06-24 17:46:02 +02:00
Pieter van der Kloet
83e642678f Put the filter input in a toolbar and made it work with a shortcut (Alt+F) 2011-06-24 17:38:32 +02:00
Pieter van der Kloet
15df25f947 Cleaned up the CMakeList file 2011-06-24 17:37:12 +02:00
Pieter van der Kloet
371ec41530 Plugins moved using the actions now keep their selection too 2011-06-10 00:30:08 +02:00
Pieter van der Kloet
6feaac3d6f Removed isChecked function, can be done with less code 2011-06-08 17:40:39 +02:00
Pieter van der Kloet
410229e521 Dropped plugins now retain their selection so you can see where they went 2011-06-08 16:55:53 +02:00
Pieter van der Kloet
8b50cd48f5 Added refresh functionality for the plugins table 2011-06-07 21:14:27 +02:00
Pieter van der Kloet
44e3cf17d7 Fallback icons for the actions in the right-click context menu 2011-06-07 21:00:23 +02:00
Pieter van der Kloet
8495d91d7c Added right-click context menu for modifying the plugins, e.g. move up, check/uncheck 2011-06-07 20:21:01 +02:00
Pieter van der Kloet
9d2bf8af62 Added support for the load order of plugins specified in the profiles 2011-06-07 01:42:53 +02:00
Pieter van der Kloet
f219b0d47a Added error messages and fixed config file loading 2011-06-06 21:33:33 +02:00
Pieter van der Kloet
8c04d00a50 Modified row height of the plugins table to use the height of checkbox instead of dynamic resizing 2011-06-06 16:07:20 +02:00
Pieter van der Kloet
eba813b4ac Fixed clear button in the filter line-edit and changed "delete profile" icon 2011-05-13 01:58:26 +02:00
Pieter van der Kloet
157822eeaf Removed what's this? button from dialog titlebar 2011-05-11 22:44:11 +02:00
Pieter van der Kloet
b877a94481 Modified the launcher to use the new multi-dir plugin approach 2011-05-11 22:23:37 +02:00
Pieter van der Kloet
ac965af671 Moved functions around for better readability 2011-05-11 20:09:11 +02:00
Pieter van der Kloet
d3143c6e52 Implemented filter function for the plugin list 2011-05-11 20:04:25 +02:00
Pieter van der Kloet
9b439d74da Removed some leftover files belonging to the old launcher 2011-05-11 18:48:42 +02:00
Pieter van der Kloet
b9acc4a0ac Implemented the Graphics page, launcher now loads and saves Ogre settings 2011-05-11 01:12:25 +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
a0586cda99 Complete support for fallback icons on Windows using the Tango theme 2011-05-10 18:00:15 +02:00
Pieter van der Kloet
76653cb2d5 Started working on fallback icons for Windows 2011-05-09 22:38:52 +02:00
Pieter van der Kloet
1487daac3d Fixed preprocessor #if to #ifdef 2011-05-04 03:22:23 +02:00
Pieter van der Kloet
0ff068817e Fixed icon and changed minimumsize 2011-05-03 16:26:22 +02:00
Pieter van der Kloet
dbd37a6d58 Added messageboxes for game execution errors 2011-05-03 16:16:53 +02:00
Pieter van der Kloet
2131452fac Fixed file loading problem with relative paths when launcher wasn't run from cmdline 2011-05-03 15:09:21 +02:00
Pieter van der Kloet
c42f99a586 Implemented starting the game by pressing either the big play button or the dialog play button 2011-05-03 03:17:01 +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
7bf21262a1 Plugins and masters from the current profile are written to openmw.cfg now 2011-05-03 02:01:25 +02:00
Pieter van der Kloet
a68be84b7f Re-implemented the profile combobox on the Play page 2011-05-03 01:23:35 +02:00
Pieter van der Kloet
4dbdc1cb26 Implemented copy and delete profile functions 2011-05-03 01:13:40 +02:00
Pieter van der Kloet
9e852a36bf Changed all QList<> to const 2011-05-03 00:47:12 +02:00
Pieter van der Kloet
ee4a2d0a8d Fixed a problem with the currentprofile not being set in the combobox 2011-05-03 00:43:44 +02:00
Pieter van der Kloet
ba3e4330f2 Changed the way the masters get retrieved in masterSelectionChanged 2011-05-03 00:36:20 +02:00
Pieter van der Kloet
2e058409bd Fixed problem with profile writeout 2011-05-02 23:06:11 +02:00
Pieter van der Kloet
314bac7862 Preliminary support for new profiles and some other modifications and cleanups 2011-05-02 22:21:42 +02:00
Pieter van der Kloet
557e659e15 CMake modifications, stylesheet gets copied to destination dir now 2011-05-02 20:07:37 +02:00
Pieter van der Kloet
366ade0e5f Modified Play page, widgets are now properly centered 2011-05-02 17:47:51 +02:00
Pieter van der Kloet
8256343d77 Masters in the data directory are loaded now, even when they don't have dependent plugins 2011-04-29 01:54:20 +02:00
Pieter van der Kloet
9a218b12c8 Deleted some leftover resource files 2011-04-28 23:08:05 +02:00
Pieter van der Kloet
1fc18075ff Modified config loading function to always read/write from userPath 
There is no need for default (global) settings yet
 2011-04-28 22:54:50 +02:00
Pieter van der Kloet
7747c78584 Fixed the use of path.hpp, which is in a CMake component now 
Also fixed some leftover lines from a wrongly modified conflict
 2011-04-28 22:23:42 +02:00
Pieter van der Kloet
24f2c57c32 Added missing resource file 2011-04-28 21:55:10 +02:00
Pieter van der Kloet
4f18452ef6 Merged clean newlauncher branch with config 
Conflicts:

	apps/launcher/CMakeLists.txt
	apps/launcher/datafilesdialog.cpp
	apps/launcher/datafilesdialog.h
	apps/launcher/lineedit.hpp
	apps/launcher/maindialog.cpp
	apps/launcher/resources.qrc
	apps/launcher/resources/images/openmw-icon.png
 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
e4129ce26e Fixed config loading problem 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
64d636574e More configfile stuff 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
0fc4767846 Some renaming and ugly support for getPath 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
4ee748552b More messing around with the launcher config file 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
5f6b4a853f Removed leftover files 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
84ee3b585c Added ability to get the previous profile when a new one is selected 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
04bc42a5c7 Added combobox slot for changing the profile 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
274bce22c3 Added writeConfig in Data Files tab and implemented the close button 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
5f19f6cfce Added a function which returns the checked plugin names 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
e01afe1595 Included new header 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
c911f62e8b Added ability to get the previous profile when a new one is selected 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
be47750a45 Added combobox slot for changing the profile 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
c68a4743bd Added uncheck all function 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
a321685e7a Modifications to the writeConfig function 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
8c4fad1f59 Added writeConfig in Data Files tab and implemented the close button 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
de78b81a8f Added a function which returns the checked plugin names 2011-04-28 21:55:07 +02:00