teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
22,131 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 'master'
${ noResults }
Commit Graph

846 Commits (master)

Author SHA1 Message Date
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
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
Marc Zinnschlag 003d0610f4 Merge remote-tracking branch 'ace/link-time-optimzation' 10 years ago
Alexander "Ace" Olofsson 9da0a9f8c4 Enable link-time optimization on MSVC 10 years ago
scrawl 399c24c646 CMake cleanup: remove redundant setting of Permissions to default values 10 years ago
scrawl e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 10 years ago
scrawl c63ab673e1 Revert "Add freedesktop.org mimeinfo for OpenMW save game files" 
This reverts commit 94002b0758.

Conflicts:
	CMakeLists.txt
 10 years ago
Rosanne DiMesio 28eb766bba Respect LIB_SUFFIX 10 years ago
Nikolay Kasyanov 5534306eb3 Few rename fixes 10 years ago
Alexander "Ace" Olofsson abb334bc1e Missing change for the tool rename 10 years ago
Marc Zinnschlag c02537c3b1 incremented version number 10 years ago
Marc Zinnschlag 0557d45bd1 renamed opencs into openmw-cs 10 years ago
scrawl e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 10 years ago
scrawl 8e5c8aa562 Add support for passing in Ogre plugin directory via CMake 10 years ago
Marc Zinnschlag f4bf2aa412 Merge remote-tracking branch 'origin/master' 10 years ago
Alexander "Ace" Olofsson ebe2e1491a Fix broken windows builds due to README change 10 years ago
scrawl 031eec4550 Starting ESS importer for Morrowind save files 10 years ago