mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 09:19:58 +00:00
Code Issues Releases Wiki Activity
2774 commits 38 branches 54 tags 122 MiB
Commit graph

1556 commits

Author SHA1 Message Date
Chris Robinson
977e7ac9a3 Remove the Play_Single flag. It's not correct. 2012-03-31 07:41:26 -07:00
Chris Robinson
ae308b9b5f Use a set of flags instead of separate booleans 2012-03-31 07:31:55 -07:00
Chris Robinson
e48d125a84 Only allow one instance of a given tracked soundid 
The untracked flag should probably be broken up and combined with the loop
boolean into a set of flags.
 2012-03-31 05:57:03 -07:00
Nikolay Kasyanov
5e829362cb Feature #37 (In Progress) Render Path Grid 
more similar to vanilla path grid rendering
 2012-03-31 16:22:55 +04:00
Nikolay Kasyanov
006e1cde85 some updates after terrain merge 2012-03-31 14:56:54 +04:00
Nikolay Kasyanov
523648dbb1 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/debugging.cpp
 2012-03-31 14:56:18 +04:00
Chris Robinson
bfac946878 Finally "fix" --nosound 
Expect degraded performance with it. Looping sounds are constantly checked to
see if they're playing, and try to play it again when it's not.
 2012-03-31 03:31:41 -07:00
Chris Robinson
7541e08909 Don't reset the sound Output device if init fails 2012-03-31 02:48:14 -07:00
Nikolay Kasyanov
057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-31 13:42:13 +04:00
Marc Zinnschlag
509650d5f3 Merge remote branch 'ace/fs-fix' 2012-03-31 11:37:18 +02:00
Chris Robinson
28378c063b Minor OpenAL_SoundStream cleanups 2012-03-31 02:22:23 -07:00
Chris Robinson
4e908aa095 Add a method to set the sound's position 2012-03-31 01:34:26 -07:00
Chris Robinson
b01289128b Split OpenAL_Sound into separate classes for 2D and 3D sounds 2012-03-31 01:15:27 -07:00
Chris Robinson
5adeee20fd Mute sounds that go outside the max distance 2012-03-31 00:57:29 -07:00
Chris Robinson
fc167dbc83 Pass Ogre Vector3s to playSound3D and updateListener 2012-03-30 11:42:11 -07:00
Chris Robinson
fefc8f86ab Remove the unused streamSound3D method 2012-03-30 11:11:07 -07:00
Chris Robinson
c33349a774 Merge remote branch 'zini/master' into sound 2012-03-30 08:36:01 -07:00
scrawl
fc5cd703bb maps are now rendered with correct rotation, however for interiors the arrow is wrong 2012-03-30 16:34:36 +02:00
Chris Robinson
1ee8b963d0 Store the sound listener position as well 2012-03-30 07:30:17 -07:00
Chris Robinson
fad27d99e6 Update the actual sound volume with the position 2012-03-30 07:10:34 -07:00
scrawl
a4576f043d fixed the physics debug rendering now activates/deactivates properly 2012-03-30 16:02:41 +02:00
Chris Robinson
479df78ea1 Update the actual sound position after the listener 2012-03-30 07:01:37 -07: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
Chris Robinson
71d9d7e943 Store the current sound position with the Sound object 2012-03-30 06:41:06 -07: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
521b9eec6c Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/world.cpp
 2012-03-30 15:31:07 +02:00
Chris Robinson
de102cd274 Simplify broken OpenAL workaround 2012-03-30 06:28:40 -07:00
Chris Robinson
33a63d88a5 Merge remote branch 'zini/master' into sound 2012-03-30 06:22:19 -07:00
scrawl
30d27fa83f Merge branch 'master' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-30 15:00:04 +02:00
scrawl
26bdbf77f3 Merge branch 'master' into occlusionquery 2012-03-30 14:49:06 +02:00
Alexander "Ace" Olofsson
4a9a416d46 Can find files even if no .bsa file exists now 2012-03-30 14:45:32 +02:00
scrawl
4a6d034591 Merge branch 'master' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 2012-03-30 14:39:42 +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
Chris Robinson
6a16e33f82 Merge remote branch 'zini/master' into sound 2012-03-29 21:17:59 -07: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
aab79599a9 Merge branch 'openal' into pgrd-rendering 2012-03-30 02:43:40 +04: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
Chris Robinson
3d5384e2bb Remove some unneeded casts 2012-03-29 11:28:33 -07:00
scrawl
8d224f009f toggleFogOfWar script command 2012-03-29 19:45:19 +02:00
scrawl
0c2317ce9d player arrow works again 2012-03-29 19:20:09 +02:00
scrawl
79c2a2e465 implemented toggleWater (twa); formatting again 2012-03-29 18:33:08 +02:00
scrawl
01ecf3e0be attempt at rotation (BROKEN) 2012-03-29 18:16:11 +02:00
scrawl
35f40b99ad remove the bounding box hack, not needed because calculation is correct now 2012-03-29 18:10:01 +02:00
scrawl
0332a8df96 Merge branch 'renderingdistance' into minimap 2012-03-29 18:09:24 +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
b2bdf0ebf3 Merge branch 'master' into minimap 2012-03-29 17:08:32 +02:00
scrawl
37e6db69d8 fix 2012-03-29 17:07:59 +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
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
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
Nikolay Kasyanov
20f976ddc7 probably openal initialization fix 2012-03-29 03:02:26 +04:00
scrawl
e5a19209a4 remove the timeout stuff 2012-03-29 00:05:48 +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
scrawl
47c3e92db1 removed the unused ray scene query 2012-03-28 21:42:41 +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
6bea08157e Merge branch 'master' into terrain18 2012-03-28 21:30:15 +02:00
scrawl
ecf99f3309 Merge branch 'master' into minimap 2012-03-28 21:29:46 +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
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
scrawl
4249d2c536 add getNorthVector method 2012-03-28 03:15:10 +02: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
Marc Zinnschlag
a996cfed71 Merge remote branch 'ace/win-fixes' into next 2012-03-27 20:11:46 +02:00
Chris Robinson
c6c06f1140 Return SoundPtr objects from the playSound and streamSound methods 2012-03-27 05:59:09 -07:00
Jacob Essex
ec21ff21cc Removed memory leak, allocated more on the stack 2012-03-27 13:58:12 +01:00
scrawl
e398c51f8a remove unneeded render queue workaround 2012-03-27 13:13:28 +02:00
Chris Robinson
f0db2ab82f Split stopSound3D into separate functions to deal with stopping all sounds on an object 2012-03-27 03:20:50 -07:00
Chris Robinson
033faba9c4 Make a function parameter const 2012-03-27 03:00:04 -07:00
Chris Robinson
c2611d035c Use a pair to match the MWWorld::Ptr object and sound ID, instead of nested maps 2012-03-27 02:50:45 -07:00
Marc Zinnschlag
9863195f09 Merge remote branch 'lgro/valgrind' into next 2012-03-27 11:14:09 +02:00
Marc Zinnschlag
e56731d25e Merge remote branch 'scrawl/deletefix' into next 2012-03-27 11:10:15 +02:00
Jacob Essex
b76b62e5e4 Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore 2012-03-27 09:20:22 +01:00
scrawl
bb09c2189a lower rendering distance for small objects (reduce batch count) 2012-03-27 00:45:25 +02:00
Alexander "Ace" Olofsson
55f1053b4f Windows fixes for compiling and linking 2012-03-27 00:36:53 +02:00
Lukasz Gromanowski
be94da1527 Issue #225: Initialize class members in constructor. 2012-03-27 00:34:06 +02:00
Lukasz Gromanowski
6d6ed909bf Issue #225: Deallocate memory used by actors animations. 2012-03-27 00:31:15 +02:00
scrawl
bf421d2873 use vector instead of array 2012-03-27 00:18:09 +02:00
scrawl
18c2b5eb0a Merge branch 'next' into occlusionquery 2012-03-26 22:09:41 +02:00
scrawl
bb3f3ce1db bugfix 2012-03-26 21:52:38 +02:00
scrawl
28dfba55e0 delete fix 2012-03-26 20:29:07 +02:00
Lukasz Gromanowski
5185a28b60 Issue #225: Initialize all class members in constructor. 2012-03-26 19:09:55 +02:00
Chris Robinson
0d552c10bc Use an empty MWWorld::Ptr object for non-3D sounds 2012-03-26 04:10:47 -07:00
Chris Robinson
7b3ecc290e Fix compilation with older OpenAL headers 2012-03-26 01:12:06 -07:00
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
scrawl
382fa6ac68 fixes 2012-03-25 22:53:00 +02:00
scrawl
53d4be5cf6 object pickup should work everywhere 2012-03-25 20:52:56 +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
scrawl
9d30a139cc added api 2012-03-24 20:41:23 +01:00
scrawl
e212a32350 bugfix 2012-03-24 18:38:58 +01:00
scrawl
743ea0c9be use hardware occlusion query for sun glare effect 2012-03-24 17:59:26 +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
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
gugus
319022d962 speed up dialogue start-up. 2012-03-23 15:24:39 +01:00
scrawl
06fa310e29 player arrow rotated correctly 2012-03-23 15:00:48 +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
scrawl
cc9f20a04f MW_MapView skin 2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47bcbdef17 Merge remote branch 'scrawl/mygui' into mygui 2012-03-22 18:46:21 +01:00