fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
f7969fb178
Merge pull request #1317 from Siimacore/master
...
Correcting https://bugs.openmw.org/issues/3906
8 years ago
b0abed00e5
Correcting https://bugs.openmw.org/issues/3906
8 years ago
dbf149f9b2
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
8 years ago
d799954ca0
replace and purge boost::math::gcd and other non-used headers
8 years ago
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
8 years ago
f7dc30387c
Run tes3mp-netlauncher instead openmw in the OpenMW Launcher
8 years ago
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
8 years ago
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
9d125bcaa2
Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
...
Fix various build issues with Visual Studio environment
8 years ago
c18fc113e5
Changed missing library dependencies to simple fix
8 years ago
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
8 years ago
59eba1dede
Changed tabs to spaces, oops
8 years ago
1861302dbd
Include various libraries for Visual Studio environment
8 years ago
3420121c3f
Fix shadowing warnings
8 years ago
5d4734c02e
Use local path from configuration manager to load openmw.cfg in launcher
8 years ago
125e94ef0e
Fix shadowing warnings
8 years ago
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
21d13a48fa
Make setup method of MainDialog class private
9 years ago
a5411c1ec2
Remove unused code
9 years ago
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
2142d0d2d6
Make Qt5 happy
9 years ago
177a6f4a68
Launcher: ensure to clear previous settings when reloading settings
9 years ago
ace4cfc0a8
Fix 'duplicate setting' errors when running installation wizard
9 years ago
2ffcc2a2b4
Fix incorrect path encoding handling in debug message
9 years ago
d894d54e41
Improve path conversions
9 years ago
84aceedfa2
Add comment
9 years ago
325d208b4a
Fix incorrect error message
9 years ago
3747843c92
Use QString::toInt instead of atoi
9 years ago
c26463fd91
Should have coded it the way scrawl said, since it's cleaner.
9 years ago
a9c9cc5508
Remove unnecessary copy of mEngineSettings in mInitialSettings.
9 years ago
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
9 years ago
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
9 years ago
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
9 years ago
18da95e4f8
Make openmw-launcher pass comments through settings.cfg, and reuse the
...
Settings::Manager code to do most of the work. Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one. Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
9 years ago
014a2fc0e9
OS X: do not override Qt plugin path
9 years ago
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
9 years ago
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
10 years ago
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
c783b50a83
Fix config file priority in the launcher to match OpenMW
10 years ago
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
David Cernat
scrawl
Siimacore
Bret Curtis
Koncord
Nikolay Kasyanov
Phillip Andrews
Allofich
Alexander "Ace" Olofsson
Rob Cutmore
cfcohen
cc9cii
Marc Zinnschlag
Rohit Nirmal
dteviot
Marco Schulze
Sebastian Wick
MiroslavR