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
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
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
Roman Melnik
35f787c4bf
Merge remote-tracking branch 'upstream/master'
13 years ago
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Sebastian Wick
fbd626baf6
mwiniimporter
13 years ago
Marc Zinnschlag
2d2af4b28a
Merge remote branch 'scrawl/terrain18' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
13 years ago
Nikolay Kasyanov
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
13 years ago
Nikolay Kasyanov
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
Roman Melnik
ef2f7e841a
Merge branch 'master' of github.com:Kromgart/openmw
13 years ago
Marc Zinnschlag
f2075c7f4f
temporarily silence warnigns in OGRE headers
13 years ago
scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
scrawl
6bea08157e
Merge branch 'master' into terrain18
13 years ago
Marc Zinnschlag
2b2eb34f8f
Merge remote branch 'corristo/master' into next
13 years ago
Nikolay Kasyanov
362e6cb9ed
Removed predefined SDK path. Found that it's generally not good idea to force it. Also -Wno-unused-but-set-parameter only set for gcc 4.6 or newer
13 years ago
Roman Melnik
35c3a0a3f9
Add Boost_USE_STATIC_LIBS parameter for Windows
...
If this parameter is not set in windows, cmake expects
boost libraries to be named "boost_*.lib", while they are
actually "libboost_*.lib"
In findBoost.cmake (728):
# Setting some more suffixes for the library
set (Boost_LIB_PREFIX "")
if (WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN)
set(Boost_LIB_PREFIX "lib")
endif()
13 years ago
Chris Robinson
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
13 years ago
Nikolay Kasyanov
8e76451cda
Fix launcher style installation on OS X again
13 years ago
Alexander "Ace" Olofsson
dcdc759719
Adding readme to windows builds
13 years ago
scrawl
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
13 years ago
scrawl
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
13 years ago
scrawl
250fcab7c2
moved the mygui resources to a more suitable location
13 years ago
Chris Robinson
9a48002025
Fix compilation of the FFmpeg decoder
13 years ago
scrawl
66baf9ec81
Merge branch 'master' into mygui
13 years ago
Chris Robinson
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
13 years ago
Marc Zinnschlag
50b79de10b
Merge remote branch 'psi29a/master'
13 years ago
Brother Brick
b6b972b73b
Removed libbullet and libogre dependencies and added nvidia-toolkit.
...
We are releasing OpenMW based on static libraries, so the first two
are no longer necessary
13 years ago
Brother Brick
42584b013f
Updated dependency to match our PPA
13 years ago
Lukasz Gromanowski
fc95917253
Fix for not visible pthreads function with glibc 2.15
...
Linking error will appear:
Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jason Hooks
51fb9e67cd
Merge
13 years ago
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
13 years ago
Marc Zinnschlag
cab869824a
bumping version number
13 years ago
scrawl
3a00fbb950
removed mygui from source tree and use system install instead
13 years ago
Marc Zinnschlag
655f9fe920
Merge remote branch 'k1ll/staticogre'
13 years ago
k1ll
b83b7d0650
Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin.
13 years ago
Chris Robinson
246b0266fb
Remove references to Audiere. It's not supported for now.
13 years ago
Chris Robinson
45b612ab3b
Add a skeleton output classs using OpenAL
13 years ago
Chris Robinson
42b445383f
Remove Mangle- and OpenEngine-related sound code
...
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
13 years ago
gugus
5b08baf5bf
a little fix for CMake to be able not to build the launcher
13 years ago
Nikolay Kasyanov
65fc141b62
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
13 years ago