Commit Graph

11951 Commits (drop)

Author SHA1 Message Date
Chris Robinson f19f1c47c8 Fix playing pending voices without a Ptr 9 years ago
Chris Robinson 2face3d0a9 Combine duplicate code 9 years ago
Chris Robinson 1407366e51 Use a premade SoundStream object for the output's streamSound functions 9 years ago
Chris Robinson 2ee3265b66 Use a premade Sound object for the output's playSound functions 9 years ago
Chris Robinson 53718a5ca0 Use a typedef for the sound instance handle 9 years ago
Chris Robinson 3a39a92b93 Keep track of audio tracks 9 years ago
Chris Robinson 2883cdba5c Initialize the Sound object before modifying the pitch variable 9 years ago
Chris Robinson a6db96b2d8 Update sound and stream parameters 9 years ago
Chris Robinson 4bd235284b Rename a couple members to avoid confusion 9 years ago
Chris Robinson 1ce3e7f5b9 Use a separate type for streams
They're basically the same, but it's to help avoid accidents with passing non-
streaming sounds to the stream functions, or vice-versa.
9 years ago
Chris Robinson 816015d6e6 Avoid inheriting from Sound for sound types 9 years ago
sandstranger b0b3192520 delete bad symbol 9 years ago
sandstranger bd5057aa3c enable opengl es1 9 years ago
scrawl 3d12b2ca9d Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager. 9 years ago
scrawl c912310c52 Don't add persuasion results to the journal 9 years ago
scrawl 2327a41826 Fix journal freeze 9 years ago
scrawl ba5433391f Merge pull request #831 from ace13/win-fix
Fix windows builds
9 years ago
Alexander "Ace" Olofsson 24340bff95 Add a space 9 years ago
Alexander "Ace" Olofsson 6823298516 Different way to solve the type deduction issue 9 years ago
Alexander "Ace" Olofsson a69e751089 Revert "Fix windows builds"
This reverts commit b085c09f86.
9 years ago
scrawl f5f3d18b8e Add comment 9 years ago
scrawl 576d5111a5 Prefer Intersector::PROJECTION over Intersector::WINDOW 9 years ago
scrawl 14b143231c Don't crash OpGetTarget when the target disappeared (Fixes #3048) 9 years ago
Alexander "Ace" Olofsson b085c09f86 Fix windows builds
Can't instantiate a container (at least with MSVC) without knowing the exact size of the object being stored, forward-declares only work with pointers.
I couldn't see a simple way to remove the forward declare, so pointers and memory management it is.
9 years ago
Marc Zinnschlag 3a81bed001 Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag 7cc8fbfb3c Merge remote-tracking branch 'scrawl/dynamic_cast2' 9 years ago
scrawl 0655abcd8b Fix some character preview raycasting issues (Bug #2769) 9 years ago
scrawl 8fb328ef4f Fix updating of character preview size in InventoryWindow::setGuiMode 9 years ago
scrawl d2290a8183 Don't crash when Water_SurfaceFrameCount is 0 9 years ago
scrawl d5a738bd39 Apply 27e669296e (locale-unaware tolower) to more code
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
9 years ago
scrawl f962ce0bbe Don't link against unnecessary OSG libraries 9 years ago
scrawl cd4a1ffd16 Fast version of dynamic_cast for MWClass 9 years ago
Marc Zinnschlag 20a076bdba Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag 6df626ad71 Merge remote-tracking branch 'scrawl/crashcatcher' 9 years ago
scrawl db71634a2d Allow replacing of interactive message boxes (Fixes #3040) 9 years ago
scrawl c9bfe01120 Fix applying of weather changes after serving a jail sentence 9 years ago
Marc Zinnschlag 6facce9d13 Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag ff5582e318 Merge remote-tracking branch 'scrawl/ltex' 9 years ago
scrawl a1fa1b2b2e Don't attempt to open an empty texture 9 years ago
scrawl d97dda05c9 Don't attempt to play unset weather sounds 9 years ago
scrawl 93a76e2f56 Revert debce0fb80, use a sleep() to work around the X11 bug
Problem with debce0fb80 is the crashed process won't be killed until the user accepts the message box, and it's harder to get to the message box when the window is in full screen or the cursor is locked.
9 years ago
scrawl debce0fb80 crashcatcher: show the message box before killing crashed process
This change fixes a random X server lock-up that I get about 1 in 10 times when a crash is caught. I'm presuming it's an X server bug since faulty applications shouldn't be able to crash or freeze the X server under any circumstances.
9 years ago
scrawl 35fa1f5865 Not found Land Textures are no longer a fatal error (Bug #3037)
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
9 years ago
scrawl 4687c4baad Do not assert() for invalid land data in plugins (Bug #3037)
The resizing of LTEX store to the correct number of plugins was done in the load() method, but the load method won't be called if a plugin contains LAND records but doesn't contain LTEX records. For such plugins the Store<ESM::LandTexture>::search() function would then fail an assertion.
9 years ago
scrawl 5b8fd79b4b Fix crash when exception is thrown in startNewGame() 9 years ago
scrawl 177a6f4a68 Launcher: ensure to clear previous settings when reloading settings 9 years ago
scrawl ace4cfc0a8 Fix 'duplicate setting' errors when running installation wizard 9 years ago
scrawl 89783e047b Fix typo 9 years ago
Chris Robinson 4ee409af84 Load loudness data asynchronously
Currently abuses the output audio streams' background processing thread to do
the work, since there's no generalized threaded processing mechanism.
9 years ago
Chris Robinson 0f05ccf72a Use a non-recursive mutex and properly end the streaming thrread 9 years ago
Chris Robinson b5ed2e65f8 Add a method to get the sound stream delay
This helps avoid a lock during the movie player's read method, since it needs
to sync with the current playback position which would otherwise need to get
the movie decoder's current position.
9 years ago
Chris Robinson f3c035907c Rename Sound::update to Sound::applyUpdates 9 years ago
Chris Robinson 9568aa6a84 Use a condition variable to wake up the audio stream thread
This should make starting streams a bit more responsive, and allows us to do
more in it that really shouldn't wait for its next wake up.
9 years ago
Chris Robinson 4a078725d4 Play player voices locally 9 years ago
Chris Robinson 449eca4fb4 Properly mark streams as 2D or 3D 9 years ago
Chris Robinson 21bb2e9314 Use a deque for loudness buffers with a map lookup
Similar to Sound_Buffer, this allows individual Sound_Loudness objects to
retain a constant pointer when new ones are inserted on to the end.
9 years ago
Chris Robinson 5f8a09df97 Play player sounds (except footsteps) local to the listener 9 years ago
Chris Robinson 82f3651f81 Treat the sound offset as the offset in seconds 9 years ago
Chris Robinson 8b7587f9a6 Track whether a sound is 3D 9 years ago
Chris Robinson fc912b135f Avoid unnecessarily friending classes 9 years ago
Marc Zinnschlag 7cc950ed64 Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag b3532b6274 Merge remote-tracking branch 'scrawl/spells' 9 years ago
scrawl 44dd62067e Remove some unnecessary per-frame store searches 9 years ago
scrawl 783594033a Optimize MWMechanics::Spells
Use pointers as map keys instead of string IDs. Resolves a nasty performance bottleneck on functions like hasCommonDisease() that previously had to look up all contained spells from the ESM store on every call. hasCommonDisease() is called hundreds of times per frame by the AI target update since it's used to calculate target disposition.

The total cost of hasCommonDisease() was 2.7% of the frame loop, now it's negligible.
9 years ago
scrawl fbee32729a Cache CellId
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.

For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.

The total cost of getCellId() relative to the frame loop was about 0.3%.
9 years ago
scrawl 984c455027 Fix Show Owned option affecting tooltips that are not objects (Fixes #3036) 9 years ago
scrawl 2ffcc2a2b4 Fix incorrect path encoding handling in debug message 9 years ago
scrawl bcca1beb69 Merge branch 'configwriter' into HEAD 9 years ago
scrawl d894d54e41 Improve path conversions 9 years ago
scrawl 84aceedfa2 Add comment 9 years ago
scrawl 325d208b4a Fix incorrect error message 9 years ago
scrawl 3747843c92 Use QString::toInt instead of atoi 9 years ago
cfcohen c26463fd91 Should have coded it the way scrawl said, since it's cleaner. 9 years ago
cfcohen a9c9cc5508 Remove unnecessary copy of mEngineSettings in mInitialSettings. 9 years ago
Chris Robinson d4238a6d91 Add config options for the sound buffer cache size
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
9 years ago
Chris Robinson 8715add72f Store sound buffers in a deque that's filled in as needed
A deque allows existing Sound_Buffer references to remain valid as long as new
ones are back-inserted. These references can be used instead of indices.
9 years ago
cfcohen 046538984c Fix duplicate filename in what() message. Use newly create cfgError
utility function consistently throughout code.
9 years ago
cfcohen 7605912ece Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes 9 years ago
cfcohen ad5eaaa705 Update the OpenMW Launcher so that it only writes changed values to
the user settings.cfg file.  Add a helpful header to the top of new
settings.cfg files.  Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file.  Remove "automatically generated"
comments.
9 years ago
scrawl 8a3ec14bc6 Revert "Merge remote-tracking branch 'sandstranger/opengles'"
This reverts commit cc9cab6fd1, reversing
changes made to da856eed95.
9 years ago
Marc Zinnschlag ef68e2aec4 Merge remote-tracking branch 'origin/master' 9 years ago
cfcohen 67c4b17581 Commit files that I thought wre in the previous commit. :-[ I'm
accustomed to the hg behavior of commiting all modified files by
default.
9 years ago
Marc Zinnschlag cc9cab6fd1 Merge remote-tracking branch 'sandstranger/opengles' 9 years ago
cfcohen 18da95e4f8 Make openmw-launcher pass comments through settings.cfg, and reuse the
Settings::Manager code to do most of the work.  Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one.  Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
9 years ago
Chris Robinson 8f08ca9cba Revert "Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting"
This reverts commit 0d4fea896c.
9 years ago
Chris Robinson 04f885d8cc Rename mReferences to mUses 9 years ago
Chris Robinson 0d4fea896c Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting 9 years ago
Chris Robinson a1bdb544db Avoid an unnecessary string copy 9 years ago
Chris Robinson aac903484c Remove a really unnecessary method 9 years ago
Chris Robinson 73448c72f6 Replace Play_NoTrack with playManualSound3D, and rename the latter 9 years ago
Chris Robinson caae305ddd Use a sorted list for unused buffers
Helps ensure the buffers being unloaded due to cache limits are not likely to
be needed anytime soon.
9 years ago
Chris Robinson 669b7a2295 Batch update changes together, when possible
Certain OpenAL implementations, including Rapture3D, Creative's hardware
drivers, and more recent versions of OpenAL Soft, can batch together changes so
that they all occur at once, avoiding potential discontinuities with one sound
being changed before another, or the listeenr being changed before sounds are.

On other implementaitons, this is a no-op and maintains existing behavior.
9 years ago
Chris Robinson ea70b0baee Don't store the buffer in the sound struct 9 years ago
Chris Robinson fd7d58fe7e Reset the sound handle back to null after unloading 9 years ago
Chris Robinson 4801661b34 Stop all sounds of the given id 9 years ago
Chris Robinson 8a69f676ec Remove some duplicate code 9 years ago
Chris Robinson 45628316f8 Remove an unnecessary check 9 years ago
Chris Robinson 574c1923fe Clear unused buffers after unloading them all 9 years ago
Chris Robinson 5ad772c3b3 Fix streaming sound time 9 years ago
Chris Robinson 3ce6aee98b Return a decoder from the loadVoice function 9 years ago
Chris Robinson 24f8c78fca Store sound buffer references by index instead of string 9 years ago
Chris Robinson f7218f5a25 Use proper mutex mechanisms and don't check al errors in the stream thread 9 years ago
Chris Robinson f9e18cd966 Prepare all Sound_Buffer objects when one is needed
This simply sets up the Sound record data to be used by the sound output. The
actual audio buffers, stored in the Sound_Handle, are still loaded on-demand.
9 years ago
Chris Robinson 6c3953766e Use separate lists for the sound name and its buffer
This should make sound lookup a bit more efficient, especially when an integer
ID can be used.
9 years ago
Chris Robinson fbfcc4050f Stream voice clips
Voices tend to be a bit long, and not individually replayed often. So it's
better to stream them instead of loading theminto a sound buffer. The loudness
data is very small, though, so that can be kept buffered indefinitely.
9 years ago
Chris Robinson eee6a19e31 Add a method to stream sounds in 3D 9 years ago
Chris Robinson f1a1dc8408 Pass relevant sound parameters to the OpenAL_SoundStream constructor 9 years ago
Chris Robinson 83721092f2 Refactor the audio streaming code to be a bit saner 9 years ago
Chris Robinson 16f72886e9 Use separate lists for openal sounds and streams 9 years ago
Chris Robinson 0f33f41d8d Actually unload sounds when running over 9 years ago
Chris Robinson 22a6811425 Limit the sound buffer cache to 15MB 9 years ago
Chris Robinson 0b2747098c Keep track of unused sound buffers 9 years ago
Chris Robinson 4073495070 Add some missing sound handling 9 years ago
Chris Robinson e362896817 Combine some duplicate code 9 years ago
Chris Robinson febc7b510a Remove an unneeded method 9 years ago
Chris Robinson 3fdc3c4ea9 Use a separate map for say sounds
Also restores lip movement
9 years ago
Chris Robinson 9d0018e1bc Reorder active sound data to make lookup by Ptr better 9 years ago
Chris Robinson 495e138907 Load sound loudness and store it with the Sound_Buffer
Still not used for say yet, though
9 years ago
Chris Robinson f4c22ec49e Hold a separate list for voice sound buffers
This fixes say. Ideally voices would be streamed, but the loudness/"lip" buffer
extraction should be separated from the buffer loading code.
9 years ago
Chris Robinson 4571218827 Load the sound as needed and pass it directly to the play methods
This breaks say sounds, loudness handling, and the cache limit. Fixes are
forthcoming.
9 years ago
Chris Robinson e2beefd8b5 Store info calculated from the ESM::Sound record 9 years ago
scrawl edfcb45ad7 Fix crash when onPcEquip script removes the equipped item (Fixes #3016) 9 years ago
sandstranger 69acacefff openmw building on Android with Opengl es 9 years ago
Marc Zinnschlag da856eed95 Merge remote-tracking branch 'origin/master' 9 years ago
scrawl 3fe38e3556 Remove unused setting 9 years ago
scrawl 71cd57a3b5 Optimize World::getTimeStamp
World::getTimeStamp was searching through the globals store on every call. Not a big issue, but slow enough to show up in the profiler.
9 years ago
scrawl 62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 9 years ago
cfcohen b507d5da5d One more tooltip fix. This one in the review dialog with Socucius Ergalla. 9 years ago
Marc Zinnschlag 99500f4021 make initial size of script error panel configurable (Fixes #2996) 9 years ago
Marc Zinnschlag f5c61ee616 remember script error panel height per scriptsubview 9 years ago
Marc Zinnschlag 26640d17eb do not adjust error panel height if panal was already open 9 years ago
Marc Zinnschlag 1093a53cf9 hide script error list when there are no errors (Fixes #2867) 9 years ago
Marc Zinnschlag b74b274ac0 Removed validator for filenames in OpenMW-CS (Fixes #2918) 9 years ago
Marc Zinnschlag e0e9e7f8c2 adjusted startup warning message for recent improvements regarding loading/saving 9 years ago
Marc Zinnschlag 8da04bf76f Merge remote-tracking branch 'scrawl/master' 9 years ago
scrawl 1b1d9a7a9c Fixed another tooltip 9 years ago
cfcohen cf4f3d9ebc Correct tooltip for Magicka in stats window. 9 years ago
scrawl 43de13fa99 Do not allow resting on lava 9 years ago
scrawl 2d302aef99 Implement stayOutside script variable 9 years ago
scrawl 27617468c8 Fix the collision shape not updating when scaling an object via script 9 years ago
scrawl 5f143dee2d Fix lighting incontinuity at nightfall and sunrise 9 years ago
scrawl 61314e1db1 Fix bounding box of bullet debug drawer 9 years ago
scrawl 706b1d4c28 Disable culling of ClipNode 9 years ago
scrawl cbf344663f animateCollisionShape checks if the shape is really animated 9 years ago
scrawl 894477849a Store animated collision objects in a separate container 9 years ago
scrawl 8c268f239e Set the object node scale before inserting model
This fixes initWorldSpaceParticles not taking object scale into account. Still not taking into account object rotation or node animations. Ideally the initWorldSpaceParticles needs to run in an updateCallback.
9 years ago
scrawl ccc721ba3f Print the OpenMW version to the logfile 9 years ago
scrawl f08cfa19ea Fix SoundManager::isPlaying to consider multiple entries with the same Ptr/id
Now it returns true if *any* sounds matching the given Ptr and id are playing. The previous behaviour was causing problems with "zombie" sounds (sounds that have finished playing, but weren't removed from the map yet) making the isPlaying method return false even though there's another legitimately playing sound in the map.
9 years ago
scrawl a49058721e Use a contactTest for collision script functions
The previous method didn't work for stationary actors. This change fixes the grinder in "Sotha Sil, Dome of Kasia" not registering collisions if the player stands still. (Fixes #1934)
9 years ago
scrawl 9fce428929 ContactTestResultCallback: do not rely on col1 being the object tested against
Unsure why, but in some cases col0 and col1 are swapped.
9 years ago
scrawl 3453353091 AiCombat distance check takes into account collision box (Fixes #1699) 9 years ago
Marc Zinnschlag 020b3add94 Merge branch 'openmw-37' 9 years ago
Marc Zinnschlag 5de9a5e840 Merge remote-tracking branch 'origin/openmw-37' into openmw-37 9 years ago
scrawl e62470d674 Auto-generate the collision shape for native mesh formats 9 years ago
scrawl 8cf57ef6ac Move BulletShapeManager and BulletShape to resource/ 9 years ago
scrawl eb2f16d682 Support for loading .osg mesh format 9 years ago
scrawl 71d9e7dc52 Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file 9 years ago
scrawl e9e12d396d Merge remote-tracking branch 'upstream/openmw-37' into HEAD 9 years ago
scrawl 0f347eccbf Flip the origin of global map texture
Now it's consistent with the overlay texture.
9 years ago
scrawl 8b7bdcd127 Fix the global map overlay viewport (Bug #3018) 9 years ago
scrawl af4923577b Fix double writing of Dialogue NAME in OpenCS 9 years ago
scrawl 0220e82259 Remove unused SOUND_INPUT_INCLUDES cmake variable. 9 years ago
Alexander "Ace" Olofsson d2a4175804 Add FFMPEG to include path for OpenMW
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
9 years ago
Marc Zinnschlag de98ee0062 Merge remote-tracking branch 'scrawl/esm_rewrite' 9 years ago
Nikolay Kasyanov 014a2fc0e9 OS X: do not override Qt plugin path 9 years ago
Nikolay Kasyanov 4dcb1a1b17 OS X: remove QPlastiqueStyle usage 9 years ago
Nikolay Kasyanov 4e3bbe01b6 OS X: disable `glTexStorage2D` because of OSG/driver issue
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
9 years ago
scrawl 0ec56d321a Remove unneeded using namespace 9 years ago
scrawl 05498ad592 Refactor: InputManager no longer depends on Engine 9 years ago
scrawl aae1aa3708 Adjust tests to work with esm_rewrite branch. 9 years ago
scrawl f91aae2350 Tests: add record overwrite test 9 years ago
scrawl 1e817a976f Tests: add record deletion test 9 years ago
scrawl 771193bae8 Tests: add content_diagnostics_test (requires some data files) 9 years ago
scrawl 38c155c579 Tests: add dialogue_merging_test (requires some data files) 9 years ago
scrawl d0d8c2eded Delete empty test 9 years ago
scrawl 9116c701d5 esmtool fix 9 years ago
scrawl 1402a16702 SceneWidget: change the threading model to DrawThreadPerContext
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
9 years ago
Marc Zinnschlag c312162b57 Merge branch 'openmw-37' 9 years ago
Marc Zinnschlag fa9ebc50a2 Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag b0d79ee790 Merge branch 'tooltip' 9 years ago
Marc Zinnschlag 63ee37d914 added 3D scene tooltips 9 years ago
scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
9 years ago
scrawl 8cd41f0ed4 Increase the ray distance for dropObjectOnGround (Fixes #3010) 9 years ago
scrawl 9897400d97 Restore the previous key focus widget after playing video 9 years ago
Emmanuel Anne af7b5e636e improves InterpreterContext::updatePtr
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
9 years ago
Bret Curtis 3ea3d07d44 really purge libav 9 years ago
Marc Zinnschlag 8b01f1f6fb added instance tooltips 9 years ago
Marc Zinnschlag 01f4b8a182 added scene tooltips system (tag based) 9 years ago
scrawl 19cd987208 Fix Ptr updates in PositionCell
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
9 years ago
scrawl 9e3eb8291f Rotations: fix the rotation order for doors 9 years ago
scrawl 90b6fa5ef1 PlaceItem, PlaceItemCell angle should be treated as degrees (Fixes #3007) 9 years ago
scrawl 3647af8d73 Rotations: use different rotation order when object is rotated via script (Fixes #2062) 9 years ago
scrawl b4ce73f179 Rotations: remove LocalRotation
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
9 years ago
scrawl 666fbba1e0 Rotations: World::rotateObject takes radians instead of degrees
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
9 years ago
scrawl 6405049add Rotations: move doors via Rotation rather than LocalRotation
Now LocalRotation is unneeded, will remove in next commit.
9 years ago
scrawl 8aacbc398f Rotations: don't wrap the angle values for non-actors
It's not really necessary, and just complicates logic elsewhere. Neither does vanilla MW do it. As well, the question is if wrapping to [-PI, PI] or [0, 2*PI] would be the desired range.
9 years ago
scrawl a68fd791c8 Remove a stray method declaration 9 years ago
scrawl 79c44d0bfe Style fix 9 years ago
scrawl 02148a43f5 Node mask fix 9 years ago
scrawl 0a52ee17c3 Fix Drawable removal issues 9 years ago
scrawl afa590bddb Leak fix 9 years ago
scrawl c62c1693e9 Disable copy constructor and operator= in PartHolder 9 years ago
scrawl 2e9805fa0e Leak fix 9 years ago
scrawl b840c68f0c Do not create a depth buffer for the global map 2d rendering 9 years ago
scrawl 8e3bc981a2 Fix self-referencing camera 9 years ago
MatthewRock a662a00c62 Fixing bug for merchant 9 years ago
scrawl 0409e5a043 Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change) 9 years ago
scrawl f1ac408f35 Place Drawables directly in the scene graph when built with OSG 3.4
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.

There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
9 years ago
scrawl 35459f20d5 Refactor lighting mask 9 years ago
scrawl 91583fc027 Fix MWRender::Mask_ParticleSystem 9 years ago
scrawl 637cd3a628 Adjust the FirstPersonNeckController to follow the camera with a reduced factor (Fixes #1784) 9 years ago
scrawl 3c338b9da9 ObstacleCheck: tweak the stuck detection parameters
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
9 years ago
scrawl d233bc483d ObstacleCheck: fix evasion issue
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
9 years ago
scrawl caa523a959 ObstacleCheck: fix the framerate not being taken into account 9 years ago
scrawl 801dc8eee3 ObstacleCheck: fix weird distance calculation 9 years ago
scrawl 1b52749ae1 Adjust third person camera height based on character height 9 years ago
scrawl b89945804c BookPage: implement hit test with margin for error 9 years ago
scrawl 055841e721 Improve cloud lighting 9 years ago
scrawl f0a1434578 Dead actors underwater will float to the surface 9 years ago
scrawl 66925be440 Partially revert 682f30ef9c
This change made dead netch fall through the floor, because the animation moves the creature *below* its external collision box.
9 years ago
scrawl 516f2765a1 Use the ScalingLayer for journal, books and scrolls 9 years ago
scrawl a7ad45e73e WindowBase::center use the layer size instead of render window size 9 years ago
scrawl f9932130da Work around MyGUI bug with mouse event coordinates (fixed in git) 9 years ago
scrawl 6c12c9a467 Layer renaming fix 9 years ago
scrawl d85d74e615 Use AdditiveLayer for the hit fader 9 years ago
scrawl a90ef8afd0 layer renaming 9 years ago
scrawl 57b9eafa0f osgMyGUI: implement AdditiveLayer 9 years ago
scrawl 51f3a8fec6 osgMyGUI: move Platform methods to the .cpp file 9 years ago
scrawl 13c7235b6b Remove old FPS setting code 9 years ago
scrawl 2407f393ce Fix double update traversal in screenshot function 9 years ago
scrawl 6e69808129 Fix the frameNumber not being incremented in certain frames 9 years ago
scrawl 8e4e4e5e38 Fix infinite loop in addToLevList 9 years ago
scrawl c996702b56 Fix some uninitialised variables found by static analysis 9 years ago
scrawl 1cf1c944b7 Don't attempt to render weather particles on the refraction and reflection textures 9 years ago
scrawl 209fa52883 Hide weather particles underwater (Fixes #2701) 9 years ago
scrawl e3b30baff9 clipFudge fix 9 years ago
scrawl 682f30ef9c Fix incorrect uses of PhysicsSystem::getHalfExtents
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
9 years ago
scrawl 46e07e4b19 Head tracking: fall back to target collision box center if the target has no head node 9 years ago
scrawl a5f8ffb83d aimToTarget: Fix the collision box translation not being taken into account 9 years ago
scrawl de97a8a3da Do not allow disabling the player object 9 years ago
scrawl b72d5c5190 Don't play idlestorm animation when swimming 9 years ago
scrawl c0a81030bb Make use of INI settings for the simple water 9 years ago
scrawl 30c828dff0 Include cleanup 9 years ago
scrawl 8e8f72408d Use diffuse/ambient lighting for the simple water 9 years ago
scrawl 380256977b Fix another renderBin issue with the weather particles
Depth sorting w.r.t. the rest of the scene was broken
9 years ago
scrawl 9902dfc9ef Comment 9 years ago
scrawl ad016da31d Enable fog on weather particles 9 years ago
scrawl fd1ccd21ff Disable freezeOnCull for weather particles 9 years ago
scrawl 5ca0ae5232 Don't add the same AlphaFader to multiple nodes 9 years ago
scrawl d6f45c3390 Fix the renderbin for weather particles
Regression from commit 2ee6b41887
9 years ago
scrawl bd1f3493d7 Fix weather particles not being cleared when changing from one particle effect to another 9 years ago
Marc Zinnschlag ab2df963e9 Merge remote-tracking branch 'origin/master' 9 years ago
scrawl 0348b8df1c Fix applying of plane height in ClipCullNode (Fixes #2985) 9 years ago
scrawl 3f988327c7 Destructor fix 9 years ago
scrawl 913bbe347b Don't check the extension string every frame 9 years ago
scrawl c60388afb6 Add fudge factor to move the water mesh away from camera when the camera gets too close 9 years ago
scrawl 4690ec12cc Render the water plane with GL_DEPTH_CLAMP if supported (Fixes #996) 9 years ago
scrawl 802620a86b Use TimeOfDayInterpolator for Land Fog Depth
Fixes the sudden fog jump at nightfall.
9 years ago
scrawl 45bf3e6788 Create TimeOfDayInterpolator class to refactor time handling in WeatherManager 9 years ago
scrawl 8da4530957 Use INI-imported underwater fog settings (Fixes #2907, Fixes #1511) 9 years ago
scrawl bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 9 years ago
cc9cii 7f477e2fae Fix include file issue. 9 years ago
cc9cii 4af469511d Fix some sub-tables becoming uneditable since commit 80869d 9 years ago
cc9cii 819fecd08e Add a check for scale value of 0. Should resolve bug #2880. 9 years ago
cc9cii 7c007d9c6d Rename a variable to make it less confusing. 9 years ago
cc9cii 78c735adc6 Fix saving when only topic info was modified (topic itself unchanged) 9 years ago
scrawl 7b817ba010 Fix the node masks of water cameras being reset (Bug #2984)
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
9 years ago
scrawl 93f4d31cf9 Raytest mask fix (Fixes #2984) 9 years ago
scrawl b9b154a015 Minor cleanup 9 years ago
scrawl d90fa977e8 GL_DEPTH_COMPONEN24 fix 9 years ago
Marc Zinnschlag 655b40267b changed instance selection model (primary selects, secondary toggles selection) 9 years ago
Marc Zinnschlag ad4e0e3b97 split virtual select button into two buttons (primary select and seconadry select) 9 years ago
Marc Zinnschlag 133e04a38e Merge remote-tracking branch 'cc9cii/edit-ingredient' 9 years ago
scrawl 7692ae175a Disable sun rendering on the reflection camera
Not needed, we have specular highlights.
9 years ago
scrawl 9b8e45fc01 Fix ripple particles z-fighting with the water surface 9 years ago
scrawl d394b0793f waterLevel fix 9 years ago
scrawl c9d7078b4b Water: add texture quality setting to the settings window 9 years ago
scrawl 8433e0679f Water: connect to settings window 9 years ago
scrawl 9f8d36b573 Water code cleanup 9 years ago
scrawl 11c997d09d Water: move reflection code to a new class 9 years ago
scrawl ebdf25ccb9 Water: move refraction code to a new class 9 years ago
scrawl 7bbdb13138 Remove debug code 9 years ago
scrawl 6ba9f561ea Use simple water for the local map 9 years ago
scrawl 09631385c3 Use boost ifstream for water resources 9 years ago
scrawl d485dd0782 Water: fix world UV coords 9 years ago
scrawl 9f2f503d37 Water: pass the near and far planes 9 years ago
scrawl 37c9c12962 Water: clipping plane offset 9 years ago
scrawl 700a0099c3 Remove debug code 9 years ago
scrawl e13eb625d3 New water WIP
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader

Still to do: see comments...
9 years ago
cc9cii 107ccd84d4 Move TableEditModes enum inside a class scope. 9 years ago
cc9cii 77471d1592 Re-add mistakenly removed line and fix a silly typo. 9 years ago
cc9cii 80869d9bae Disable context menu for fixed size sub-tables. Should resolve bug #2932. 9 years ago
cc9cii 972193c7eb Fix issue where mandatory effects field was allowed to be empty (and vice versa) 9 years ago
cc9cii 1a64b40725 Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980. 9 years ago
cc9cii 9f0e059a15 Fix editing ingredient effects sub-table. Should resolve bug #2978. 9 years ago
Marc Zinnschlag 843225996c get modifiers from event instead of from the application 9 years ago
Marc Zinnschlag d2e92fd36f trigger mouse click actions on release instead of on press (avoids problems with dragging) 9 years ago
Marc Zinnschlag f3ee3f5be1 Do not call base class event functions in WorldspaceWidget
This avoids some event function being triggered twice. I do not fully understand why
calling the base class function causes this problem, which is more than a bit
disconcerting, but let's roll with it for now.
9 years ago
Marc Zinnschlag 6c65081643 Merge branch 'marker' 9 years ago
scrawl 944e6d0844 Fix adjustment of inventory preview size when guimode changes (Fixes #2973) 9 years ago