Pieter van der Kloet
|
7c1f00884d
|
Merge remote-tracking branch 'upstream/master' into newlauncher
|
2011-05-08 20:21:57 +02:00 |
|
Marc Zinnschlag
|
8829398bfc
|
added --fs-strict switch
|
2011-05-05 19:56:16 +02:00 |
|
Marc Zinnschlag
|
ef1e986a87
|
added --data-local switch
|
2011-05-05 19:50:28 +02:00 |
|
Marc Zinnschlag
|
e60f0e3b38
|
--data switch accepts multiple directories now
|
2011-05-05 19:39:11 +02:00 |
|
Marc Zinnschlag
|
6e880cffb2
|
changed engine class to support multiple data directories for esm files
|
2011-05-05 19:32:42 +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
|
7b554897e7
|
Merge remote-tracking branch 'upstream/master' into newlauncher
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
components/esm/defs.hpp
components/esm/loadappa.hpp
components/esm/loadbody.hpp
components/esm/loadclas.hpp
components/esm/loadcrea.hpp
components/esm/loadsndg.hpp
components/interpreter/installopcodes.cpp
|
2011-04-28 22:05:53 +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 |
|
Jan-Peter Nilsson
|
1899e5dc1e
|
If there is an openmw.cfg in the current path, use it as global config
|
2011-04-28 21:55:08 +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 |
|
Pieter van der Kloet
|
c17eed26f3
|
Removed whitespace
|
2011-04-28 21:55:06 +02:00 |
|
Pieter van der Kloet
|
a747bfb575
|
Moved the stylesheet to the Play page
|
2011-04-28 21:55:06 +02:00 |
|
Pieter van der Kloet
|
8f679218bd
|
Added stylesheet implementation for the Play tab
|
2011-04-28 21:55:06 +02:00 |
|
Pieter van der Kloet
|
94f3bc115f
|
Added missing resource file
|
2011-04-28 21:55:06 +02:00 |
|
Marc Zinnschlag
|
d481222d92
|
all program options (except help) can now be used from a cfg file
|
2011-04-28 21:55:06 +02:00 |
|
Marc Zinnschlag
|
6dba09462a
|
change in multi_es branch broke fps switch; fixed now
|
2011-04-28 21:55:05 +02:00 |
|
Marc Zinnschlag
|
38c69f68c6
|
allow multiple --master and --plugin command line arguments
|
2011-04-28 21:55:05 +02:00 |
|
Pieter van der Kloet
|
5754a132c5
|
More modifications
|
2011-04-28 21:55:05 +02:00 |
|
Pieter van der Kloet
|
fc095b902d
|
Added some more new files
|
2011-04-28 21:55:04 +02:00 |
|
Pieter van der Kloet
|
d1a75253d7
|
Huge rewrite, implementing all the new ideas for the launcher
|
2011-04-28 21:54:41 +02:00 |
|
Marc Zinnschlag
|
5b6ec405e3
|
Merge branch 'script'
|
2011-04-28 10:30:32 +02:00 |
|
Marc Zinnschlag
|
58cbdfd762
|
Merge branch 'journal'
|
2011-04-28 10:27:18 +02:00 |
|
Marc Zinnschlag
|
8b9ee30924
|
user/global mixup
|
2011-04-28 10:15:04 +02:00 |
|
Marc Zinnschlag
|
bdfd28f44d
|
adjusted components/files namespace; some related cleanup
|
2011-04-28 09:56:50 +02:00 |
|
Marc Zinnschlag
|
7131c08ca4
|
moved path.hpp/path.cpp to a new component
|
2011-04-28 09:39:40 +02:00 |
|
Jan-Peter Nilsson
|
4189704b5f
|
Initialize member variables in the same order they are defined to avoid compiler warning
|
2011-04-27 12:34:52 +02:00 |
|
Jan-Peter Nilsson
|
6aa1f3efdd
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
2011-04-27 12:34:52 +02:00 |
|
Jan-Peter Nilsson
|
b22234109d
|
Remove unused variable (compiler warning)
|
2011-04-27 12:34:52 +02:00 |
|
Pieter van der Kloet
|
fbdc10f0b0
|
Removed some leftover files and more testing
|
2011-04-27 12:34:52 +02:00 |
|
Pieter van der Kloet
|
96e7df36e5
|
Added a proof-of-concept datafiles implementation to replace the old dialog
|
2011-04-27 12:34:52 +02:00 |
|
Pieter van der Kloet
|
1e62d8451f
|
More testing and removing
|
2011-04-27 12:34:52 +02:00 |
|
Pieter van der Kloet
|
74eef82902
|
Messing around with a new datafilesdialog
|
2011-04-27 12:34:44 +02:00 |
|
Marc Zinnschlag
|
125319c441
|
splitting off console output from messageBox channel
|
2011-04-26 21:48:13 +02:00 |
|
Marc Zinnschlag
|
f52e6bd5ef
|
made toggle-type script instructions more verbose
|
2011-04-26 21:38:21 +02:00 |
|
Marc Zinnschlag
|
e18dde4571
|
added topic tracking
|
2011-04-26 20:48:36 +02:00 |
|
Marc Zinnschlag
|
7a1b215b6a
|
splitting of topic class from quest class
|
2011-04-26 20:39:59 +02:00 |
|
Marc Zinnschlag
|
3406d2fa89
|
removed redundant data from quest class
|
2011-04-26 20:22:50 +02:00 |
|
Marc Zinnschlag
|
944291d34f
|
added quest tracking to the journal
|
2011-04-26 20:08:37 +02:00 |
|
Marc Zinnschlag
|
fc2d659925
|
Merge remote branch 'jpn/config' into config
|
2011-04-24 12:20:38 +02:00 |
|
Marc Zinnschlag
|
65e43c448a
|
splitted StampedJournalEntry class off from JournalEntry
|
2011-04-22 11:16:39 +02:00 |
|
Marc Zinnschlag
|
f4f12e885f
|
all program options (except help) can now be used from a cfg file
|
2011-04-21 18:23:46 +02:00 |
|
Marc Zinnschlag
|
8915e8a751
|
change in multi_es branch broke fps switch; fixed now
|
2011-04-21 18:10:35 +02:00 |
|
Marc Zinnschlag
|
9ea99a46ee
|
Merge branch 'multi_es'
|
2011-04-21 18:07:32 +02:00 |
|
Marc Zinnschlag
|
f3fecdc627
|
quest entries are added to main journal now
|
2011-04-21 11:05:49 +02:00 |
|
Marc Zinnschlag
|
792de880cf
|
another constness fix
|
2011-04-21 11:00:00 +02:00 |
|
Marc Zinnschlag
|
717b5e1784
|
fixed a constness problem
|
2011-04-21 10:49:45 +02:00 |
|
Marc Zinnschlag
|
23464e4035
|
added interface and container for main journal
|
2011-04-19 11:02:22 +02:00 |
|
Marc Zinnschlag
|
5851e0a28c
|
added journal entry struct
|
2011-04-19 10:54:11 +02:00 |
|
Jan-Peter Nilsson
|
f2faa34bd9
|
If there is an openmw.cfg in the current path, use it as global config
|
2011-04-09 11:31:06 +02:00 |
|
Marc Zinnschlag
|
53e0e38862
|
added missing TCL instruction
|
2011-04-06 09:49:00 +02:00 |
|
Marc Zinnschlag
|
f321e549a4
|
added instruction GetPCCell
|
2011-04-04 15:10:37 +02:00 |
|
Marc Zinnschlag
|
e4a0702bb4
|
added journal-related script instructions
|
2011-04-04 14:49:26 +02:00 |
|
Marc Zinnschlag
|
b40117449a
|
added journal script interface
|
2011-04-04 11:23:15 +02:00 |
|
Marc Zinnschlag
|
190f77f6c9
|
added journal class
|
2011-04-04 11:16:56 +02:00 |
|
Jan-Peter Nilsson
|
dc4e6216c3
|
Initialize member variables in the same order they are defined to avoid compiler warning
|
2011-04-03 13:20:42 +02:00 |
|
Jan-Peter Nilsson
|
a94de76801
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
2011-04-03 13:20:42 +02:00 |
|
Jan-Peter Nilsson
|
2e2d490c78
|
Remove unused variable (compiler warning)
|
2011-04-03 13:20:18 +02:00 |
|
Pieter van der Kloet
|
082902473b
|
Changed the readConfig function to work with the new master/plugin options in openmw.cfg
|
2011-03-29 22:15:44 +02:00 |
|
Pieter van der Kloet
|
1d873c56a8
|
Fixed the "Restore defaults" function.
|
2011-03-29 20:15:15 +02:00 |
|
Pieter van der Kloet
|
493018322d
|
Added function to write the list of plugins to openmw.cfg
|
2011-03-29 20:12:10 +02:00 |
|
Pieter van der Kloet
|
aa54975a2f
|
Removed the directoryLoaded() signal as it's only available in Qt 4.7.
|
2011-03-29 17:07:24 +02:00 |
|
Marc Zinnschlag
|
beb1422c77
|
allow multiple --master and --plugin command line arguments
|
2011-03-29 13:57:56 +02:00 |
|
Pieter van der Kloet
|
7a03266729
|
Initial commit of the launcher
|
2011-03-29 01:36:26 +02:00 |
|
Pieter van der Kloet
|
833a61dd82
|
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
|
2011-03-28 17:36:05 +02:00 |
|
Marc Zinnschlag
|
53e1d0e7e7
|
more cleanup
|
2011-03-23 23:05:15 +01:00 |
|