Alexander "Ace" Olofsson
60b95e7992
Sorting the file lists properly
2012-03-29 22:38:14 +02:00
Nikolay Kasyanov
b6aa8925f4
(Temporary) workaround for broken OpenAL implementations that doesn't return meaningful max counts of sources
2012-03-30 00:12:38 +04:00
Alexander "Ace" Olofsson
6acd900577
Better name
2012-03-29 21:36:00 +02:00
Alexander "Ace" Olofsson
c3944d3e1a
Use a normal binary search
2012-03-29 21:27:37 +02:00
Marc Zinnschlag
647c0e4df3
Merge remote branch 'scrawl/renderingdistance'
2012-03-29 21:27:25 +02:00
Marc Zinnschlag
eec135c040
Merge remote branch 'scrawl/water'
2012-03-29 21:20:16 +02:00
Chris Robinson
3d5384e2bb
Remove some unneeded casts
2012-03-29 11:28:33 -07:00
scrawl
79c2a2e465
implemented toggleWater (twa); formatting again
2012-03-29 18:33:08 +02:00
Marc Zinnschlag
10b4c1d904
silenced a warning
2012-03-29 18:04:52 +02:00
Marc Zinnschlag
ea79d9b7c3
Merge remote branch 'scrawl/renderingdistance'
2012-03-29 18:02:30 +02:00
Alexander "Ace" Olofsson
ce38876a74
Oops, that could've crashed horribly
2012-03-29 17:31:55 +02:00
scrawl
e22ae7c840
bounds fix (again)
2012-03-29 17:30:13 +02:00
scrawl
19c801f538
disabled rendering distance for now
2012-03-29 16:56:30 +02:00
scrawl
f45c650975
bounds fix
2012-03-29 16:47:59 +02:00
scrawl
2f096e131d
throw exception if water level is attempted to be modified in exterior
2012-03-29 16:23:02 +02:00
scrawl
5a19d4ec45
implement water script functions and save water height in CellStore
2012-03-29 15:50:15 +02:00
scrawl
f497813043
formatting, added Water::setHeight
2012-03-29 15:49:24 +02:00
Nikolay Kasyanov
0897a2a4cb
Merge branch 'master' into openal
2012-03-29 13:09:54 +04:00
scrawl
39b3afb98f
use camera height instead of player height for underwater check
2012-03-29 05:03:34 +02:00
Alexander "Ace" Olofsson
71cb85dbc4
Performance enhancment and minor copy-paste fix.
2012-03-29 04:54:33 +02:00
scrawl
42c5d515e6
fixed interior water level
2012-03-29 04:50:40 +02:00
Alexander "Ace" Olofsson
0d163d76ab
Replaced some messy code with some differently messy code, this one at least seems to work
2012-03-29 03:59:24 +02:00
Nikolay Kasyanov
20f976ddc7
probably openal initialization fix
2012-03-29 03:02:26 +04:00
Pieter van der Kloet
4488be33ce
Added missing slash to launcher CMakeLists.txt
2012-03-29 00:12:34 +02:00
scrawl
e5a19209a4
remove the timeout stuff
2012-03-29 00:05:48 +02:00
Roman Melnik
ef2f7e841a
Merge branch 'master' of github.com:Kromgart/openmw
2012-03-28 23:08:39 +03:00
scrawl
cb72e812f9
Merge branch 'master' into renderingdistance
2012-03-28 21:47:26 +02:00
Marc Zinnschlag
a0c5ccf974
Merge remote branch 'lgro/valgrind'
2012-03-28 21:46:47 +02:00
scrawl
47c3e92db1
removed the unused ray scene query
2012-03-28 21:42:41 +02: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
Lukasz Gromanowski
f86d53636d
Issue #225 : Correction to commit fa4c4b8
.
...
Correction to commit fa4c4b8
- memeber mChanged should be
set to true, otherwise the map won't display if the game
is started in (0, 0) cell.
2012-03-28 21:36:38 +02:00
scrawl
8bbb02a1bd
ogre 1.8 fixes
2012-03-28 21:30:59 +02:00
scrawl
6bea08157e
Merge branch 'master' into terrain18
2012-03-28 21:30:15 +02:00
scrawl
29acb057b3
Merge branch 'master' into occlusionquery
2012-03-28 21:04:42 +02:00
scrawl
cc7d3af701
Merge branch 'terrain18' into occlusionquery
2012-03-28 21:03:55 +02:00
Marc Zinnschlag
34d9ad0cbd
Merge remote branch 'chris/sound' into next
2012-03-28 18:14:35 +02:00
Marc Zinnschlag
2b2eb34f8f
Merge remote branch 'corristo/master' into next
2012-03-28 18:07:21 +02:00
Chris Robinson
bedf56a237
Merge remote branch 'zini/next' into sound
2012-03-28 06:27:34 -07:00
Chris Robinson
be337ef7cc
Return SoundPtr objects from playSound[3D]
...
Note that each Sound object currently contains "precious" resources even after
the sound is stopped. The reference should be reliquished as soon as it's no
longer needed (the SoundManager will make sure the sound continues to play
until it's finished).
2012-03-28 06:08:25 -07:00
Chris Robinson
293f33914e
Use a deque fpr OpenAL's free sources
2012-03-28 05:35:51 -07:00
Chris Robinson
a3291ef360
Add a sound method to update the volume
2012-03-28 05:19:35 -07:00
Chris Robinson
7008bd2fe1
Store some sound properties in the Sound class
2012-03-28 04:58:47 -07:00
Chris Robinson
c072babd17
Better handle bad OpenAL source counts
2012-03-28 04:56:40 -07:00
Chris Robinson
089c340935
Switch the map so the SoundPtr is used as a key
2012-03-28 04:37:00 -07:00
Nikolay Kasyanov
66b31d3d43
Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces
2012-03-28 12:04:42 +04:00
scrawl
72ff7ec030
Merge branch 'next' into occlusionquery
...
Conflicts:
apps/openmw/mwrender/sky.cpp
2012-03-27 23:46:48 +02:00
Lukasz Gromanowski
fa4c4b8f21
Issue #225 : Initialize members in class constructor.
2012-03-27 23:07:25 +02:00
scrawl
43b1f896f4
fix object pickup when player is very close to object
2012-03-27 22:36:02 +02:00
scrawl
8f6d10f229
fix uninitalised stuff
2012-03-27 20:59:58 +02:00