AnyOldName3
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
2018-12-18 19:51:27 +00:00
Chris Djali
066b74eb43
Merge pull request #2078 from AnyOldName3/cmake-13.1-osg-lib-fix
...
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY
2018-12-18 19:23:44 +00:00
Bret Curtis
44a408635a
wrap git command in gitfound
2018-12-17 16:30:12 +01:00
Bret Curtis
76d380e852
if unable to run git at this moment, use empty string
2018-12-16 20:58:14 +01:00
AnyOldName3
dcbca4b90b
Use if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
2018-12-14 14:30:56 +00:00
AnyOldName3
9067731a96
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist.
2018-12-13 02:08:35 +00:00
Bret Curtis
b8b1a52216
add commit date; revert boost as we are not breaking anything yet
2018-12-12 10:27:09 +01:00
Bret Curtis
6596c400f3
indentation
2018-12-11 21:34:11 +01:00
Bret Curtis
fc10adb608
makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml
2018-12-11 21:30:37 +01:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
Bret Curtis
caad388c26
bump our versions to 0.46, keep this commit in mind when trying to automate this into one place
2018-11-14 16:32:24 +01:00
Bret Curtis
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
2018-11-14 10:01:12 +01:00
Andrei Kortunov
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
2018-11-03 22:34:25 +04:00
AnyOldName3
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-03 00:27:40 +00:00
AnyOldName3
719c9f0766
Remove compile definition which inadvertently broke other compile definitons
2018-11-02 18:39:46 +00:00
AnyOldName3
a5afae71e6
Remove unwanted compile definition.
2018-11-02 17:18:10 +00:00
AnyOldName3
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
2018-11-02 01:05:39 +00:00
AnyOldName3
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-01 16:48:21 +00:00
elsid
4c82470933
Do not build recastnavigation tests
2018-11-01 17:01:22 +01:00
elsid
bc59a3c455
Build recastnavigation static libraries
2018-11-01 17:01:22 +01:00
elsid
792a0585c0
Add recastnavigation as subdirectory
2018-11-01 17:01:22 +01:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Andrei Kortunov
d3defd83fc
Disable C4643 MSVC warning, caused by boost
2018-09-04 13:05:30 +04:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
Capostrophic
d000f2756e
Update disabled warnings
2018-07-10 14:20:26 +03:00
Capostrophic
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
2018-07-10 14:20:25 +03:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
Marc Zinnschlag
cae744161b
increased version number
2018-06-04 15:08:22 +02:00
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
2018-05-28 09:08:30 +04:00
AnyOldName3
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-05-27 15:41:42 +01:00
Andrei Kortunov
48e15dabc3
Try to generate PDB for release builds
2018-05-25 14:25:04 +04:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
scrawl
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.
2018-04-18 12:36:09 +00:00
bret curtis
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
2018-03-27 20:20:40 +02:00
Harald H
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
2018-03-08 21:23:24 +01:00
AnyOldName3
451d0de463
Remove dependency on osgAnimation that somehow snuck in
2018-02-27 16:18:42 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-12-26 23:52:25 +00:00
Thunderforge
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
2017-12-16 14:36:27 -06:00
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2017-12-08 23:26:08 +00:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
AnyOldName3
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-07 22:08:21 +00:00
scrawl
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
2017-11-05 16:18:34 +00:00
Miloslav Číž
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
2017-11-05 15:37:38 +00:00
Bret Curtis
d19839a666
standerdise on 3.1.0
2017-10-25 21:55:58 +02:00
Alexander "Ace" Olofsson
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
2017-10-24 23:05:56 +02:00
Marc Zinnschlag
0153b54c3f
increased version number
2017-10-23 14:08:08 +02:00
AnyOldName3
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-19 15:06:49 +01:00
