3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
609e146a22
Build fixes for windows
10 years ago
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
10 years ago
0efe8f5465
Fix broken launcher build for windows.
10 years ago
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
10 years ago
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
10 years ago
d3b7cf44d3
Remove user preference setting option.
10 years ago
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
10 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
913caf96bd
Merge branch 'openmw-36'
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
34f106749a
removed a redundant typedef
10 years ago
7d321e0fb7
Fix #2557
...
Don’t show main dialog right away if wizard is selected.
10 years ago
ccab8cc9a1
Register Player in the PhysicsSystem
10 years ago
c1edc30ad7
Dead code removal
10 years ago
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
cac288d5be
Remove OgreInit
10 years ago
997347b01e
Silence -Wreorder warnings.
10 years ago
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
10 years ago
cc815c63f1
Fix: no longer loose changes when run install wizard or iniimport.
10 years ago
84762c4eb8
Progress bar at 0% shows no text.
10 years ago
5eadffd0c4
Make launcher's version label selectable so it can be copy-pasted into issue reports
10 years ago
9708e8529f
Removed unneeded include.
10 years ago
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
10 years ago
03257ecae5
QString encoding fix
10 years ago
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
10 years ago
ea21fbcbe6
Merge remote-tracking branch 'dteviot/master'
10 years ago
cac250a90d
Fixed typo in comment.
10 years ago
9d9cabf40d
Fix: Importer creates a single Content List ( Fixes #2345 )
10 years ago
9825b68dfb
Fix SDL eating SIGINT signals in the launcher ( Fixes #2328 )
10 years ago
0c6e2170db
Include cleanup
10 years ago
82ff737c31
Merge remote-tracking branch 'scrawl/master'
10 years ago
57a259c526
Remove references to no longer used font
10 years ago
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
e298589e7f
Reorganised DataFilesPage.cpp code.
...
Removed some recursive calling of saveSettings() and loadSettings().
10 years ago
942cf26eee
And the missing includes
10 years ago
7a903b7100
Doing forward declaration instead
10 years ago
0c1d762790
Fix build when using new boost with Ogre.
...
This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
10 years ago
fcbf7d7deb
Fixed string formatting minor error found by Mingun.
10 years ago
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
10 years ago
063388e0eb
Change "Profile" to "Content List" in user visible strings in Launcher. ( Fixes #810 )
10 years ago
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
10 years ago
6cd5b78ca7
Fix missing include in apps/launcher/main.cpp
10 years ago
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
a62e15d93d
Read profile files from LauncherSettings in load order.
10 years ago
2fa0764c89
Merge remote-tracking branch 'swick/master'
10 years ago
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
10 years ago
3cc32b641a
Fix some memory leaks
10 years ago
639fbfad0b
make borderless setting available to the UI
10 years ago
8ed376af5e
Launcher: fix changing active profile through the Play page
10 years ago
1937ace1b7
Launcher: fix bugs deleting profiles ( Fixes #2188 )
10 years ago
33019b93b4
Fix bug setting current launcher profile on startup (Bug #2188 )
10 years ago
a4e32d23c6
Fix old profile content not being cleared correctly when saving content file selection ( Fixes #2173 )
10 years ago
1e06f69d9e
Remove the "browse to existing installation" button, now replaced by the wizard
...
Clean up some debug spam
10 years ago
c6558fe487
Fix Ogre being initialised twice
10 years ago
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
10 years ago
0dc08e2983
Properly add libunshiled include dir
10 years ago
f0d3fc73d5
fix uninitialized pointer fields in GraphicsPage class
10 years ago
6d12374ace
Move windows platform specific files into a common directory.
10 years ago
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
11 years ago
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
11 years ago
0cc7c06262
Ensure the launcher is not shown when the wizard is run
11 years ago
6348af586e
Fixed some problems with the launcher and the wizard
11 years ago
a390dde818
Fixed importing configurations of existing installations
11 years ago
5af12d193a
Cleaned up old wizard stuff from launcher
11 years ago
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
beba58268c
Fix a typo within the launcher. Fixes bug #1058 .
11 years ago
cb598f0455
the same for data-local entry
11 years ago
28b59f4008
process paths as UTF-8 in launcher
11 years ago
e02b04536f
fix most vexing parse issue
11 years ago
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
11 years ago
cd990a665a
create QString from utf-8 when expected
11 years ago
f69d61976e
minor performance improvements in other apps subdirectories
11 years ago
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
11 years ago
af883991e2
Reimplemented the old new profile dialog behaviour
11 years ago
30c3c3e245
Working on importing content lists in the launcher
11 years ago
f8bb797b8a
Settings tab is fully functional now
11 years ago
21c406316f
Working on the Settings tab: start the importer/wizard
11 years ago
cfe66abbc5
Started working on the settings tab
11 years ago
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
11 years ago
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
11 years ago
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
11 years ago
b43325119a
Some changes to the version retrieval: ignore shallow clones
11 years ago
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
11 years ago
802448b217
Added a settings page to the launcher
11 years ago
19bef4fce8
Distinguish between release and development builds
11 years ago
c354cd52be
Added compile date and time to the version info in the launcher
11 years ago
fa186f5ec1
Added version information to the launcher
11 years ago
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
11 years ago
828e5841d8
Windows SDL fix
11 years ago
scrawl
cc9cii
Marc Zinnschlag
Rohit Nirmal
Nikolay Kasyanov
dteviot
Alexander "Ace" Olofsson
Marco Schulze
Sebastian Wick
MiroslavR
Thoronador
slothlife
pvdk
Kevin Poitra
greye
gus