Commit Graph

311 Commits (0549e949ba6cab8fb06919ebcc0ee4dee558ef59)

Author SHA1 Message Date
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 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 fb109ec7e2 use debug versions of ogre plugins in debug mode 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