Chris Robinson
f8f749dbec
Merge remote branch 'zini/next' into sound-rewrite
2012-03-26 00:02:21 -07:00
scrawl
4ee03cd61f
handle timeout
2012-03-26 00:31:03 +02:00
scrawl
98a33a7fc6
fix
2012-03-25 23:28:51 +02: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
Roman Melnik
978b5f64d8
Merge cmake/findBullet patch for '_debug' postfixed libraries
...
Merge in the patch from the cmake official repository:
https://cmake.org/gitweb?p=cmake.git;a=commit;h=6f935d7f55af5c96d18d23b72991e87d1e029dda
Without this fix cmake couldn't find bullet's debug libraries,
and VS2010 openmw project file was generated with links to
release libraries instead (which caused errors during build
in debug configuration).
2012-03-25 23:53:14 +03:00
scrawl
382fa6ac68
fixes
2012-03-25 22:53:00 +02:00
Roman Melnik
cabf7ff8ba
Merge remote-tracking branch 'upstream/master'
2012-03-25 23:44:22 +03:00
scrawl
53d4be5cf6
object pickup should work everywhere
2012-03-25 20:52:56 +02:00
scrawl
17a4adfe88
add raycast method that returns _all_ objects that were hit
2012-03-25 12:26:44 +02:00
Marc Zinnschlag
d993766ee1
Merge remote branch 'pvdk/garamond' into next
2012-03-25 11:05:41 +02:00
Chris Robinson
3e98e28059
Use a better method to get a more even randomization
2012-03-24 21:05:03 -07:00
Chris Robinson
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
2012-03-24 17:27:10 -07:00
scrawl
f959a5cbeb
auto adjust size of map window title bar
2012-03-24 23:24:19 +01:00
Nikolay Kasyanov
8e76451cda
Fix launcher style installation on OS X again
2012-03-25 02:00:49 +04:00
Pieter van der Kloet
426c278505
Changed the OpenMW default font from Comic sans to EB Garamond
2012-03-24 22:02:55 +01:00
Pieter van der Kloet
155cd76f37
Changed Launcher font to EB Garamond and added license info
2012-03-24 20:43:35 +01:00
scrawl
9d30a139cc
added api
2012-03-24 20:41:23 +01:00
scrawl
e212a32350
bugfix
2012-03-24 18:38:58 +01:00
scrawl
3e0d14bd70
Merge branch 'next' into occlusionquery
2012-03-24 18:03:39 +01:00
scrawl
743ea0c9be
use hardware occlusion query for sun glare effect
2012-03-24 17:59:26 +01:00
Marc Zinnschlag
4a2ade2372
Merge remote branch 'kromgart/master' into next
2012-03-24 16:57:06 +01:00
Chris Robinson
71d3f9bd51
Get the object reference's position once when updating its sounds
2012-03-24 08:12:04 -07:00
scrawl
5fba52c238
Merge branch 'terrain18' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-24 15:14:33 +01:00
scrawl
99b2b6b648
ogre 1.8 fixes
2012-03-24 14:46:48 +01:00
scrawl
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
2012-03-24 13:19:17 +01:00
scrawl
f4898539e9
added some code that doesn't do anything yet, waiting for ogre 1.8
2012-03-24 13:06:01 +01:00
Chris Robinson
5cb90ab704
Add some dummy copy constructors and assignment operators to prevent implicit versions from being used
2012-03-24 03:49:03 -07:00
Marc Zinnschlag
9ec1e55aaf
Merge remote branch 'scrawl/minimap' into next
2012-03-24 10:31:42 +01:00
Chris Robinson
fa70a72b75
Remove some unused sound manager fields and constructor parameters
2012-03-24 00:22:54 -07:00
Roman Melnik
e6c55c144c
Fix tabulation/formatting
2012-03-23 22:15:45 +02:00
Roman Melnik
6d33ad248d
Fix memory leak in getIdentity method
...
Replace static pointer and new() operator with normal static variable
2012-03-23 22:08:02 +02:00
scrawl
a6259a1b0d
bugfixes
2012-03-23 17:37:56 +01:00
scrawl
7a3034701f
functional HUD map
2012-03-23 16:51:56 +01:00
scrawl
a1f80e029e
abstracted some code to be reused for hud
2012-03-23 16:16:31 +01:00
scrawl
789fbb460f
move implementation to .cpp
2012-03-23 15:34:54 +01:00
scrawl
ce63d29d4a
rotate hud player arrow
2012-03-23 15:26:24 +01:00
scrawl
06fa310e29
player arrow rotated correctly
2012-03-23 15:00:48 +01:00
Alexander "Ace" Olofsson
dcdc759719
Adding readme to windows builds
2012-03-23 13:02:07 +01:00
scrawl
b8f962a68d
Merge branch 'next' into shaders
2012-03-23 10:26:20 +01:00
scrawl
770b0f2106
gui changes
2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0
player arrow
2012-03-23 09:00:00 +01:00
Chris Robinson
1ccddefe28
Properly report the default device when opening sound fails
2012-03-23 00:31:01 -07:00
scrawl
8e299bd25b
remove unuseful std::cout
2012-03-23 08:16:32 +01:00
scrawl
2dd329938a
automatically zoom in on the player while moving
2012-03-23 08:16:04 +01:00
Chris Robinson
2f0af42261
Use the ALC_ENUMERATE_ALL_EXT extension with OpenAL when available
2012-03-22 23:51:00 -07:00
Chris Robinson
277597c567
Fix DEFAULT_OUTPUT for OpenAL_Output
2012-03-22 18:44:55 -07:00
Chris Robinson
2e28819243
Avoid trying to play an ambient sound if there's no chance for any to play
2012-03-22 18:39:10 -07: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
cf3515a898
it is now possible to drag the minimap with the mouse
2012-03-22 21:27:21 +01:00