bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
a9b95596bc
Add a missed trailing new line.
7 years ago
8c74f16247
Restore trailing new lines to shrink PR
7 years ago
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
7 years ago
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
7 years ago
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
c920d083e4
Correcting https://bugs.openmw.org/issues/3906 .
8 years ago
df67ae4689
Merge pull request #229 from OpenMW/master
...
Add OpenMW commits up to 20 Jun 2017
8 years ago
41fb17f39b
Revert "Correcting https://bugs.openmw.org/issues/3906 "
...
This reverts commit b0abed00e5
8 years ago
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
David Cernat
AnyOldName3
Siimacore
scrawl
Bret Curtis
Koncord
Nikolay Kasyanov
Phillip Andrews
Allofich
Alexander "Ace" Olofsson
Rob Cutmore
cfcohen