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
