mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
14,932 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 'e13eb625d3'
${ noResults }
Commit Graph

683 Commits (e13eb625d38a13b47d1b6680608c69c20de6842a)

Author SHA1 Message Date
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
scrawl 918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 12 years ago
scrawl 495aeb5d3b Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
 12 years ago
Marc Zinnschlag bd08677a7f Merge branch 'openmw24' 12 years ago
Nikolay Kasyanov d13430e2b8 Fix for CMake > 2.8.9 on OS X 12 years ago
eroen 886bc7e2f6 libc++ fixes: don't rely on tr1 
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.

Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
 12 years ago
Marc Zinnschlag 3ae02547d2 increased version number 12 years ago
scrawl a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 12 years ago
bwrsandman 8cdef343ef take default prefix into account 12 years ago
bwrsandman 642ac15721 moved openmw resources to /usr/share/games and added missing files 12 years ago
bwrsandman a5db557e22 fixed /share to be /usr/share 12 years ago
Marc Zinnschlag 3b3a052f4f increased version number 12 years ago
Chris Robinson 81615c1ae5 Add a custom GrowFade particle affector 12 years ago
Alexander "Ace" Olofsson 8d706f8183 Include the ini importer in windows packages 12 years ago
vorenon 00deff1758 fixed path for launcher icons 12 years ago
pvdk 30f3fbac3c Fixed paths to OpenMW icons 12 years ago
Marc Zinnschlag d6a5915bbd updated version to 0.22.0 12 years ago
Marc Zinnschlag 5e113627b7 Merge remote-tracking branch 'psi29a/master' 12 years ago
Bret Curtis b8c42fde1f removed chrono from deps, not needed for boost < 1.50 12 years ago
Sandy Carter b457c7de5e added linux opencs.desktop file 12 years ago
Bret Curtis 207f78ab77 added two additional required boost libs to build on windows, one of which is already pulled by other boost lib in Ubuntu. 12 years ago
Emanuel Guevel 3adf3f5121 Revive bsatool 12 years ago
Pieter van der Kloet f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 12 years ago
scrawl 9810eafe23 Removing now unused oengine/imagerotate 12 years ago
Marc Zinnschlag 372308b49a Merge remote-tracking branch 'amdmi3/installation-fixes' 12 years ago
Dmitry Marakasov 0e8ff22d6f Only install binaries which are enabled to be built 12 years ago
Alexander "Ace" Olofsson d5aa975675 Fix some issues that seem to have appeared in the CMake configuration. 12 years ago
Dmitry Marakasov f994b7d227 Prepare .desktop file for more systems 
This brings condition for .desktop file preparation in sync with
condition for its installation.
 12 years ago
Chris Robinson db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Nathan Jeffords 1af4e11414 apply MSVC warning settings to shiny projects 12 years ago
Chris Robinson 3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
hasufell 56468eaecf Add install rule for opencs 12 years ago
Chris Robinson 86f6491bc8 Remove unused pmove code 12 years ago
Alexander "Ace" Olofsson f9a0a19ee1 Fix a small issue in the windows installer, also added the OpenMW version to the installed package name 12 years ago
Marc Zinnschlag cfceb45009 adjusted gcc settings again to avoid problems with older compiler versions 12 years ago
Marc Zinnschlag 827261e8b4 increased version number 12 years ago
Marc Zinnschlag 85697e4628 reverted to C++03 12 years ago
Nathan Jeffords 4e46f403a9 added some more warning to ignore in MSVC 12 years ago
scrawl cac68c9e87 Removed an outdated section from CMakeLists 12 years ago
Jordan Milne ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 12 years ago
Jordan Milne 6449f68d61 Merge branch 'master' into sdl_input 12 years ago
Jordan Milne 884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 12 years ago
scrawl f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 12 years ago
scrawl 35f4d09288 swscale handled better (cmake) 12 years ago
Nathan Jeffords dcfa902525 fixed error in cmake when disabling esmtool 12 years ago
scrawl 1718d735b5 Fix menu/journal/book/scroll buttons when using localised MW-installations 
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
 12 years ago
Marc Zinnschlag 334588bf1c Merge branch 'editor2' 12 years ago
Chris Robinson 3829bbfeca Look for all available sound input libs as needed, and warn if not found 12 years ago
Chris Robinson 8cde6db665 We no longer need SDL 12 years ago
psi29a e4ac7a4df4 remove libboost1-xxx from deb depends since we can compile statically 12 years ago
scrawl c49966dd29 started over 12 years ago
scrawl 5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 12 years ago
psi29a 4114e823ac Allow the ability to choose to compile against boost libs statically. 12 years ago
Marc Zinnschlag d97d4b8ef0 updated version number 12 years ago
scrawl d432420a32 fix FindFFmpeg.cmake 12 years ago
Marc Zinnschlag c3cd6e8a8a new attempt at the editor 12 years ago
Marc Zinnschlag 37a42c7dbc increased version number; updated changelog 12 years ago
Marc Zinnschlag 648b53ef93 removed unused launcher.cfg file 12 years ago
Marc Zinnschlag 35d099a638 disabling gcc extensions 12 years ago
Nikolay Kasyanov 4b5706d652 Fixed packaging on OS X 12 years ago
Marc Zinnschlag 747a4e1123 increased version number and updated readme 12 years ago
Michael Mc Donnell 256dff0a29 Disable warning 4800 for Visual Studio 
Visual Studio 2010 complains about constructs such as:

int myInt = 1;
bool myBool = myInt;

Which are fine with most compilers. It would instead like:

int myInt = 1;
bool myBool = (myInt != 0);

Warning 4800 is just an optimization warning and is therefore safe to
disable. This patch disables warning 4800.
 12 years ago
scrawl 6ac2a12296 item selection working on the preview 12 years ago
Marc Zinnschlag 4076c19cc6 silencing a cmake warning 12 years ago
Lukasz Gromanowski 3c2efbe966 Disable "make install" for Debian based linux distributions. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 12 years ago
Alexander "Ace" Olofsson a61edb60fd Fixed an issue with windows CPack failing due to trying to install linux binaries 12 years ago
Lukasz Gromanowski 99c46093dd Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests 12 years ago
Lukasz Gromanowski 65678b95f0 Added support for make install. 
Added support for make install based on patch from Hasufells
repository:

https://github.com/hasufell/hasufell-overlay/tree/master/games-engines/openmw/files

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 13 years ago
scrawl 19ae30ee68 Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwbase/inputmanager.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.hpp
	apps/openmw/mwinput/mouselookevent.cpp
 13 years ago
Lukasz Gromanowski 34513cf16b Added support for code coverage checking and unittests. 
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 13 years ago
Marc Zinnschlag 98219323b7 Merge remote-tracking branch 'mmd/vsdebugfixes' 13 years ago
Michael Mc Donnell 7952d38e6c Use debug dlls when debugging in vs2010 (try 2) 
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.

It also defines DEBUG to make it easier turn things on and off when
debugging.

There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
 13 years ago
Marc Zinnschlag 3112bfb54f incremented version number 13 years ago
Marc Zinnschlag 2a11a28e81 Revert "Use debug dlls when debugging in vs2010" 
This reverts commit ebe131b326.
 13 years ago
Michael Mc Donnell ebe131b326 Use debug dlls when debugging in vs2010 
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.

There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
 13 years ago
scrawl 976ad7a301 key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw 13 years ago
scrawl 86d6f190bf Input system rewrite 13 years ago
Nikolay Kasyanov defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix 
Conflicts:
	CMakeLists.txt
 13 years ago
Michael Mc Donnell e7a1ab9fa6 Define OGRE_PLUGIN_DEBUG_SUFFIX in all cases. 13 years ago
Nikolay Kasyanov 7161361b52 cleanup 13 years ago
Nikolay Kasyanov 23e44a86c6 another attempt to fix 13 years ago
Nikolay Kasyanov a0a086f69d fixed redefining macro 13 years ago
Nikolay Kasyanov fbe9a94568 bug #348: fixed OS X deployment 
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
 13 years ago
Sebastian Wick 0f40e6fc65 find boost without components so we can use Boost_VERSION 13 years ago
Nikolay Kasyanov 94ce95c679 bug #348: works again on OS X 13 years ago
scrawl ac5bd38df9 some cmake fixes 13 years ago
scrawl b2dcf5adcd support system install for boost wave 13 years ago
scrawl 014396e80c remove the plugins.cfg files, do not enforce CG plugin 13 years ago
scrawl 4434fb640e Merge branch 'master' into shadersystem 13 years ago
Marc Zinnschlag e9b95d55cd Revert "Proper way to find and use libtbb" 
This reverts commit d6bf2b7d29.
 13 years ago
Dmitry Marakasov d6bf2b7d29 Proper way to find and use libtbb 13 years ago
Dmitry Marakasov e862b6b5a5 Fix comparison in cmake 13 years ago
scrawl 509e9d7034 Merge branch 'master' into shadersystem 13 years ago
Chris Robinson 2a3ce5ee6d Remove Mangle::Stream 
The base Stream class is left because some part of the terrain esm land factory
inherits from it, though it's largely unused (few of the methods work, and none
actually do anything).
 13 years ago
scrawl 9ed2f1df67 boost wave not needed anymore 13 years ago
scrawl 94c3fb81d1 check if CMAKE_BUILD_TYPE is defined instead of defining it by default 13 years ago
scrawl 32e14907a2 add a default value for CMAKE_BUILD_TYPE, resolves error when it is not set 13 years ago
scrawl 7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 13 years ago
scrawl fb109ec7e2 use debug versions of ogre plugins in debug mode 13 years ago
scrawl de9b7a51de change glsl #version, remove CG from required libraries 13 years ago
scrawl a1e48b0feb builds now 13 years ago
scrawl 24399a45c1 add submodule with current code 13 years ago
Marc Zinnschlag 68459441f2 adjusting version number 13 years ago
Alexander "Ace" Olofsson 82fba53771 Removed the license screen and changed so all licenses are instead installed to the game folder. 13 years ago
Marc Zinnschlag 3673cd2531 increased version number 13 years ago
scrawl a4d6d1baff added a utility for creating texture atlas at runtime 13 years ago
scrawl 4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 13 years ago
Alexander "Ace" Olofsson f7a03b39c4 Some improvments for windows builds and installer 13 years ago
Jason Hooks 1ce759af06 Merging in master 13 years ago
Nikolay Kasyanov 0c739825f2 another fix 13 years ago
Nikolay Kasyanov 582d7ab213 building & packaging improvements for OS X 13 years ago
Marc Zinnschlag b76fd249c7 updated changelog; bumped version number 13 years ago
Marc Zinnschlag afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 13 years ago
k1ll 8156e9e5c4 Fixed install search path for openmw.desktop. It's directly in the binary dir. 13 years ago
k1ll 2d6cd16296 Now Debian Packages install the configured openmw.desktop file. 13 years ago
k1ll dc2751f4ec Moved Build options to the top. I need this for my tar.gz packages but i think this is a good idea in general. 13 years ago
k1ll 226f312163 Set the version in the openmw.desktop file via CMake 13 years ago
Marc Zinnschlag a4fb71a0fc Merge remote branch 'scrawl/graphics' 13 years ago
scrawl a727bcd4a4 override nif transparency settings (part 1) 13 years ago
scrawl 944654f263 image rotating function 13 years ago
Jason Hooks 74deb5588d Post merge 13 years ago
Jason Hooks ebab98a8a0 Restructuring things 13 years ago
Alexander "Ace" Olofsson bf5a009299 Some improvements to the windows installer 13 years ago
k1ll f2c4e513a4 Add support for building with a static build of the MyGui Libraries. 13 years ago
scrawl 2b4b941192 Merge branch 'master' into gamesettings 13 years ago
Marc Zinnschlag 6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 13 years ago
Jason Hooks 07d0203a3c Merge remote-tracking branch 'upstream/master' 13 years ago
Chris Robinson 63e0e82049 Implement an Audiere-based decoder 13 years ago
scrawl c2a82c3d89 Merge branch 'master' into gamesettings 13 years ago
scrawl f4bbcb48a6 settings-default.cfg 13 years ago
Roman Melnik ed58e9e553 Merge remote-tracking branch 'upstream/master' 13 years ago
Jason Hooks 0021ccf862 Merge remote-tracking branch 'upstream/master' 13 years ago
Roman Melnik 35f787c4bf Merge remote-tracking branch 'upstream/master' 13 years ago
Nikolay Kasyanov 057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 13 years ago
Sebastian Wick fbd626baf6 mwiniimporter 13 years ago
Marc Zinnschlag 2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 13 years ago
Nikolay Kasyanov b21a6291f7 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp
 13 years ago
Nikolay Kasyanov c3357c4396 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
 13 years ago
Roman Melnik ef2f7e841a Merge branch 'master' of github.com:Kromgart/openmw 13 years ago
Marc Zinnschlag f2075c7f4f temporarily silence warnigns in OGRE headers 13 years ago
scrawl e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 13 years ago
scrawl 6bea08157e Merge branch 'master' into terrain18 13 years ago
Marc Zinnschlag 2b2eb34f8f Merge remote branch 'corristo/master' into next 13 years ago
Nikolay Kasyanov 362e6cb9ed Removed predefined SDK path. Found that it's generally not good idea to force it. Also -Wno-unused-but-set-parameter only set for gcc 4.6 or newer 13 years ago
Roman Melnik 35c3a0a3f9 Add Boost_USE_STATIC_LIBS parameter for Windows 
If this parameter is not set in windows, cmake expects
boost libraries to be named "boost_*.lib", while they are
actually "libboost_*.lib"

In findBoost.cmake (728):

  # Setting some more suffixes for the library
  set (Boost_LIB_PREFIX "")
  if (WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN)
    set(Boost_LIB_PREFIX "lib")
  endif()
 13 years ago
Chris Robinson 2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 13 years ago
Nikolay Kasyanov 8e76451cda Fix launcher style installation on OS X again 13 years ago
Alexander "Ace" Olofsson dcdc759719 Adding readme to windows builds 13 years ago
scrawl 9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 13 years ago
scrawl 6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 13 years ago
scrawl 250fcab7c2 moved the mygui resources to a more suitable location 13 years ago
Chris Robinson 9a48002025 Fix compilation of the FFmpeg decoder 13 years ago
scrawl 66baf9ec81 Merge branch 'master' into mygui 13 years ago
Chris Robinson 74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 13 years ago
Marc Zinnschlag 50b79de10b Merge remote branch 'psi29a/master' 13 years ago
Brother Brick b6b972b73b Removed libbullet and libogre dependencies and added nvidia-toolkit. 
We are releasing OpenMW based on static libraries, so the first two
are no longer necessary
 13 years ago
Brother Brick 42584b013f Updated dependency to match our PPA 13 years ago
Jason Hooks ed7cb1dc67 restarting 13 years ago
Lukasz Gromanowski fc95917253 Fix for not visible pthreads function with glibc 2.15 
Linking error will appear:

Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 13 years ago
Jason Hooks 51fb9e67cd Merge 13 years ago
gugus 7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
Marc Zinnschlag cab869824a bumping version number 13 years ago
scrawl 3a00fbb950 removed mygui from source tree and use system install instead 13 years ago
Marc Zinnschlag 655f9fe920 Merge remote branch 'k1ll/staticogre' 13 years ago
k1ll b83b7d0650 Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin. 13 years ago
Chris Robinson 246b0266fb Remove references to Audiere. It's not supported for now. 13 years ago
Chris Robinson 45b612ab3b Add a skeleton output classs using OpenAL 13 years ago
Chris Robinson 42b445383f Remove Mangle- and OpenEngine-related sound code 
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
 13 years ago
gugus 5b08baf5bf a little fix for CMake to be able not to build the launcher 13 years ago
Nikolay Kasyanov 65fc141b62 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 13 years ago
Marc Zinnschlag 5b378e820d warning level adjustments and some related fixes 13 years ago
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 13 years ago
Marc Zinnschlag 311c0b04e2 Merge remote branch 'ace/win-warning' 13 years ago
Alexander "Ace" Olofsson 04494893c8 Added some release mode warnings 13 years ago
Marc Zinnschlag ff866269ec Merge remote branch 'corristo/pgrd' 
Removed a warning

Conflicts:
	CMakeLists.txt
 13 years ago
Alexander "Ace" Olofsson 477525ee48 Minor modification and spelling correction 13 years ago