mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:49:54 +00:00
Code Issues Releases Wiki Activity
13017 commits 38 branches 54 tags 122 MiB
Commit graph

622 commits

Author SHA1 Message Date
Marc Zinnschlag
0d3e67dafc Merge branch 'master' into openmw-28 2014-01-02 13:39:36 +01:00
scrawl
5b0a4c9424 Get rid of unused file and some other cruft. 2014-01-02 01:44:09 +01:00
Marc Zinnschlag
fe34c9cf1f increased version number 2014-01-01 15:06:31 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Nikolay Kasyanov
892ff93489 OS X: attempt to fix #1045 2013-12-25 00:25:58 +04:00
Nikolay Kasyanov
73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized 
plugin install routine.
 2013-12-12 15:20:04 +04:00
Nikolay Kasyanov
874ecee079 OS X: do not enforce static boost, this can be set externally 
anyway
 2013-12-12 14:20:13 +04:00
Nikolay Kasyanov
89c60b065c OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable 2013-12-12 14:19:48 +04:00
Nikolay Kasyanov
87853f4066 OS X: consider Ogre CG plugin as used only if it’s found 2013-12-12 13:53:35 +04:00
Nikolay Kasyanov
99cfb8cda2 OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt 2013-12-12 13:53:35 +04:00
pvdk
d8f20d2e66 Added the infrastructure to start working on the installation wizard 2013-12-07 16:17:07 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
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.
 2013-11-15 16:53:05 +01:00
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.
 2013-11-15 15:59:38 +01:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +04:00
Marc Zinnschlag
ef401a774b Merge remote-tracking branch 'eroen/install-fix' 2013-11-08 09:10:44 +01:00
Marc Zinnschlag
224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 2013-11-08 09:10:26 +01:00
Bret Curtis
5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-08 09:08:56 +01:00
eroen
e885c502a1 Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 2013-11-08 04:37:55 +01:00
eroen
6b931f566d Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 2013-11-08 04:30:15 +01:00
Bret Curtis
36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-07 23:05:45 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
Marc Zinnschlag
f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 2013-11-05 08:19:29 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
Marc Zinnschlag
b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 2013-10-29 14:18:13 +01:00
Alexander "Ace" Olofsson
632a53ead4 Support packing the OpenCS into windows builds 2013-10-29 13:28:43 +01:00
Marc Zinnschlag
29fce6d11f increased version number 2013-10-28 08:45:56 +01:00
Marek Kochanowicz
b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +02:00
Marek Kochanowicz
6b293961b4 This appears to work. 2013-10-20 10:02:33 +02:00
Marek Kochanowicz
155662860c Added configrue file in cmake. Hopefully it will copy defaultfilters file. 2013-10-20 09:50:16 +02:00
Nikolay Kasyanov
3993c34739 Merge remote-tracking branch 'upstream/master' into osx-ogre-19 2013-10-14 20:37:55 +04:00
Nikolay Kasyanov
a18e3c9cc1 Fixed packaging when building against Ogre 1.9 2013-09-15 23:10:21 +04:00
Nikolay Kasyanov
36fb89c6cd Cleanup 2013-09-15 23:03:07 +04:00
Marc Zinnschlag
9637e1641b fix for building with system tinyxml 2013-09-14 13:33:49 +02:00
Marc Zinnschlag
6f64b1b9db cmake option to use system tinyxml instead of embedded one 2013-09-13 15:11:17 +02:00
Marc Zinnschlag
4dbacdc6bd increased version number 2013-09-02 10:58:58 +02:00
Marc Zinnschlag
0c8f85f17d Merge remote-tracking branch 'wheybags/master' 2013-08-20 11:05:50 +02:00
scrawl
13afcc9324 Don't link to OgreTerrain 2013-08-19 22:22:14 +02:00
Tom Mason
865a7c63df cmake for system libunshield 2013-08-19 20:20:00 +01:00
Tom Mason
ceb3317807 Integrate unshield with launcher 2013-08-19 20:19:01 +01:00
eroen
8d925b7fd6 cleanup 
-   drop trailing slashes from paths for consistency
-   sort entries that got unsorted
 2013-08-19 20:39:37 +02:00
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.
 2013-08-19 20:39:37 +02:00
Chris Robinson
de95926e9f Use controllers to animate lights in ObjectLists 2013-08-06 19:49:04 -07:00
Marc Zinnschlag
130141ecac Merge remote-tracking branch 'corristo/master' 2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 2013-07-31 22:30:52 +04:00
bwrsandman
36fb7f3a72 Cleanup 2013-07-31 11:51:33 -04:00
bwrsandman
71a75d2ab8 Small fixes 2013-07-31 11:49:23 -04:00
bwrsandman
9a900908cd Merge deb and non-deb 2013-07-31 11:25:11 -04:00
bwrsandman
e22b7c8fc1 Add use of SYSCONFDIR path for conf files in deb 2013-07-31 11:11:03 -04:00
bwrsandman
799c84b846 Moved deb version checking down with cpack 2013-07-31 10:27:01 -04:00
bwrsandman
3baf44c4b5 Moved non-deb install section up for readability 2013-07-31 10:19:05 -04:00
bwrsandman
0e02d7817e Moved non-deb up for readability 2013-07-31 10:13:04 -04:00
bwrsandman
b6e3b5e834 Add licenses to installed files for non-deb packages. 2013-07-31 09:47:12 -04:00
bwrsandman
98289f051f Set location for all non apple unixes, not just debian. 2013-07-31 04:04:27 -04:00
Marc Zinnschlag
20e92c2cdf increased version number 2013-07-21 14:17:01 +02:00
k1ll
39a12ab9cf CXX Flags aren't definitions 2013-06-27 19:20:14 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
graffy76
7175c7cfe0 Updated OpenMW project CMakeLists.txt to include opencs.cfg file 
installation.
 2013-06-23 21:17:52 -05:00
Bret Curtis
84a8ea4ef7 static sdl2 compilation option for Unixes that are not Apple 2013-06-18 14:31:47 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
Nikolay Kasyanov
6abb7a18b0 SDL2 input: seems to work on OS X, has some input issues though 2013-06-15 14:40:18 +04:00
scrawl
ab3634d692 Removed some remains of OIS 2013-06-12 20:13:19 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
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
 2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
Nikolay Kasyanov
d13430e2b8 Fix for CMake > 2.8.9 on OS X 2013-06-09 20:59:31 +04:00
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.
 2013-05-26 12:44:30 +02:00
Marc Zinnschlag
3ae02547d2 increased version number 2013-05-23 22:42:36 +02:00
scrawl
a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 2013-05-22 21:01:05 +02:00
bwrsandman
8cdef343ef take default prefix into account 2013-05-10 05:21:10 -04:00
bwrsandman
642ac15721 moved openmw resources to /usr/share/games and added missing files 2013-05-09 23:24:46 -04:00
bwrsandman
a5db557e22 fixed /share to be /usr/share 2013-05-09 22:32:43 -04:00
Marc Zinnschlag
3b3a052f4f increased version number 2013-04-18 22:36:48 +02:00
Chris Robinson
81615c1ae5 Add a custom GrowFade particle affector 2013-04-06 00:18:36 -07:00
Alexander "Ace" Olofsson
8d706f8183 Include the ini importer in windows packages 2013-03-16 10:36:35 +01:00
vorenon
00deff1758 fixed path for launcher icons 2013-03-13 09:37:14 +01:00
pvdk
30f3fbac3c Fixed paths to OpenMW icons 2013-03-12 21:21:08 +01:00
Marc Zinnschlag
d6a5915bbd updated version to 0.22.0 2013-03-12 14:56:11 +01:00
Marc Zinnschlag
5e113627b7 Merge remote-tracking branch 'psi29a/master' 2013-03-10 09:29:21 +01:00
Bret Curtis
b8c42fde1f removed chrono from deps, not needed for boost < 1.50 2013-03-10 08:48:54 +01:00
Sandy Carter
b457c7de5e added linux opencs.desktop file 2013-03-09 02:43:29 -05:00
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. 2013-03-08 15:30:53 +01:00
Emanuel Guevel
3adf3f5121 Revive bsatool 2013-03-07 21:13:10 +01:00
Pieter van der Kloet
f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 2013-03-03 00:48:09 +01:00
scrawl
9810eafe23 Removing now unused oengine/imagerotate 2013-03-01 22:27:53 +01:00
Marc Zinnschlag
372308b49a Merge remote-tracking branch 'amdmi3/installation-fixes' 2013-02-28 10:04:42 +01:00
Dmitry Marakasov
0e8ff22d6f Only install binaries which are enabled to be built 2013-02-28 07:20:56 +04:00
Alexander "Ace" Olofsson
d5aa975675 Fix some issues that seem to have appeared in the CMake configuration. 2013-02-27 23:44:20 +01:00
Dmitry Marakasov
f994b7d227 Prepare .desktop file for more systems 
This brings condition for .desktop file preparation in sync with
condition for its installation.
 2013-02-27 07:44:35 +04:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
Nathan Jeffords
1af4e11414 apply MSVC warning settings to shiny projects 2013-02-23 10:24:18 -08:00
Chris Robinson
3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 2013-02-22 01:34:22 -08:00
hasufell
56468eaecf Add install rule for opencs 2013-02-21 19:19:53 +01:00
Chris Robinson
86f6491bc8 Remove unused pmove code 2013-02-19 06:38:48 -08:00
Alexander "Ace" Olofsson
f9a0a19ee1 Fix a small issue in the windows installer, also added the OpenMW version to the installed package name 2013-02-12 13:23:25 +01:00
Marc Zinnschlag
cfceb45009 adjusted gcc settings again to avoid problems with older compiler versions 2013-02-05 11:53:48 +01:00
Marc Zinnschlag
827261e8b4 increased version number 2013-02-02 13:42:11 +01:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
Nathan Jeffords
4e46f403a9 added some more warning to ignore in MSVC 2013-02-01 21:02:24 -08:00
scrawl
cac68c9e87 Removed an outdated section from CMakeLists 2013-01-23 11:48:47 +01:00
Jordan Milne
ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 2013-01-10 17:21:47 -04:00
Jordan Milne
6449f68d61 Merge branch 'master' into sdl_input 2013-01-08 06:24:31 -04:00
Jordan Milne
884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 2013-01-08 06:19:05 -04:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
scrawl
35f4d09288 swscale handled better (cmake) 2013-01-07 13:06:16 +01:00
Nathan Jeffords
dcfa902525 fixed error in cmake when disabling esmtool 2013-01-04 13:08:09 -08:00
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.
 2013-01-03 01:09:03 +01:00
Marc Zinnschlag
334588bf1c Merge branch 'editor2' 2012-12-28 23:31:43 +01:00
Chris Robinson
3829bbfeca Look for all available sound input libs as needed, and warn if not found 2012-12-16 04:01:27 -08:00
Chris Robinson
8cde6db665 We no longer need SDL 2012-12-16 03:17:17 -08:00
psi29a
e4ac7a4df4 remove libboost1-xxx from deb depends since we can compile statically 2012-12-12 09:27:15 +01:00
scrawl
c49966dd29 started over 2012-12-11 22:49:31 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
psi29a
4114e823ac Allow the ability to choose to compile against boost libs statically. 2012-12-10 10:32:00 +01:00
Marc Zinnschlag
d97d4b8ef0 updated version number 2012-12-08 10:12:19 +01:00
scrawl
d432420a32 fix FindFFmpeg.cmake 2012-12-01 20:53:28 +01:00
Marc Zinnschlag
c3cd6e8a8a new attempt at the editor 2012-11-21 17:31:18 +01:00
Marc Zinnschlag
37a42c7dbc increased version number; updated changelog 2012-11-01 16:38:07 +01:00
Marc Zinnschlag
648b53ef93 removed unused launcher.cfg file 2012-10-31 10:09:27 +01:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
Nikolay Kasyanov
4b5706d652 Fixed packaging on OS X 2012-09-19 11:16:13 +04:00
Marc Zinnschlag
747a4e1123 increased version number and updated readme 2012-09-18 11:19:21 +02:00
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.
 2012-09-15 16:21:07 -04:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
Marc Zinnschlag
4076c19cc6 silencing a cmake warning 2012-09-10 22:30:05 +02:00
Lukasz Gromanowski
3c2efbe966 Disable "make install" for Debian based linux distributions. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-09-10 23:03:11 +03:00
Alexander "Ace" Olofsson
a61edb60fd Fixed an issue with windows CPack failing due to trying to install linux binaries 2012-09-09 16:28:51 +02:00
Lukasz Gromanowski
99c46093dd Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests 2012-09-08 22:18:25 +03:00
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>
 2012-08-22 21:11:03 +03:00
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
 2012-08-19 22:09:22 +02:00
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>
 2012-08-19 22:23:46 +03:00
Marc Zinnschlag
98219323b7 Merge remote-tracking branch 'mmd/vsdebugfixes' 2012-08-18 12:56:59 +02:00
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.
 2012-08-17 10:47:20 -04:00
Marc Zinnschlag
3112bfb54f incremented version number 2012-08-17 15:37:54 +02:00
Marc Zinnschlag
2a11a28e81 Revert "Use debug dlls when debugging in vs2010" 
This reverts commit ebe131b326.
 2012-08-17 10:05:29 +02:00
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.
 2012-08-16 11:18:16 -04:00
scrawl
976ad7a301 key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw 2012-08-12 22:59:58 +02:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
Nikolay Kasyanov
defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix 
Conflicts:
	CMakeLists.txt
 2012-07-31 01:06:18 +04:00
Michael Mc Donnell
e7a1ab9fa6 Define OGRE_PLUGIN_DEBUG_SUFFIX in all cases. 2012-07-30 15:04:14 -04:00
Nikolay Kasyanov
7161361b52 cleanup 2012-07-28 02:38:37 +04:00
Nikolay Kasyanov
23e44a86c6 another attempt to fix 2012-07-28 02:13:57 +04:00
Nikolay Kasyanov
a0a086f69d fixed redefining macro 2012-07-28 02:11:14 +04:00
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
 2012-07-28 01:55:37 +04:00
Sebastian Wick
0f40e6fc65 find boost without components so we can use Boost_VERSION 2012-07-25 00:47:08 +02:00
Nikolay Kasyanov
94ce95c679 bug #348: works again on OS X 2012-07-25 00:13:33 +04:00
scrawl
ac5bd38df9 some cmake fixes 2012-07-23 14:59:57 +02:00
scrawl
b2dcf5adcd support system install for boost wave 2012-07-22 14:41:23 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
e9b95d55cd Revert "Proper way to find and use libtbb" 
This reverts commit d6bf2b7d29.
 2012-07-17 09:49:52 +02:00
Dmitry Marakasov
d6bf2b7d29 Proper way to find and use libtbb 2012-07-17 00:11:56 +04:00
Dmitry Marakasov
e862b6b5a5 Fix comparison in cmake 2012-07-16 15:53:02 +04:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
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).
 2012-07-15 08:40:18 -07:00
scrawl
9ed2f1df67 boost wave not needed anymore 2012-07-15 08:39:34 +02:00
scrawl
94c3fb81d1 check if CMAKE_BUILD_TYPE is defined instead of defining it by default 2012-07-14 21:36:42 +02:00
scrawl
32e14907a2 add a default value for CMAKE_BUILD_TYPE, resolves error when it is not set 2012-07-14 19:09:35 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
scrawl
fb109ec7e2 use debug versions of ogre plugins in debug mode 2012-07-13 11:30:47 +02:00
scrawl
de9b7a51de change glsl #version, remove CG from required libraries 2012-07-04 00:33:09 +02:00
scrawl
a1e48b0feb builds now 2012-07-03 22:48:16 +02:00
scrawl
24399a45c1 add submodule with current code 2012-07-03 22:27:22 +02:00
Marc Zinnschlag
68459441f2 adjusting version number 2012-06-21 12:40:44 +02:00
Alexander "Ace" Olofsson
82fba53771 Removed the license screen and changed so all licenses are instead installed to the game folder. 2012-06-13 14:58:27 +02:00
Marc Zinnschlag
3673cd2531 increased version number 2012-05-21 12:41:15 +02:00
scrawl
a4d6d1baff added a utility for creating texture atlas at runtime 2012-05-04 18:09:45 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
Alexander "Ace" Olofsson
f7a03b39c4 Some improvments for windows builds and installer 2012-04-19 14:58:27 +02:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
Nikolay Kasyanov
0c739825f2 another fix 2012-04-16 16:04:14 +02:00
Nikolay Kasyanov
582d7ab213 building & packaging improvements for OS X 2012-04-16 15:28:09 +02:00
Marc Zinnschlag
b76fd249c7 updated changelog; bumped version number 2012-04-15 23:18:34 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
k1ll
8156e9e5c4 Fixed install search path for openmw.desktop. It's directly in the binary dir. 2012-04-13 18:23:15 +02:00
k1ll
2d6cd16296 Now Debian Packages install the configured openmw.desktop file. 2012-04-13 17:53:01 +02:00
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. 2012-04-13 17:46:26 +02:00
k1ll
226f312163 Set the version in the openmw.desktop file via CMake 2012-04-13 17:36:31 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
scrawl
944654f263 image rotating function 2012-04-09 15:20:57 +02:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
Jason Hooks
ebab98a8a0 Restructuring things 2012-04-07 22:02:20 -04:00
Alexander "Ace" Olofsson
bf5a009299 Some improvements to the windows installer 2012-04-07 23:33:54 +02:00
k1ll
f2c4e513a4 Add support for building with a static build of the MyGui Libraries. 2012-04-05 13:01:09 +02:00
scrawl
2b4b941192 Merge branch 'master' into gamesettings 2012-04-02 15:21:10 +02:00
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
 2012-04-02 12:04:47 +02:00
Jason Hooks
07d0203a3c Merge remote-tracking branch 'upstream/master' 2012-04-02 00:08:12 -04:00
Chris Robinson
63e0e82049 Implement an Audiere-based decoder 2012-04-01 15:02:07 -07:00
scrawl
c2a82c3d89 Merge branch 'master' into gamesettings 2012-04-01 20:06:18 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
Roman Melnik
ed58e9e553 Merge remote-tracking branch 'upstream/master' 2012-04-01 17:53:12 +03:00
Jason Hooks
0021ccf862 Merge remote-tracking branch 'upstream/master' 2012-03-31 20:48:42 -04:00
Roman Melnik
35f787c4bf Merge remote-tracking branch 'upstream/master' 2012-03-31 22:58:06 +03:00
Nikolay Kasyanov
057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-31 13:42:13 +04:00
Sebastian Wick
fbd626baf6 mwiniimporter 2012-03-30 20:59:44 +02:00
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
 2012-03-30 15:38:14 +02:00
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
 2012-03-30 02:50:30 +04:00