mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-28 17:56:37 +00:00
Code Issues Releases Wiki Activity
2545 commits 115 branches 75 tags 128 MiB
Commit graph

2545 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
222f0e20bc Merge remote branch 'swick/initocfg' into initcfg 2012-03-31 11:20:05 +02:00
Sebastian Wick
849c3a9bec add the section to the ini-keys 2012-03-30 23:12:52 +02:00
Sebastian Wick
c160bc7080 works, sort of 2012-03-30 22:58:54 +02:00
Sebastian Wick
fbd626baf6 mwiniimporter 2012-03-30 20:59:44 +02:00
scrawl
a4576f043d fixed the physics debug rendering now activates/deactivates properly 2012-03-30 16:02:41 +02:00
Marc Zinnschlag
8d7bf34348 Merge branch 'terrain' 2012-03-30 15:52:27 +02:00
Marc Zinnschlag
557e97bab4 fixed a terrain-related Redemption crash 2012-03-30 15:52:09 +02:00
Marc Zinnschlag
46279a001b Merge remote branch 'scrawl/dialogue' 2012-03-30 15:39:56 +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
scrawl
4bbedeb3e7 made all dialogs semi transparent (like in morrowind) 2012-03-30 14:01:43 +02:00
scrawl
d3f31c3498 dialogue window enhancements 2012-03-30 13:53:35 +02:00
Marc Zinnschlag
a90c3b9f23 Merge remote branch 'scrawl/water' 2012-03-30 13:07:47 +02:00
Marc Zinnschlag
cc9a874f2b Merge remote branch 'corristo/openal' 2012-03-30 10:45:31 +02:00
scrawl
d5c49fa036 getWaterLevel use CellStore ; attempted fix for morrowind without tribunal 2012-03-30 10:12:28 +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
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
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
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
scrawl
42c5d515e6 fixed interior water level 2012-03-29 04:50:40 +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
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
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
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
Lukasz Gromanowski
fa4c4b8f21 Issue #225: Initialize members in class constructor. 2012-03-27 23:07:25 +02:00
scrawl
7900f2ac34 Merge pull request #1 from Yacoby/terrain18 
Terrain18
 2012-03-27 11:27:54 -07:00