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
7 years ago
David Cernat
3e52857e2b
[General] Fix build for client and construction set
7 years ago
Koncord
7a032baaa3
[General] Move OSG hack to ELSE branch
7 years ago
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
David Cernat
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
Marc Zinnschlag
cae744161b
increased version number
7 years ago
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
7 years ago
AnyOldName3
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
Andrei Kortunov
48e15dabc3
Try to generate PDB for release builds
7 years ago
AnyOldName3
44b2cf2b7f
Merge upstream.
7 years ago
Kyle Cooley
6c7d73af7f
Bump c++ standard version to 14
7 years ago
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
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.
7 years ago
David Cernat
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
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
7 years ago
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
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
7 years ago
AnyOldName3
451d0de463
Remove dependency on osgAnimation that somehow snuck in
7 years ago
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
Thunderforge
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
7 years ago
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
AnyOldName3
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
scrawl
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
7 years ago
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
7 years ago
Bret Curtis
d19839a666
standerdise on 3.1.0
7 years ago
Alexander "Ace" Olofsson
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
7 years ago
Marc Zinnschlag
0153b54c3f
increased version number
7 years ago
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
AnyOldName3
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
AnyOldName3
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
David Cernat
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
AnyOldName3
147455626e
Merge OpenMW/master
7 years ago
AnyOldName3
ef7102899a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
AnyOldName3
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
41ff3fee89
Merge pull request #310 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
Alexander "Ace" Olofsson
dc127fbb93
Add a launch checkbox to the OpenMW installer
7 years ago
Stanislav Zhukov
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
7 years ago
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
AnyOldName3
76e8a0b768
Add changes I missed in a merge.
7 years ago
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
7 years ago
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
John
0060e457a6
[General] Add .desktop file for Server Browser
7 years ago
scrawl
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
7 years ago
John
51c7efa3f3
[CMake] CMake fix install
7 years ago
David Cernat
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
scrawl
60c7876c3d
Merge pull request #1364 from OpenMW/openmw-42
...
Merge openmw-42
8 years ago
Nikolay Kasyanov
49b02a1bf4
[macOS] remove use of deprecated CMake policy
8 years ago
Nikolay Kasyanov
fd0be7008d
[macOS] Fixes accidental loading of plugins from system-wide Qt install
...
I was too eager to remove the workaround in 014a2fc0e9
.
Actually, config-based solution seems cleaner.
Respective Qt documentation: http://doc.qt.io/qt-5/qt-conf.html .
Also, moves Qt plugins from Contents/MacOS to Contents/PlugIns
for consistency.
8 years ago
Bret Curtis
cf6f368560
rtd backport fix
8 years ago
Bret Curtis
ac7b1bf97d
appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
8 years ago
David Cernat
bfbf1bbac4
Merge pull request #247 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017
8 years ago
PlutonicOverkill
9924e4a35b
Stop VS2017 spamming warnings
...
Disable warning caused by the string and stream-related standard headers.
8 years ago
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
Nikolay Kasyanov
4138723bbf
[OS X] Add libc++ to linker flags
8 years ago
Bret Curtis
5fa2f46499
only set libc++ for APPLE
8 years ago
Bret Curtis
26c023efe2
stdlib to libc++
8 years ago
Bret Curtis
cb26f52032
matching ifs
8 years ago
Bret Curtis
5a65d6e18d
fix std::move
8 years ago
Bret Curtis
433129e728
only bundle with Qt5, for now
8 years ago
Bret Curtis
dbc29854b2
try to fix enums
8 years ago
Bret Curtis
b657517bea
use c++11 and see what happens
8 years ago
Koncord
c35d5a2c6c
[Master] Implement Master server
8 years ago
Marc Zinnschlag
13517e723a
increased version number
8 years ago
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
8 years ago
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
scrawl
cdca9b0488
Accept bullet 283 on appveyor as well
8 years ago
scrawl
dfa43af818
Update bullet dependency to 2.86
8 years ago
David Cernat
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
8 years ago
David Cernat
b1bcba3055
Use Qt 5 by default
8 years ago
David Cernat
76162fbfde
Fix netlauncher target properties in CMake for Visual Studio
8 years ago
Koncord
90908ed113
rename openmw-netlauncher to tes3mp-netlauncher
8 years ago
Koncord
cb799ee446
Server browser
8 years ago
Koncord
27afb91936
RPI v3 patch #1
8 years ago
David Cernat
59c3dbe6af
Merge pull request #120 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
8 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
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
8 years ago
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
8 years ago
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
8 years ago
David Cernat
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
9 years ago
Koncord
ed3dc8ca7b
Reduced server dependings
9 years ago
Marc Zinnschlag
d170a50e8a
increased version number
9 years ago
Marc Zinnschlag
2db5cec98b
Merge remote-tracking branch 'psi29a/sphinx'
9 years ago
Bret Curtis
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
Aesylwinn
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
GrimKriegor
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
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
Nikolay Kasyanov
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
9 years ago
Bret Curtis
ac8d347e9e
we have html output and autodoc functionality
9 years ago
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
9 years ago
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
makson96
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
scrawl
fcbcc004a3
Don't use unordered_map
9 years ago
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
Roman Proskuryakov
a6b67154bb
Use builtin compiler version in CMake scripts
9 years ago
Marc Zinnschlag
62af1b67cf
increased version number
9 years ago
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
9 years ago
sandstranger
a7b78b37f5
disable opengles for Android by default
9 years ago
scrawl
52f4c07648
Enable -Wundef
9 years ago
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
scrawl
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
9 years ago
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
9 years ago
scrawl
41675be970
Merge branch 'openmw-38'
9 years ago
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
sandstranger
48f4fc34eb
build fixes for Android
9 years ago
Marc Zinnschlag
6c676c861c
increased version number
9 years ago
Koncord
4be6b362c5
Add OpenMW-mp target
9 years ago
Alexander "Ace" Olofsson
93ee8f1991
Allow for earlier CMake on Qt4
9 years ago
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
Alexander "Ace" Olofsson
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
9 years ago
cc9cii
06f9922822
Performance improvements for loading Info records.
...
- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered. The topic string is hashed. The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag
9 years ago
cc9cii
226f7b6928
Suppress additional MSVC warnings after Update 1
9 years ago
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
9 years ago
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
Paul Cercueil
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
cc9cii
65df15a89d
Suppress MSVC 2015 warnings about hidden/deleted base class move constructors and move assignment operators.
9 years ago
scrawl
d3caeaf898
Remove unused SOUND_INPUT_INCLUDES cmake variable.
...
(cherry picked from commit 0220e82259
)
Conflicts:
apps/openmw/CMakeLists.txt
9 years ago
sandstranger
7db307e028
delete unused variables
9 years ago
sandstranger
7d374b36fd
change cmake variables
9 years ago
sandstranger
d9b1b7c516
addd forgotten line
9 years ago
sandstranger
238a5824be
add custom new variable fot Qt
9 years ago
sandstranger
bd5057aa3c
enable opengl es1
9 years ago
scrawl
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
9 years ago
scrawl
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
9 years ago
Dmitry Marakasov
84305a1297
Reuse DATADIR in data paths
9 years ago
scrawl
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
Nikolay Kasyanov
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
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
9 years ago
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago
Nikolay Kasyanov
63c47a78d6
OS X: fixup Qt plugin during packaging
9 years ago
Nikolay Kasyanov
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
9 years ago
Nikolay Kasyanov
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
9 years ago
Nikolay Kasyanov
5c4899580f
OS X: use less ambiguous variable names in packaging code
9 years ago
Nikolay Kasyanov
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
9 years ago
Bret Curtis
3ea3d07d44
really purge libav
9 years ago
Marc Zinnschlag
cdf17f415e
updated version number
9 years ago
Alexandre Moine
ce27f0c3f5
Add appdata file for openmw and install it
9 years ago
Nikolay Kasyanov
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
Marc Zinnschlag
7f398f8790
Merge remote-tracking branch 'corristo/osx-packaging-nextgen'
10 years ago
Nikolay Kasyanov
34d601360f
OS X: setup OSG plugins packaging
10 years ago
Nikolay Kasyanov
2ded28f6aa
OS X: reintroduce packaging code
...
It's much simpler now thanks to bundle utilities with @rpath support.
10 years ago
Alexander "Ace" Olofsson
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
Alexandre Moine
581ea26605
Add appdata file for openmw and install it
10 years ago
Arthur Moore
f4776112c6
(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
Arthur Moore
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
Marc Zinnschlag
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
scrawl
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
slothlife
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
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
scrawl
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
scrawl
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
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
Alexander "Ace" Olofsson
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
scrawl
d9a00288f8
Make install fix
10 years ago
scrawl
58917bcca6
Minor cleanup
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
cdd0623009
Terrain rendering
10 years ago
scrawl
b0b55e2037
Delete niftest as it's currently broken
10 years ago
Marc Zinnschlag
d05d7f51d9
increased version number
10 years ago
scrawl
62ce2cc123
Minor cleanup
10 years ago
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
scrawl
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
scrawl
f2809ab63b
Delete nifosgtest again
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
scrawl
fe15f31f3e
Remove strings.h wrapper
10 years ago
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
Marc Zinnschlag
9f6bc1b3a9
increased version number
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
157d8bfedd
Remove unused mygui files
10 years ago
k1ll
fe03727ae5
Don't force linking static boost libraries when building with mingw
10 years ago
scrawl
48a6d7c1a0
Remove mygui platform libraries from cmake
10 years ago
scrawl
8410966753
Disable mygui plugin for now
10 years ago
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
scrawl
42f6d9e15b
Port video player
10 years ago
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
scrawl
e6cf959134
Revert "Delete nifosgtest"
...
This reverts commit ba3075dc11
.
10 years ago
scrawl
ba3075dc11
Delete nifosgtest
10 years ago
Scott Howard
d646836cdd
turn on -Wno-potentially-evaluated-expression on clang
10 years ago
scrawl
af67de73a5
Delete shiny
10 years ago
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
scrawl
12f27123f2
Billboard scaling fix and culling bug fix
10 years ago
scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
10 years ago
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
10 years ago
Scott Howard
d7baf92353
tell include_directories which libraries are system libs
10 years ago
Scott Howard
88f746574d
fix compiler detection and adding build flags in CMakeLists.txt
10 years ago
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
Marc Zinnschlag
cdf53c17e7
updated version number
10 years ago
scrawl
1eaa64c49c
CMake: remove lines for MinGW, no one is maintaining those
10 years ago
scrawl
c6aa374934
CMake: set windows warning levels globally instead of per target
10 years ago
scrawl
c57f9ad5dc
CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None
10 years ago
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
10 years ago
Digmaster
1e4a845b6f
Minor code cleanup
10 years ago
scrawl
8d64f2081e
Add particle system state loading
10 years ago
scrawl
8e01d8cb19
Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers.
10 years ago
scrawl
8c10d4badb
NIF reader compiles without Ogre
10 years ago
scrawl
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
10 years ago
scrawl
1124343e0d
Add BUILD_OPENMW switch, build will be broken in next commit
10 years ago
slothlife
a9b74671a6
Fix various MSVC warnings
10 years ago
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
slothlife
f1fd27aeaf
Select CMAKE_BUILD_TYPE if not specified
...
A suggestion by kcat to ensure CMake selects a reasonable default for
the build type if users don't set it themselves.
10 years ago
Marc Zinnschlag
2b619296d7
Merge remote-tracking branch 'scrawl/master'
10 years ago