68886e7539
Add OpenMW commits up to 2 Dec 2018
...
# Conflicts:
# .travis.yml
# README.md
5 years ago
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
5 years ago
056591b957
Add OpenMW commits up to 14 Sep 2018
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
a0e89208a0
[General] Fix standalone server build
6 years ago
caad388c26
bump our versions to 0.46, keep this commit in mind when trying to automate this into one place
6 years ago
25e4156940
enable niftest by default, coverity branch covers everything but openmw now due to timeouts; we run coverity manually for openmw for now; re-order options to be readable and logical sequence
6 years ago
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
6 years ago
719c9f0766
Remove compile definition which inadvertently broke other compile definitons
6 years ago
a5afae71e6
Remove unwanted compile definition.
6 years ago
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
6 years ago
4c82470933
Do not build recastnavigation tests
6 years ago
bc59a3c455
Build recastnavigation static libraries
6 years ago
792a0585c0
Add recastnavigation as subdirectory
6 years ago
d3defd83fc
Disable C4643 MSVC warning, caused by boost
6 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
d000f2756e
Update disabled warnings
7 years ago
7fd66c77e6
Update CMake lists for Windows
...
Don't use the debug console on Release-mode builds
Disable spammy 4297 and 5032 warnings that are not specific to OpenMW
7 years ago
3e52857e2b
[General] Fix build for client and construction set
7 years ago
7a032baaa3
[General] Move OSG hack to ELSE branch
7 years ago
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
cae744161b
increased version number
7 years ago
de2513653e
AppVeyor: build with Release configuration
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
48e15dabc3
Try to generate PDB for release builds
7 years ago
6c7d73af7f
Bump c++ standard version to 14
7 years ago
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
789f552ad4
Delete old mygui_resource_plugin which is unlikely to be brought back in its current form because resources can't be accessed by MyGUI's editor if not using the Ogre resources system.
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
7 years ago
282800b5b2
Create LICENSE ( #1532 )
...
* Create LICENSE
Let's add the license file so that GitHub officially registers it and displays it next to the project.
* move license files
* update licenses in cmakelists.txt
* fix link in README
7 years ago
d19839a666
standerdise on 3.1.0
7 years ago
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
7 years ago
0153b54c3f
increased version number
7 years ago
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
David Cernat
Koncord
Bret Curtis
Andrei Kortunov
AnyOldName3
elsid
Capostrophic
Koncord
Marc Zinnschlag
Kyle Cooley
scrawl
Harald H
Thunderforge
Miloslav Číž
Alexander "Ace" Olofsson