teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
20,024 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'experimental'
${ noResults }
Commit Graph

810 Commits (experimental)

Author SHA1 Message Date
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
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
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
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 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