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

416 commits

Author SHA1 Message Date
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
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
 2012-03-29 13:27:13 +04:00
Roman Melnik
ef2f7e841a Merge branch 'master' of github.com:Kromgart/openmw 2012-03-28 23:08:39 +03:00
Marc Zinnschlag
f2075c7f4f temporarily silence warnigns in OGRE headers 2012-03-28 21:40:06 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-28 21:37:20 +02:00
scrawl
6bea08157e Merge branch 'master' into terrain18 2012-03-28 21:30:15 +02:00
Marc Zinnschlag
2b2eb34f8f Merge remote branch 'corristo/master' into next 2012-03-28 18:07:21 +02:00