Commit Graph

1405 Commits (9872c895397e46e6c488a12ea5d80cbfe6d84b6c)
 

Author SHA1 Message Date
Pieter van der Kloet 9a218b12c8 Deleted some leftover resource files 14 years ago
Pieter van der Kloet 1fc18075ff Modified config loading function to always read/write from userPath
There is no need for default (global) settings yet
14 years ago
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
14 years ago
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
14 years ago
Pieter van der Kloet 24f2c57c32 Added missing resource file 14 years ago
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
14 years ago
Pieter van der Kloet e4129ce26e Fixed config loading problem 14 years ago
Pieter van der Kloet 64d636574e More configfile stuff 14 years ago
Pieter van der Kloet 0fc4767846 Some renaming and ugly support for getPath 14 years ago
Pieter van der Kloet 4ee748552b More messing around with the launcher config file 14 years ago
Pieter van der Kloet 5f6b4a853f Removed leftover files 14 years ago
Marc Zinnschlag d8fa2f201a improved description of openmw.cfg related cmake-variable 14 years ago
Marc Zinnschlag d47abff25d create local openmw.cfg file for uninstalled version 14 years ago
Jan-Peter Nilsson 1899e5dc1e If there is an openmw.cfg in the current path, use it as global config 14 years ago
Pieter van der Kloet 84ee3b585c Added ability to get the previous profile when a new one is selected 14 years ago
Pieter van der Kloet 04bc42a5c7 Added combobox slot for changing the profile 14 years ago
Pieter van der Kloet 274bce22c3 Added writeConfig in Data Files tab and implemented the close button 14 years ago
Pieter van der Kloet 5f19f6cfce Added a function which returns the checked plugin names 14 years ago
Pieter van der Kloet e01afe1595 Included new header 14 years ago
Pieter van der Kloet c911f62e8b Added ability to get the previous profile when a new one is selected 14 years ago
Pieter van der Kloet be47750a45 Added combobox slot for changing the profile 14 years ago
Pieter van der Kloet c68a4743bd Added uncheck all function 14 years ago
Pieter van der Kloet a321685e7a Modifications to the writeConfig function 14 years ago
Pieter van der Kloet 8c4fad1f59 Added writeConfig in Data Files tab and implemented the close button 14 years ago
Pieter van der Kloet de78b81a8f Added a function which returns the checked plugin names 14 years ago
Pieter van der Kloet c17eed26f3 Removed whitespace 14 years ago
Pieter van der Kloet a747bfb575 Moved the stylesheet to the Play page 14 years ago
Pieter van der Kloet 8f679218bd Added stylesheet implementation for the Play tab 14 years ago
Pieter van der Kloet 94f3bc115f Added missing resource file 14 years ago
Marc Zinnschlag d481222d92 all program options (except help) can now be used from a cfg file 14 years ago
Marc Zinnschlag 6dba09462a change in multi_es branch broke fps switch; fixed now 14 years ago
Marc Zinnschlag 38c69f68c6 allow multiple --master and --plugin command line arguments 14 years ago
Nikolay Kasyanov fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
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
14 years ago
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.
14 years ago
Pieter van der Kloet 5754a132c5 More modifications 14 years ago
Pieter van der Kloet fc095b902d Added some more new files 14 years ago
Pieter van der Kloet d1a75253d7 Huge rewrite, implementing all the new ideas for the launcher 14 years ago
Marc Zinnschlag 5b6ec405e3 Merge branch 'script' 14 years ago
Marc Zinnschlag 58cbdfd762 Merge branch 'journal' 14 years ago
Marc Zinnschlag 7f0a75c803 Merge branch 'config' 14 years ago
Marc Zinnschlag 3cb994764c Merge remote branch 'corristo/header-refactoring' 14 years ago
Marc Zinnschlag 8b9ee30924 user/global mixup 14 years ago
Marc Zinnschlag bdfd28f44d adjusted components/files namespace; some related cleanup 14 years ago
Marc Zinnschlag 7131c08ca4 moved path.hpp/path.cpp to a new component 14 years ago
Marc Zinnschlag 042c179ce7 fixed the openmw.cfg install problem (I hope) 14 years ago
Jan-Peter Nilsson 4189704b5f Initialize member variables in the same order they are defined to avoid compiler warning 14 years ago
Jan-Peter Nilsson 6aa1f3efdd Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 14 years ago
Jan-Peter Nilsson b22234109d Remove unused variable (compiler warning) 14 years ago
Jan-Peter Nilsson 73f2fdfa72 Update default version and add libbullet2.77 as a dependency 14 years ago