David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
7 years ago |
Nikolay Kasyanov
|
4138723bbf
|
[OS X] Add libc++ to linker flags
|
7 years ago |
Bret Curtis
|
5fa2f46499
|
only set libc++ for APPLE
|
7 years ago |
|
Bret Curtis
|
26c023efe2
|
stdlib to libc++
|
7 years ago |
|
Bret Curtis
|
cb26f52032
|
matching ifs
|
7 years ago |
|
Bret Curtis
|
5a65d6e18d
|
fix std::move
|
7 years ago |
|
Bret Curtis
|
433129e728
|
only bundle with Qt5, for now
|
7 years ago |
|
Bret Curtis
|
dbc29854b2
|
try to fix enums
|
7 years ago |
|
Bret Curtis
|
b657517bea
|
use c++11 and see what happens
|
7 years ago |
Koncord
|
c35d5a2c6c
|
[Master] Implement Master server
|
7 years ago |
|
David Cernat
|
e0234dc362
|
Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
|
7 years ago |
Nikolay Kasyanov
|
7f429f26e1
|
Allow getting available version information even when clone is shallow
|
7 years ago |
|
David Cernat
|
ae23c6d6a5
|
Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
|
7 years ago |
scrawl
|
cdca9b0488
|
Accept bullet 283 on appveyor as well
|
7 years ago |
|
scrawl
|
dfa43af818
|
Update bullet dependency to 2.86
|
7 years ago |
|
David Cernat
|
0fe2d743a7
|
Rename tes3mp-netlauncher into tes3mp-browser
|
7 years ago |
|
David Cernat
|
b1bcba3055
|
Use Qt 5 by default
|
7 years ago |
|
David Cernat
|
76162fbfde
|
Fix netlauncher target properties in CMake for Visual Studio
|
7 years ago |
|
Koncord
|
90908ed113
|
rename openmw-netlauncher to tes3mp-netlauncher
|
7 years ago |
|
Koncord
|
cb799ee446
|
Server browser
|
7 years ago |
|
Koncord
|
27afb91936
|
RPI v3 patch #1
|
7 years ago |
|
David Cernat
|
59c3dbe6af
|
Merge pull request #120 from OpenMW/master while resolving conflicts
# Conflicts:
# README.md
|
7 years ago |
|
David Cernat
|
7bbeed629d
|
Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
|
8 years ago |
|
Nikolay Kasyanov
|
ee7f5d7d85
|
[macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
|
8 years ago |
|
scrawl
|
5297d7b5be
|
Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
|
8 years ago |
Marc Zinnschlag
|
0874d69546
|
increased version number
|
8 years ago |
|
Nikolay Kasyanov
|
db69342b5d
|
[macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
|
8 years ago |
|
David Cernat
|
b028f0b51f
|
Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
|
8 years ago |
Phillip Andrews
|
aeaedbc57a
|
Moved install commands to target-specific cmakelists so that all configurations work.
|
8 years ago |
|
Phillip Andrews
|
7383cc9de4
|
Forgot to undo my test edits because I am a big dum-dum
|
8 years ago |
|
Phillip Andrews
|
59eba1dede
|
Changed tabs to spaces, oops
|
8 years ago |
|
Phillip Andrews
|
2efd38b1ab
|
Fix install procedure so it works with all MSVC build configurations, not just Release
|
8 years ago |
|
David Cernat
|
3136a12051
|
Resolve conflicts in pull request #75
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
|
8 years ago |
|
scrawl
|
105fcc5e20
|
Move the setting of BOOST_COMPONENTS closer to where it's actually used
|
8 years ago |
|
scrawl
|
50bcb65ee0
|
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
|
8 years ago |
|
Nikolay Kasyanov
|
4815938de2
|
[OS X] Add missing plugins to packaging script
Source: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OSG_plugins
Issue: https://bugs.openmw.org/issues/3585
|
8 years ago |
|
David Cernat
|
91a6da9041
|
Merge pull request #67 from OpenMW/master
Add OpenMW commits up to 28 Sep
|
8 years ago |
|
Bret Curtis
|
55fb33670c
|
Make building osgQt dependant on building openmw-cs
|
8 years ago |
|
David Cernat
|
3b7693c719
|
Resolve conflicts in pull request #55
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
|
8 years ago |
Alexander "Ace" Olofsson
|
c01d9e9ec5
|
Only package the Qt 5 platform DLLs on Qt 5
|
8 years ago |
Koncord
|
2567c35434
|
shut up variadic macros warning in GCC
|
8 years ago |
|
David Cernat
|
e9dce26f38
|
Resolve conflicts in pull request #50
# Conflicts:
# CMakeLists.txt
|
8 years ago |
|
Alexander "Ace" Olofsson
|
c9d4ff35c4
|
Install Qt5 platform DLLs on Windows
|
8 years ago |
|
Alexander "Ace" Olofsson
|
d781846f53
|
Fix the /bigobj issue and some script cleanup
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
|
8 years ago |
|
Alexander "Ace" Olofsson
|
dd5b6a46f5
|
Visual Studio 2015 support
|
8 years ago |
|
David Cernat
|
4d2ca20445
|
Resolve conflicts in pull request #43
# Conflicts:
# README.md
|
8 years ago |
|
Marc Zinnschlag
|
cc7b1f8543
|
Merge branch 'openmw-40'
|
8 years ago |
|
David Cernat
|
d31046204f
|
Use tes3mp icon for executable
|
8 years ago |
|
David Cernat
|
2ac0c4e689
|
Rename openmw to tes3mp for Windows too...
|
8 years ago |
|
David Cernat
|
436548413e
|
Resolve conflicts in pull request #39
# Conflicts:
# CMakeLists.txt
|
8 years ago |