mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
21,446 Commits
38 Branches
54 Tags
121 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
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
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'sol2-server-rewrite'
${ noResults }
Commit Graph

858 Commits (sol2-server-rewrite)

Author SHA1 Message Date
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
Marc Zinnschlag 595c08817f Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag e439065897 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 years ago
scrawl 9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 10 years ago
Marc Zinnschlag f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 10 years ago
scrawl 94002b0758 Add freedesktop.org mimeinfo for OpenMW save game files 
This allows us to launch OpenMW when the user opens a save game file through the file manager.
 10 years ago
Arthur Moore c1315ed90c Build the nif file tester by default 
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
 10 years ago
Marco Schulze 3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout 
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
 10 years ago
Marco Schulze d92cd2ffad Remove GetGitRevisionDescription.cmake 
GetGitRevisionDescription.cmake uses a somewhat contrived method to obtain the
hash of the commit pointed by the repository's HEAD. This method fails on
unusual, but still valid repository layouts.

This commit removes cmake/GetGitRevisionDescription.cmake{,.in}, replacing its
functionality with direct use of Git's plumbing.
 10 years ago
Marc Zinnschlag d67ad9037e increased version number 10 years ago
scrawl a8a2b44b0f Don't require libunshield on windows 10 years ago
scrawl d4a9cf7075 Fix wizard install location 10 years ago
scrawl 4fa303d7c4 Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
 10 years ago
Marc Zinnschlag 45d41e22e2 Merge branch 'openmw-33' 10 years ago
Marc Zinnschlag 5909fa4368 new version number and updated changelog 10 years ago
scrawl eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies 
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
 10 years ago
Marc Zinnschlag a3c894c1e2 Merge branch 'cellmarker' 10 years ago
Marc Zinnschlag 86f5073293 increased version number 10 years ago
cc9cii 313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 10 years ago
vocollapse 772c66eedf Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen. 10 years ago
cc9cii f459adf117 Revert CMake changes (didn't work for osx anyway) 10 years ago
cc9cii 971b0de4fa An attempt to make osx to find the ogre overlay headers. 10 years ago
cc9cii 758ce0ed98 Various fixes as per feedback comments. 10 years ago
vocollapse 71f3f71f78 added make target for doxygen: make doc, make doc_pages 10 years ago
cc9cii 972c789060 Add Ogre Overlay path to cmake. 10 years ago
scrawl 62ea913e69 Fix cmake warning 10 years ago
Marc Zinnschlag 147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix' 
Conflicts:
	CMakeLists.txt
 10 years ago
slothlife 35ced14e45 Fix for MSVC warnings 10 years ago
eroen 0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 10 years ago
Marc Zinnschlag 5c8ef842b6 Merge branch 'edit' 10 years ago
scrawl b1e74e2a85 Remove support for Ogre 1.8 versions 10 years ago
Sebastian Wick f46da271d7 SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr" 10 years ago
Sebastian Wick 2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 10 years ago
Stanislav 313bdf4e78 fix 10 years ago
Stanislav 76f2e5d5b8 CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build. 10 years ago
Marc Zinnschlag 3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 10 years ago
cc9cii d92400e550 Remove libavresample restriction. 10 years ago
cc9cii 166ee6b483 Do not use cached FFMPEG_LIBRARIES. Make error messages clearer. 10 years ago
Marc Zinnschlag 9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 10 years ago
scrawl 9d05718515 Move plugin to new plugins/ top level directory 10 years ago
Marc Zinnschlag f142d82b3a Merge remote-tracking branch 'ace/win-package-fix' 10 years ago
Marc Zinnschlag 2397a87330 Merge remote-tracking branch 'scrawl/bsatool' 10 years ago
Alexander "Ace" Olofsson dd3d7ba474 Update NSIS to use the new icon path 10 years ago
scrawl ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 10 years ago
scrawl 1bb9359b4c Fix a typo 10 years ago
scrawl fca8dc9674 Enable bsatool build by default 10 years ago
cc9cii 862c5fc8f6 Add libavresample support. Tested on windows x64 only. 10 years ago
cc9cii 785d2c7cc9 Remove incomplete implementation to support planar formats. Make libswresample a prerequisite. 10 years ago
cc9cii c6cad5adc5 Make cmake more reliably detect libswresample 10 years ago
cc9cii f4dd281393 Simplify the use of swr_convert and add #ifdef guards around code that require libswresample. 10 years ago
cc9cii 944f99b23a Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit. 10 years ago
Marc Zinnschlag b6a3541573 increased version number 10 years ago
scrawl 17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 10 years ago
Arthur Moore 53ce94d0e4 Disable building nif file tester by default 10 years ago
Arthur Moore cdfa24e15d (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.

On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
 10 years ago
scrawl 77a4e38c49 Remove -Wno-ignored-qualifiers and fix caused warnings 11 years ago
Marc Zinnschlag f4ddf2a7b9 Merge remote-tracking branch 'sandstranger/android' 11 years ago
root 713787d92f fix v7 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 16aafc26bc fixed cmake for build on all plaforms include android 11 years ago
scrawl a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 11 years ago
bogglez b56cb7e5ee Remove defunct option for building without FFmpeg 
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
  (FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
 11 years ago
scrawl 192d5ca08f Allow overriding OGRE_PLUGIN_DIR in cmake command line 11 years ago
Marc Zinnschlag 7316f4dde4 increased version number 11 years ago
slothlife 96ba4a414f Fix MSVC size_t conversion warning. 11 years ago
slothlife 9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 11 years ago
Alexander "Ace" Olofsson 5960d3f1d9 These files moved, leading to package failure 11 years ago
scrawl 7eee0855f7 Merge commit 'pull/origin/155' 
Conflicts:
	CMakeLists.txt
 11 years ago
scrawl 10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 11 years ago
scrawl 3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 11 years ago
Bret Curtis e28888df39 fix for dejavu location 11 years ago
Bret Curtis 8419002393 Task #940: Move licenses to appropriate place in docs. Additional cleanup. 11 years ago
Marc Zinnschlag 5313862a46 Merge remote-tracking branch 'scrawl/master' 11 years ago
slothlife 20dabaead9 Fix CMake scripts to link static dependencies 
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
 11 years ago
scrawl 5df9ff8e2c Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg 
Fixes installing to /usr/local (Bug #1378)
 11 years ago
pvdk 5af12d193a Cleaned up old wizard stuff from launcher 11 years ago
pvdk 38d825b004 Merge remote-tracking branch 'upstream/master' into wizard 
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
 11 years ago
Marc Zinnschlag 244eb11651 Merge remote-tracking branch 'greye/widechar' 11 years ago
greye 8f9091550e require boost::locale only on Windows 11 years ago
scrawl 2f6d400c62 Merge branch 'master' of https://github.com/OpenMW/openmw into newgame 11 years ago
greye b728a919a2 write dependency on boost::locale to CMake files 11 years ago
greye 46c32f6c47 OpenEngine MyGUI logging facility 11 years ago
scrawl 510b7f8505 Task #1333: Remove cmake git tag reading 11 years ago
Marc Zinnschlag 7c149e98e0 Merge branch 'openmw-30' 11 years ago
Marc Zinnschlag a5f0fe7282 incremented version number 11 years ago
Marc Zinnschlag d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
 11 years ago
slothlife f33559fead Fixes for MSVC warnings, less overall changes 
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
 11 years ago
slothlife c160a04ede Revert "Fixes for warnings when building with MSVC" 
This reverts commit 46eb20b98c.
 11 years ago
Marc Zinnschlag 199f030d38 adjusted cmake file for opencs user settings file rename 11 years ago
slothlife 46eb20b98c Fixes for warnings when building with MSVC 
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
 11 years ago
Marc Zinnschlag 21142711f0 Merge remote-tracking branch 'graffy76/master' 11 years ago
graffy76 a17cb1f389 Fixed opencs.ini formatting 11 years ago
graffy76 475214ab62 Implmented QSettings for loading / saving file definitions. Also 
renamed opencs.cfg to opencs.ini to follow Ini format standards
 11 years ago
Thoronador 688d556510 remove references to Audiere and MPG123 from top-level CMake file 11 years ago
Sandy 36914b43d7 Remove install of License of no longer used font 11 years ago
scrawl 78d322e6a5 Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test." 
This reverts commit 529d2436b5.
 11 years ago
Lukasz Gromanowski 529d2436b5 Temporary added broken CMakeLists.txt - Travis IRC notification test. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 11 years ago
pvdk ef38fae09d Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
scrawl 0a17245633 Refactored settings window 11 years ago
Alexander "Ace" Olofsson 7ed3effc92 Fix windows packaging issue now that the OFL license doesn't exist 
anymore.
 11 years ago
scrawl 9089df3080 Add unity build option 
Each component and each MW-subsystem will be used as a single compilation unit.
 11 years ago
pvdk 8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
Marc Zinnschlag 6101916b7d bumped version number 11 years ago
pvdk c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
 11 years ago
pvdk 56d537e23d Added some sanity checking: compare git version with manual version 11 years ago
pvdk b43325119a Some changes to the version retrieval: ignore shallow clones 11 years ago
pvdk 85b7240948 Made the git version retrieval more reliable 11 years ago
Nikolay Kasyanov 4a61868521 OS X: fixed Ogre plugin packaging 11 years ago
Nikolay Kasyanov e4017b8bfe It seems that OctreeSceneManager is not required anymore 11 years ago
Nikolay Kasyanov 3c281c6a62 OS X: specify path to framework binary, not to framework directory 11 years ago
Nikolay Kasyanov c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 11 years ago
Marc Zinnschlag 053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 11 years ago
Nikolay Kasyanov 58add97676 Merge branch 'master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 11 years ago
scrawl 4e6507248b Fix travis build 11 years ago
pvdk 19bef4fce8 Distinguish between release and development builds 11 years ago
pvdk 43bc223e68 Added version info retrieval from git tags 11 years ago
scrawl 37a59a37c6 Remove cpack (no longer used, according to BrotherBrick) 11 years ago
scrawl 659d790048 uuid is not used 11 years ago
scrawl d4aeb177f9 Remove unused btKinematicCharacterController 11 years ago
Marc Zinnschlag 7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 11 years ago
Dmitriy 'Endorph' Shkurskiy 116f125f05 Windows-specific definition to deny SDL from providing it's own WinMain() 11 years ago
Marc Zinnschlag 0d3e67dafc Merge branch 'master' into openmw-28 11 years ago
scrawl 5b0a4c9424 Get rid of unused file and some other cruft. 11 years ago
Marc Zinnschlag fe34c9cf1f increased version number 11 years ago
Scott Howard 2f082ef796 remove unneeded libraries 11 years ago
Nikolay Kasyanov 892ff93489 OS X: attempt to fix #1045 11 years ago
Nikolay Kasyanov 73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized 
plugin install routine.
 11 years ago
Nikolay Kasyanov 874ecee079 OS X: do not enforce static boost, this can be set externally 
anyway
 11 years ago
Nikolay Kasyanov 89c60b065c OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable 11 years ago
Nikolay Kasyanov 87853f4066 OS X: consider Ogre CG plugin as used only if it’s found 11 years ago
Nikolay Kasyanov 99cfb8cda2 OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt 11 years ago
pvdk d8f20d2e66 Added the infrastructure to start working on the installation wizard 11 years ago
Marc Zinnschlag 04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 11 years ago
eroen d4b8ac5b49 don't dpkg on windows and macos 
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
 11 years ago
eroen 67284e2f9d Introduce -DBUILD_WITH_DPKG to toggle dpkg based install 
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.

This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
 11 years ago
Nikolay Kasyanov fa13818360 OS X: OpenCS packaging 11 years ago
Marc Zinnschlag ef401a774b Merge remote-tracking branch 'eroen/install-fix' 11 years ago
Marc Zinnschlag 224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
eroen e885c502a1 Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 11 years ago
eroen 6b931f566d Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 11 years ago
Bret Curtis 36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
Marc Zinnschlag b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 11 years ago
Alexander "Ace" Olofsson 632a53ead4 Support packing the OpenCS into windows builds 11 years ago
Marc Zinnschlag 29fce6d11f increased version number 11 years ago
Marek Kochanowicz b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 11 years ago
Marek Kochanowicz 96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 11 years ago
Marek Kochanowicz 6b293961b4 This appears to work. 11 years ago
Marek Kochanowicz 155662860c Added configrue file in cmake. Hopefully it will copy defaultfilters file. 11 years ago
Nikolay Kasyanov 3993c34739 Merge remote-tracking branch 'upstream/master' into osx-ogre-19 11 years ago
Nikolay Kasyanov a18e3c9cc1 Fixed packaging when building against Ogre 1.9 11 years ago
Nikolay Kasyanov 36fb89c6cd Cleanup 11 years ago
Marc Zinnschlag 9637e1641b fix for building with system tinyxml 11 years ago
Marc Zinnschlag 6f64b1b9db cmake option to use system tinyxml instead of embedded one 11 years ago
Marc Zinnschlag 4dbacdc6bd increased version number 11 years ago
Marc Zinnschlag 0c8f85f17d Merge remote-tracking branch 'wheybags/master' 12 years ago
scrawl 13afcc9324 Don't link to OgreTerrain 12 years ago
Tom Mason 865a7c63df cmake for system libunshield 12 years ago
Tom Mason ceb3317807 Integrate unshield with launcher 12 years ago
eroen 8d925b7fd6 cleanup 
-   drop trailing slashes from paths for consistency
-   sort entries that got unsorted
 12 years ago
eroen 0076c558d6 Re-introduce lost functionality 
The branch merged in 5a863589b4 removed fine-grained configure-time control
over install paths. This is necessary to accomodate various linux distros'
policies, eg. Gentoo wants games installed in /usr/games, but with resource
files in /usr/share/games.

DOCDIR and MANDIR appear to be unused, and were not re-introduced.
 12 years ago
Chris Robinson de95926e9f Use controllers to animate lights in ObjectLists 12 years ago
Marc Zinnschlag 130141ecac Merge remote-tracking branch 'corristo/master' 12 years ago
Nikolay Kasyanov 66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 12 years ago
bwrsandman 36fb7f3a72 Cleanup 12 years ago
bwrsandman 71a75d2ab8 Small fixes 12 years ago
bwrsandman 9a900908cd Merge deb and non-deb 12 years ago
bwrsandman e22b7c8fc1 Add use of SYSCONFDIR path for conf files in deb 12 years ago
bwrsandman 799c84b846 Moved deb version checking down with cpack 12 years ago
bwrsandman 3baf44c4b5 Moved non-deb install section up for readability 12 years ago
bwrsandman 0e02d7817e Moved non-deb up for readability 12 years ago
bwrsandman b6e3b5e834 Add licenses to installed files for non-deb packages. 12 years ago
bwrsandman 98289f051f Set location for all non apple unixes, not just debian. 12 years ago
Marc Zinnschlag 20e92c2cdf increased version number 12 years ago
k1ll 39a12ab9cf CXX Flags aren't definitions 12 years ago
Marc Zinnschlag 12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 12 years ago
graffy76 7175c7cfe0 Updated OpenMW project CMakeLists.txt to include opencs.cfg file 
installation.
 12 years ago
Bret Curtis 84a8ea4ef7 static sdl2 compilation option for Unixes that are not Apple 12 years ago
scrawl 4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 12 years ago
Nikolay Kasyanov 6abb7a18b0 SDL2 input: seems to work on OS X, has some input issues though 12 years ago
scrawl ab3634d692 Removed some remains of OIS 12 years ago