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
Marc Zinnschlag
d8fa2f201a
improved description of openmw.cfg related cmake-variable
2011-04-28 21:55:09 +02:00
Marc Zinnschlag
d47abff25d
create local openmw.cfg file for uninstalled version
2011-04-28 21:55:08 +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
Nikolay Kasyanov
fcfe267fc9
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
2011-04-28 21:55:05 +02:00
Nikolay Kasyanov
7168795ae6
components/esm header refactoring in progress. Refactored:
...
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
2011-04-28 21:55:05 +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
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
7f0a75c803
Merge branch 'config'
2011-04-28 10:26:51 +02:00
Marc Zinnschlag
3cb994764c
Merge remote branch 'corristo/header-refactoring'
2011-04-28 10:22:33 +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
Marc Zinnschlag
042c179ce7
fixed the openmw.cfg install problem (I hope)
2011-04-28 09:30:45 +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
Jan-Peter Nilsson
73f2fdfa72
Update default version and add libbullet2.77 as a dependency
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
