3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
8 years ago
c01d9e9ec5
Only package the Qt 5 platform DLLs on Qt 5
8 years ago
2567c35434
shut up variadic macros warning in GCC
8 years ago
e9dce26f38
Resolve conflicts in pull request #50
...
# Conflicts:
# CMakeLists.txt
8 years ago
c9d4ff35c4
Install Qt5 platform DLLs on Windows
8 years ago
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
8 years ago
dd5b6a46f5
Visual Studio 2015 support
8 years ago
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
8 years ago
cc7b1f8543
Merge branch 'openmw-40'
8 years ago
d31046204f
Use tes3mp icon for executable
8 years ago
2ac0c4e689
Rename openmw to tes3mp for Windows too...
8 years ago
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
8 years ago
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
8 years ago
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
8 years ago
4cffdb67d8
Uses case-sensitive MyGUI_* variables
8 years ago
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
9 years ago
ed3dc8ca7b
Reduced server dependings
9 years ago
d170a50e8a
increased version number
9 years ago
2db5cec98b
Merge remote-tracking branch 'psi29a/sphinx'
9 years ago
7f0d5bde2d
make conf.py independant from cmake macros
...
merged openmw-cs in, using per directory statics
add requirements.txt for sphinx docs
it is breath
update gitignore and openmw-cs
9 years ago
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
ace719507c
Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1
...
https://github.com/TES3MP/TES3MP/issues/1
9 years ago
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
9 years ago
ac8d347e9e
we have html output and autodoc functionality
9 years ago
28c63aea72
Uses FindTinyXML to find package
9 years ago
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
56548b384d
Include FindPkgMacros to use make_library_set
...
In CMakList.txt there is make_library_set and macro for it is defined in FindPkgMacros, so FindPkgMacros needs to be imported to avoid Error: Unknown CMake command "make_library_set".
9 years ago
fcbcc004a3
Don't use unordered_map
9 years ago
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
a6b67154bb
Use builtin compiler version in CMake scripts
9 years ago
62af1b67cf
increased version number
9 years ago
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
9 years ago
a7b78b37f5
disable opengles for Android by default
9 years ago
52f4c07648
Enable -Wundef
9 years ago
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
9 years ago
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
9 years ago
41675be970
Merge branch 'openmw-38'
9 years ago
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
48f4fc34eb
build fixes for Android
9 years ago
6c676c861c
increased version number
9 years ago
4be6b362c5
Add OpenMW-mp target
9 years ago
93ee8f1991
Allow for earlier CMake on Qt4
9 years ago
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
9 years ago
9c7bbd667b
Merge branch 'usersettings'
9 years ago
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
7db307e028
delete unused variables
9 years ago
7d374b36fd
change cmake variables
9 years ago
d9b1b7c516
addd forgotten line
9 years ago
238a5824be
add custom new variable fot Qt
9 years ago
bd5057aa3c
enable opengl es1
9 years ago
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
9 years ago
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
9 years ago
84305a1297
Reuse DATADIR in data paths
9 years ago
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
2108e96c15
OS X: use TGA, PNG & JPEG plugins instead of ImageIO
...
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
9 years ago
020b3add94
Merge branch 'openmw-37'
9 years ago
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago
63c47a78d6
OS X: fixup Qt plugin during packaging
9 years ago
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
9 years ago
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
9 years ago
5c4899580f
OS X: use less ambiguous variable names in packaging code
9 years ago
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
9 years ago
3ea3d07d44
really purge libav
9 years ago
cdf17f415e
updated version number
9 years ago
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
10 years ago
7f398f8790
Merge remote-tracking branch 'corristo/osx-packaging-nextgen'
10 years ago
34d601360f
OS X: setup OSG plugins packaging
10 years ago
2ded28f6aa
OS X: reintroduce packaging code
...
It's much simpler now thanks to bundle utilities with @rpath support.
10 years ago
46ce04a65b
Don't package duplicate version for Windows
...
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
10 years ago
581ea26605
Add appdata file for openmw and install it
10 years ago
2a653e45fd
(Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
...
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
10 years ago
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
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
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
10 years ago
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
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
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
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
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
10 years ago
d9a00288f8
Make install fix
10 years ago
58917bcca6
Minor cleanup
10 years ago
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
cdd0623009
Terrain rendering
10 years ago
b0b55e2037
Delete niftest as it's currently broken
10 years ago
d05d7f51d9
increased version number
10 years ago
62ce2cc123
Minor cleanup
10 years ago
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
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
f2809ab63b
Delete nifosgtest again
10 years ago
David Cernat
Alexander "Ace" Olofsson
Koncord
Marc Zinnschlag
Roman Proskuryakov
scrawl
Bret Curtis
Aesylwinn
GrimKriegor
Nikolay Kasyanov
makson96
sandstranger
Paul Cercueil
Dmitry Marakasov
Nikolay Kasyanov
Alexandre Moine
Arthur Moore
slothlife