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

788 commits

Author SHA1 Message Date
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
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
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 2012-03-26 23:21:51 +04:00
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()
 2012-03-26 00:12:00 +03:00
Chris Robinson
2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 2012-03-24 17:27:10 -07:00
Nikolay Kasyanov
8e76451cda Fix launcher style installation on OS X again 2012-03-25 02:00:49 +04:00
Alexander "Ace" Olofsson
dcdc759719 Adding readme to windows builds 2012-03-23 13:02:07 +01:00
scrawl
9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 2012-03-22 22:31:49 +01:00
scrawl
6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 2012-03-22 21:41:32 +01:00
scrawl
250fcab7c2 moved the mygui resources to a more suitable location 2012-03-22 17:11:24 +01:00
Chris Robinson
9a48002025 Fix compilation of the FFmpeg decoder 2012-03-20 14:13:58 -07:00
scrawl
66baf9ec81 Merge branch 'master' into mygui 2012-03-20 20:02:30 +01:00
Chris Robinson
74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 2012-03-20 06:17:02 -07:00
Marc Zinnschlag
50b79de10b Merge remote branch 'psi29a/master' 2012-03-20 10:26:08 +01:00
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
 2012-03-20 09:53:39 +01:00
Brother Brick
42584b013f Updated dependency to match our PPA 2012-03-20 09:43:48 +01:00
Jason Hooks
ed7cb1dc67 restarting 2012-03-19 19:38:44 -04:00
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>
 2012-03-19 20:54:30 +01:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
gugus
7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 00:20:43 +01:00
Marc Zinnschlag
cab869824a bumping version number 2012-03-18 22:18:09 +01:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
Marc Zinnschlag
655f9fe920 Merge remote branch 'k1ll/staticogre' 2012-03-18 11:16:34 +01:00
k1ll
b83b7d0650 Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin. 2012-03-17 20:03:37 +01:00
Chris Robinson
246b0266fb Remove references to Audiere. It's not supported for now. 2012-03-17 00:11:59 -07:00
Chris Robinson
45b612ab3b Add a skeleton output classs using OpenAL 2012-03-16 22:12:17 -07:00
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.
 2012-03-16 17:08:13 -07:00
gugus
5b08baf5bf a little fix for CMake to be able not to build the launcher 2012-03-16 18:20:02 +01:00
Nikolay Kasyanov
65fc141b62 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-15 20:38:21 +04:00
Marc Zinnschlag
5b378e820d warning level adjustments and some related fixes 2012-03-15 16:01:41 +01:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Marc Zinnschlag
311c0b04e2 Merge remote branch 'ace/win-warning' 2012-03-15 15:07:31 +01:00
Alexander "Ace" Olofsson
04494893c8 Added some release mode warnings 2012-03-15 14:10:12 +01:00
Marc Zinnschlag
ff866269ec Merge remote branch 'corristo/pgrd' 
Removed a warning

Conflicts:
	CMakeLists.txt
 2012-03-14 16:45:53 +01:00
Alexander "Ace" Olofsson
477525ee48 Minor modification and spelling correction 2012-03-14 11:36:13 +01:00
Alexander "Ace" Olofsson
ac0ba0c273 A little bit more commenting and sorting out the "normally not enabled" warnings 2012-03-13 23:51:48 +01:00
Alexander "Ace" Olofsson
e7c3ddfe40 Final warning changes 2012-03-13 23:04:33 +01:00
Alexander "Ace" Olofsson
2f11bfc984 I think I've added all the warnings now 2012-03-13 22:47:39 +01:00
Alexander "Ace" Olofsson
cecc823cd0 Commented list of disabled warnings to start with 2012-03-13 22:01:18 +01:00
scrawl
d22678faab fixed wrong merge 2012-03-13 17:14:02 +01:00
scrawl
4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-13 16:00:59 +01:00
Nikolay Kasyanov
6325697bfe Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name 2012-03-12 20:47:47 +04:00
Nikolay Kasyanov
387c84e606 small fix in CMakeLists, thx ace13 2012-03-11 18:46:32 +04:00
Nikolay Kasyanov
5328853445 Feature #37 (In Progress) Render Path Grid 
added "togglepathgrid" script command
 2012-03-10 18:13:44 +04:00
Alexander "Ace" Olofsson
5beee8598d Giving the windows installer a more personal look. 2012-03-09 15:34:47 +01:00
scrawl
8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-07 13:29:59 +01:00
Pieter van der Kloet
2429f3960f Merge remote-tracking branch 'upstream/master' into launcher 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
 2012-03-05 23:43:59 +01:00
Nikolay Kasyanov
40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records 
Struct sizes seems correct, but floats is broken
 2012-03-03 18:27:38 +04:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Marc Zinnschlag
a86d2877fc Merge remote branch 'ace/win64-fixes' 2012-03-02 11:00:41 +01:00
Nikolay Kasyanov
b283ad86fb revert to old launcher stylesheet location on OS X 2012-03-01 17:16:44 +04:00
Alexander "Ace" Olofsson
2c4ef5c670 64-bit install path on windows was easier to fix than expected. 2012-03-01 08:13:40 +01:00
Pieter van der Kloet
11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 2012-02-28 22:45:03 +01:00
scrawl
f2c3616638 Merge branch 'next' into terrain_next 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake
 2012-02-28 21:49:45 +01:00
Pieter van der Kloet
5b54a658d8 Launcher improvements: ask for data dir and write it to cfg if none is found 
and prevent removal of the default profile
 2012-02-28 17:19:44 +01:00
Marc Zinnschlag
7505c96fbb Merge remote branch 'lgro/master' 2012-02-26 12:59:11 +01:00
Lukasz Gromanowski
cb5534c608 Updated website URL in CMakeLists file. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-26 12:12:00 +01:00
Nikolay Kasyanov
822f47fbac Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms 2012-02-25 18:05:29 +04:00
Pieter van der Kloet
280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 2012-02-22 08:34:47 +01:00
Marc Zinnschlag
b2b09320fc Merge branch 'config' 2012-02-21 13:55:58 +01:00
scrawl
694a537b57 - removed caelum sources, resources, build scripts 2012-02-21 00:14:20 +01:00
scrawl
f7462f980f added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS 2012-02-20 18:39:12 +01:00
Marc Zinnschlag
db205cf8aa Merge remote branch 'scrawl/next' into test 
Conflicts:
	libs/openengine
 2012-02-20 14:54:08 +01:00
scrawl
f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 2012-02-18 18:25:28 +01:00
Alexander "Ace" Olofsson
6a71cf21b0 Added OpenAL redistributable to OpenMW installer 2012-02-16 08:52:26 +01:00
Marc Zinnschlag
d9c1ed3d5e Merge remote branch 'corristo/osx-packaging' into config 2012-02-15 10:32:16 +01:00
Nikolay Kasyanov
57a4b19880 Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete 2012-02-15 11:27:51 +04:00
Marc Zinnschlag
8277df04b1 bumping version number 2012-02-14 09:26:06 +01:00
Marc Zinnschlag
10d4771550 Merge remote branch 'corristo/osx-packaging' 2012-02-13 16:35:13 +01:00
Nikolay Kasyanov
5a42c6c6f5 Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher 2012-02-13 10:31:43 +04:00
Marc Zinnschlag
facc36fa34 Merge remote branch 'corristo/osx-packaging' into packaging 2012-02-12 13:35:54 +01:00
Nikolay Kasyanov
472d88e2c5 Feature #162 - Need to create app bundle using CMake, not by hand WIP 2012-02-01 20:48:13 +04:00
Alexander "Ace" Olofsson
72c4f75212 Only install redist if it exists 2012-01-29 23:12:40 +01:00
Alexander "Ace" Olofsson
4fe31fbd61 Simple windows packaging with CPack (NSIS) 2012-01-29 23:08:02 +01:00
Nikolay Kasyanov
705b2955a0 Feature #162 - Need to create app bundle using CMake, not by hand. 
In progress, working towards plugins support.
 2012-01-30 00:28:02 +04:00
Nikolay Kasyanov
a301fc355e Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins) 2012-01-29 23:41:27 +04:00
Jacob Essex
18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 2012-01-21 16:59:08 +00:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Marc Zinnschlag
ad086312b8 testing: cmake script simplification 2011-10-22 13:55:06 +02:00
Brother Brick
a3a1b82929 Updated deb dependancies against Ubuntu 11.10 which is more or less in parity with Debian Sid. 2011-10-12 13:58:59 +02:00
Marc Zinnschlag
5bfd953dd4 Merge remote branch 'gus/journal' 2011-09-30 09:38:16 +02:00
Marc Zinnschlag
22514cbd4c Merge branch 'debfix' 2011-09-30 09:36:21 +02:00
Marc Zinnschlag
9872c89539 packaging fixes for .deb packages 2011-09-30 09:36:06 +02:00
gugus
a6ffa1a82a Allow not to build the launcher 2011-09-29 14:59:20 +02:00
Marc Zinnschlag
7c8853f6fe post-merge fixes 2011-09-27 09:45:28 +02:00
Marc Zinnschlag
84a2053671 increased version number; another version number handling fix releated to deb packages 2011-09-07 09:17:50 +02:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
Marc Zinnschlag
7c023a9973 fixed version number 2011-07-31 20:20:52 +02:00
Marc Zinnschlag
b157273cd9 Merge branch 'next' 
Conflicts:
	apps/openmw/main.cpp
 2011-07-31 19:28:12 +02:00
Marc Zinnschlag
46e93eda40 Merge branch 'newlauncher' 2011-07-31 19:24:59 +02:00
Nikolay Kasyanov
9921e86790 Forcing to build with 10.6 sdk on OS X. 2011-07-27 14:15:28 +04:00
Pieter van der Kloet
24a07eef05 Merge remote-tracking branch 'upstream/master' into newlauncher 2011-07-23 23:25:05 +02:00
Marc Zinnschlag
6ddf9e4cc5 minor correction 2011-07-08 14:53:01 +02:00
Marc Zinnschlag
d5e4635198 state OpenMW version on doxygen main page 2011-07-08 14:52:34 +02:00
Marc Zinnschlag
f07f363a21 declare OpenMW version in CMakeLists.txt 2011-07-08 14:24:09 +02:00
Nikolay Kasyanov
e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 2011-06-26 20:15:42 +04:00
Pieter van der Kloet
d7a3b84b3d Merge remote-tracking branch 'upstream/master' into newlauncher 2011-06-06 15:45:17 +02:00
athile
231be8f381 Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file). 2011-05-31 21:55:08 -06:00
Pieter van der Kloet
7c1f00884d Merge remote-tracking branch 'upstream/master' into newlauncher 2011-05-08 20:21:57 +02:00
Marc Zinnschlag
d260e5c1bd added file collection class 2011-05-05 19:00:00 +02:00
Pieter van der Kloet
7b554897e7 Merge remote-tracking branch 'upstream/master' into newlauncher 
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	components/esm/defs.hpp
	components/esm/loadappa.hpp
	components/esm/loadbody.hpp
	components/esm/loadclas.hpp
	components/esm/loadcrea.hpp
	components/esm/loadsndg.hpp
	components/interpreter/installopcodes.cpp
 2011-04-28 22:05:53 +02:00
Marc Zinnschlag
d8fa2f201a improved description of openmw.cfg related cmake-variable 2011-04-28 21:55:09 +02:00
Marc Zinnschlag
d47abff25d create local openmw.cfg file for uninstalled version 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
94f3bc115f Added missing resource file 2011-04-28 21:55:06 +02:00
Nikolay Kasyanov
fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp. 
Removed obsolete *.cpp files.
 2011-04-28 21:55:05 +02:00
Nikolay Kasyanov
7168795ae6 components/esm header refactoring in progress. Refactored: 
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
 2011-04-28 21:55:05 +02:00
Nikolay Kasyanov
eaea48011d Now working mac app bundle generated during build 
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
 2011-04-28 21:55:05 +02:00
Marc Zinnschlag
7131c08ca4 moved path.hpp/path.cpp to a new component 2011-04-28 09:39:40 +02:00
Marc Zinnschlag
042c179ce7 fixed the openmw.cfg install problem (I hope) 2011-04-28 09:30:45 +02:00
Jan-Peter Nilsson
73f2fdfa72 Update default version and add libbullet2.77 as a dependency 2011-04-27 12:34:52 +02:00
Marc Zinnschlag
573090a07f improved description of openmw.cfg related cmake-variable 2011-04-24 12:41:55 +02:00
Marc Zinnschlag
0c4e9d9207 create local openmw.cfg file for uninstalled version 2011-04-24 12:39:50 +02:00
Marc Zinnschlag
7c506301b7 Merge remote branch 'corristo/header-refactoring' into header-refactoring 
Conflicts:
	CMakeLists.txt
 2011-04-08 19:24:21 +02:00
Nikolay Kasyanov
1e5768170f Refactored remaining headers in components/esm except defs.hpp. 
Removed obsolete *.cpp files.
 2011-04-08 17:58:21 +04:00
Nikolay Kasyanov
a2c42ab5a2 components/esm header refactoring in progress. Refactored: 
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
 2011-04-06 20:11:08 +04:00
Jan-Peter Nilsson
08784470bc Update default version and add libbullet2.77 as a dependency 2011-04-03 13:20:18 +02:00
Pieter van der Kloet
91fa147146 Modified CMake to include the launcher directory 2011-03-29 01:31:42 +02:00
Marc Zinnschlag
74d036a26a getting rid of a cmake warning 2011-03-29 00:34:35 +02:00
Pieter van der Kloet
6e1e3b797c Fixed a bug in the CMake file that prevented the plugins.cfg from being copied on Linux. 2011-03-28 20:25:55 +02:00
Nikolay Kasyanov
4e7a056e9e Now working mac app bundle generated during build 
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
 2011-03-27 23:28:46 +04:00
Marc Zinnschlag
647e88003e build and activation fix 2011-03-19 19:54:37 +01:00
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-15 13:36:25 +01:00
Nikolay Kasyanov
edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 2011-03-12 03:00:42 +03:00
Nikolay Kasyanov
768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 2011-03-09 01:42:04 +03:00
Nikolay Kasyanov
943eea8104 .app bundle finally works 2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
527ac956a7 More correct MacOS X bundle generation 2011-03-07 06:03:39 +03:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
e290f2f82f Get physic fix in openengine and build nifbullet 2011-02-27 00:47:56 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
ee0d73e142 Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions 2011-02-19 15:54:00 +01:00
Marc Zinnschlag
8b2252e7a1 first attempt at building with bullet 2011-01-30 13:19:41 +01:00
gugus
a6c5bd0c41 correction of a spelling error 2011-01-25 18:29:04 +01:00
gugus
d1bcfcb94d Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions 2011-01-23 21:42:04 +01:00
gugus
a8ade56c80 Add a bullet Shape Loader 2011-01-13 17:51:50 +01:00
Jan-Peter Nilsson
4221824681 Build debian package using cpack if dpkg is available 
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
d1b482d64a Update plugins.cfg based on where cmake found ogre libraries 2011-01-12 18:18:06 +01:00
athile
c459eb7c55 Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010. 2011-01-10 13:48:16 -07:00
Diggory Hardy
39614c6813 CMake configuration tweaks 
Make the PkgConfig search for OGRE libraries and headers happy when custom paths are set.
Check the uuid/uuid.h header is found.
 2011-01-09 10:22:21 +01:00
Yuri Krupenin
e7d853bb3c Corrected subsystem link flags for MinGW. 2011-01-08 23:58:47 +03:00
Yuri Krupenin
15a7cc0674 That should solve link-time problems when building with mingw. 
Not supplying "SUBSYSTEM:" flags to mingw linker.
Linking mygui with libwinmm - should resolve reference to timeGetTime().
 2011-01-04 14:40:28 +03:00
Jan Borsodi
ee101440a2 Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations. 2010-09-24 15:28:14 +02:00
Jan Borsodi
54996684aa Merge branch 'master' into gui-windows 2010-09-19 02:04:36 +02:00
Jan Borsodi
64fce8d321 Added an option (USE_DEBUG_CONSOLE) to cmake file to disable the console for debug builds on windows. If set to false all debug output is redirect to the debug output of Visual Studio. 2010-09-19 02:01:01 +02:00
Jan Borsodi
e47568ea2e Merge branch 'master' into gui-windows 2010-09-14 23:27:35 +02:00
Jan Borsodi
e34b86e5c2 Added new define CAELUM_STATIC which will disable all dllexport for the caelum project. Made sure the define is set for both openmw and caelum. 2010-09-14 23:27:11 +02:00
Jan Borsodi
4416e71a0a Fix for linker warnings on windows, this makes sure headers of MyGUI does not use dllexport for windows as we are supposed to link statically to the library. 2010-09-14 23:27:10 +02:00
Jan Borsodi
1c79a62957 Added a static list of skill names to ESM::Skill. 2010-09-14 23:26:29 +02:00
Nicolay Korslund
0eae9d1504 Removed -Werror again 2010-09-10 19:34:38 +02:00
Jan Borsodi
0f860e2fbd openmw.cfg is now created with a configurable path (via cmake), the default is still "data" 2010-09-10 13:38:17 +02:00
Nicolay Korslund
5552c44753 Cleaned up strnlen in esm_reader. Added -Werror switch to g++. 2010-09-07 10:40:00 +02:00
athile
336fb1636c Windows fixes 2010-08-30 11:19:45 +01:00
athile
d955a0efc4 WIP Windows build 2010-08-30 02:12:54 +01:00
Nicolay Korslund
3127602c57 Added file_finder component. Used by sound system. 2010-08-20 12:56:46 +02:00
Nicolay Korslund
358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 2010-08-18 18:45:44 +02:00
Nicolay Korslund
08289158d7 Added support for WAV files with libsndfile 2010-08-16 17:14:37 +02:00
Nicolay Korslund
9875d74abf Implemented 3D sound placement. Sound management / lookup system not 
done yet.
 2010-08-14 21:01:20 +02:00
Nicolay Korslund
912c8b1f2d Added mpg123 file reader 2010-08-13 22:30:22 +02:00
Nicolay Korslund
ebcbff255e Changed how avcodec/avformat (ffmpeg) is included 2010-08-13 19:38:58 +02:00
Marc Zinnschlag
76492ea60b cmake improvements for sound options 2010-08-13 18:16:38 +02:00
Nicolay Korslund
cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 2010-08-13 17:11:03 +02:00
Nicolay Korslund
5d4dba981f Fixed mistake in NPC record struct 2010-08-13 15:51:42 +02:00
Nicolay Korslund
cf4185faef Added sound test (remember to git submodule update) 2010-08-13 14:43:57 +02:00
Nicolay Korslund
34572f0b19 Compiled and linked in sound system (not yet functional) 2010-08-12 16:13:54 +02:00
Armin Preiml
f3ee9ced5c Added cmake file for the iconv library and extended relevant 
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
 2010-07-31 19:02:29 +02:00
Nicolay Korslund
532ccbd1f8 Killed clientconsole, mwcompiler, mwinterpreter and command server 2010-07-22 14:15:02 +02:00
Nicolay Korslund
f87810ce7a Moved esmtool to apps/ 2010-07-21 13:52:28 +02:00
Nicolay Korslund
c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 2010-07-20 20:23:37 +02:00
Nicolay Korslund
5472a8c760 Killed mygui_dev 2010-07-17 19:40:12 +02:00
Nicolay Korslund
c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 2010-07-17 19:38:32 +02:00
Nicolay Korslund
4d74f85ae0 Moved mwgui manager to components, ready for testing 2010-07-16 22:27:50 +02:00
Nicolay Korslund
4eb2863db4 Added input to apps/mygui_dev/ 2010-07-16 21:49:36 +02:00
Nicolay Korslund
13d3f9c87e Integrated OpenEngine, replaces entire components/engine/ directory. 2010-07-16 14:56:14 +02:00
Nicolay Korslund
6966c66091 Gave apps/openmw/ its own CMakeLists.txt 2010-07-08 22:53:14 +02:00
Nicolay Korslund
9c839e220e Moved GUI stuff into components 2010-07-08 22:34:35 +02:00
Nicolay Korslund
b2d54a619e Implemented all MW window layouts 2010-07-08 15:23:35 +02:00
Nicolay Korslund
3896fd218a Added stand-alone GUI test, compiles and runs 2010-07-08 11:53:59 +02:00
Nicolay Korslund
0558664aa6 Added MyGUI source (cut down) and CMake files 2010-07-08 00:23:28 +02:00
Marc Zinnschlag
0efe4742a6 added script-gui interface and gui-related script instructions 2010-07-07 20:12:00 +02:00
Marc Zinnschlag
2c63d67ceb added gui manager skeleton and a cmake fix 2010-07-07 18:48:06 +02:00
Nicolay Korslund
b97def39b3 Minor fixes to Mac stuff 2010-07-07 10:07:15 +02:00
Nicolay Korslund
2ec96ed7de Merge branch 'master' of http://github.com/ardekantur/openmw 2010-07-07 09:53:13 +02:00
Nicolay Korslund
359f2903d7 Merged athile and zinnschlag 2010-07-07 09:46:11 +02:00
Marc Zinnschlag
3df5d377f2 added xbox function 2010-07-05 13:15:49 +02:00
athile
5fe4313b95 Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux. 2010-07-04 20:17:10 -07:00
Ardekantur
ee6c933156 Merge branch 'master' of git://github.com/korslund/openmw 
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	game/engine.cpp
 2010-07-04 17:16:57 -04:00
Ardekantur
bace14c45e Mac Build - adding architectures and Apple build locations 2010-07-04 17:07:22 -04:00
Marc Zinnschlag
d57e67e722 added global variable handling to compiler context (not working yet because of case problems) 2010-07-04 12:55:55 +02:00
Marc Zinnschlag
4482884eb5 implemented global script execution 2010-07-04 10:43:34 +02:00
Marc Zinnschlag
530caac39b merged CompilerScriptContext into base class 2010-07-04 09:59:29 +02:00
Marc Zinnschlag
3fae68b403 added unifying LiveCellRef pointer class 2010-07-03 17:46:55 +02:00
Marc Zinnschlag
d51e6fb7c4 second part of refactoring 2010-07-03 15:41:20 +02:00
Marc Zinnschlag
c12752df4d added sound manager skeleton and sound script functions 2010-07-03 15:04:00 +02:00
Marc Zinnschlag
f0c492ae22 added CellChanged script function 2010-07-03 12:12:13 +02:00
Marc Zinnschlag
474b412b47 implemented local script execution 2010-07-02 18:08:00 +02:00
Marc Zinnschlag
076b01559f added local script compiling 2010-07-02 17:21:27 +02:00
Marc Zinnschlag
2064c43d89 added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager 2010-07-02 16:18:25 +02:00
Marc Zinnschlag
a06b84ac86 added local variables to ref data 2010-07-02 14:31:29 +02:00
Marc Zinnschlag
def0a773bd replaced void * entry in cell store with a generic type 2010-07-02 13:48:48 +02:00
Nicolay Korslund
0de4bb9d6c Merged athile's work 2010-07-02 10:11:05 +02:00
Marc Zinnschlag
ea6d342a24 split CellRender into CellRender and CellRenderImp 2010-07-02 09:25:55 +02:00
Marc Zinnschlag
ce37666dbc factored world class out of main engine class 2010-07-02 09:00:06 +02:00
athile
9b2fa58b88 Add separate CMakeLists.txt files for mwcompiler and mwinterpreter 2010-07-01 16:29:22 -07:00
athile
7cc27d9b66 Add command output string and client/server response. 2010-07-01 15:50:24 -07:00
athile
d44f322b8a Add nesting to Visual Studio source groupings. 2010-07-01 12:09:05 -07:00
athile
056194baa2 Merge upstream 2010-07-01 12:01:59 -07:00
athile
7357ea2102 Add simple external console server/client 2010-07-01 11:49:00 -07:00
Marc Zinnschlag
1ad9b234f0 Merge branch 'mwscript' 
Conflicts:
	CMakeLists.txt
 2010-07-01 17:08:27 +02:00
Marc Zinnschlag
a9c2deb86e bad lineendings; as usual Windows is to blame 2010-07-01 17:00:54 +02:00
Marc Zinnschlag
bceb7ebcbd reimplemented expression parsing as a separate parser (still only handling non-negative integers) 2010-06-29 10:22:55 +02:00
Marc Zinnschlag
c6a37b2e18 added first batch of opcodes 2010-06-28 21:49:48 +02:00
athile
59a2e8dcf7 Merge upstream 2010-06-28 12:44:55 -07:00
Marc Zinnschlag
770eb14d95 added context for standalone interpreter 2010-06-28 20:07:17 +02:00
Marc Zinnschlag
487a70388f added interpreter framework 2010-06-28 19:20:45 +02:00
Marc Zinnschlag
fdcd34941b added parsing for set statement (only integer values so far); added code generator 2010-06-28 18:27:45 +02:00
Marc Zinnschlag
5cf3264bd3 added literal container and reworked output container handling 2010-06-28 16:48:19 +02:00
Marc Zinnschlag
a3ad61b4d0 write code file after successfull parsing 2010-06-28 14:07:55 +02:00
Marc Zinnschlag
0cfeab622d added storage class for local variable declarations; added checks for variable re-declaration 2010-06-28 13:28:50 +02:00
Marc Zinnschlag
21e0182ae2 added skip parser for skipping faulty lines 2010-06-28 12:47:11 +02:00
Marc Zinnschlag
bff0855af0 added parsing for local variable declarations 2010-06-28 12:32:08 +02:00
Marc Zinnschlag
16f6f27a90 added line parser (doesn't parse anything yet) 2010-06-28 12:12:47 +02:00
Marc Zinnschlag
aa99a0dd56 added basic script parser (can only parse empty script bodies for now) 2010-06-28 11:38:04 +02:00
athile
819c146ad1 Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings 2010-06-27 18:05:01 -07:00
athile
f1278232d2 Add CMakeLists.txt - should have been part of the last commit 2010-06-27 17:01:01 -07:00
athile
7db274f1c5 Sky rendering clean-up and correct resource configuration 2010-06-27 16:44:15 -07:00
athile
d67f0c74b0 Merge remote branch 'upstream/master' 2010-06-27 14:10:46 -07:00
athile
52a3233243 Work in progress Caelum integration 2010-06-27 14:08:53 -07:00
Marc Zinnschlag
ddcbc8cd62 added tokenizing of MW scripts 2010-06-27 19:20:21 +02:00
Marc Zinnschlag
31e22186ef added mwscript compiler standalone-executable (doesn't do anything yet) 2010-06-27 14:29:08 +02:00
Ardekantur
25ba9933f6 Mac Build - heinous additions for bundle management 2010-06-25 21:28:11 -04:00