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
Roman Melnik
35f787c4bf
Merge remote-tracking branch 'upstream/master'
2012-03-31 22:58:06 +03: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
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
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
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
Alexander "Ace" Olofsson
5beee8598d
Giving the windows installer a more personal look.
2012-03-09 15:34:47 +01:00
