Commit Graph

9306 Commits (report)

Author SHA1 Message Date
cc9cii a3a0682138 Remove files no longer used, reverting to OEngine. 10 years ago
cc9cii bf669a51c1 Merge branch 'master' into mouse-picking-physics 10 years ago
cc9cii f051fb65ff Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document. 10 years ago
scrawl 6b88f5f33e Use Ogre::uint8, fixes a missing include for uint8_t 10 years ago
scrawl 61d4a6b344 Merge branch 'openmw-033' 10 years ago
scrawl ba3d2be8e3 Add missing include (Fixes #2108) 10 years ago
cc9cii 03abd69b4f Include string header for gcc. 10 years ago
cc9cii 7d133d508d Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager. 10 years ago
cc9cii 37a050873c Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time. 10 years ago
cc9cii 70b5d6857a Add missing files. 10 years ago
cc9cii 0e70315f91 Experimental, compiles and runs but crashes in some exit scenarios. 10 years ago
Marc Zinnschlag d48a2759f6 Merge remote-tracking branch 'cc9cii/mouse-picking' 10 years ago
Marc Zinnschlag bf40a3bb5d enhanced SceneToolBar tool handling (remove and insert at specific point) 10 years ago
cc9cii bd6e54dde3 Add function to cancel drag by pressing ESC. Remove debug code. 10 years ago
cc9cii 092080c69c Group the commands with begin/end macros. 10 years ago
cc9cii bf5ba41223 Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once. 10 years ago
cc9cii 4556eb74fe Fix saving position and rotation. 10 years ago
cc9cii e3a000917c Minor tidy up. 10 years ago
cc9cii 358cac2f0a Fix deleting object physics again. 10 years ago
cc9cii d9755f82c3 Position saving - work in progress. 10 years ago
cc9cii 85ef683319 Fix deleting physics object when scene node is cleared. 10 years ago
MiroslavR 140013820b Fix invalidated iterator 10 years ago
MiroslavR a4d0068e29 Make forcegreeting no-op for disabled references (Fixes #2093) 10 years ago
Marc Zinnschlag 29c9b6bd01 Merge remote-tracking branch 'scrawl/master' 10 years ago
cc9cii 3796240b19 Refactor duplicate code sections. 10 years ago
cc9cii 49d416353e Remove a redundant list. 10 years ago
cc9cii 7f54dab6ef Fix issue where objects were sometimes unresponsive after dragging. 10 years ago
cc9cii e174428cc5 Minor tweaks. 10 years ago
cc9cii 1eed180a5c Fix Gcc/MSVC differences with friend class. Invert camera derived direction. 10 years ago
cc9cii a21958d007 Add option to move the mouse against the screen frame of reference. 10 years ago
cc9cii 89bb616cbc Remove debugging code. 10 years ago
cc9cii 8b4651f055 Move mouse related functions and states out of WorldspaceWidget. 10 years ago
scrawl 17cb181f88 Use av_get_default_channel_layout for unknown channel layouts 10 years ago
scrawl efa4d09c48 Fix crash when avcodec_decode_audio4 doesn't return a full frame (Fixes #2088) 10 years ago
cc9cii 998982b16a Keep physics engines until physics code is moved out of OEngine. 10 years ago
Marc Zinnschlag 8b3d876534 Merge remote-tracking branch 'lgro/ffmpeg_decoder' 10 years ago
cc9cii c6a2461fbd Delay removing physics until the document is closed. Also other general cleanup. 10 years ago
cc9cii 1ee64c7087 Add missing files for multi-document support. 10 years ago
cc9cii b328aa1fb9 Multiple document support. 10 years ago
cc9cii 057982b1f8 Fix Subview interface clutter by keeping a map of Scenewidgets. 10 years ago
cc9cii e51d532795 Show drag movements of objects in multiple scene managers. 10 years ago
cc9cii d6e67b248f Fix deleting objects and scenewidgets. 10 years ago
Marc Zinnschlag 7785e3a0bc fixed for potential crash during saved game loading 10 years ago
cc9cii ade7f09203 Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell. 10 years ago
cc9cii ac7acb2c22 Disable more debug code. 10 years ago
cc9cii 4f685092fb Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking 10 years ago
cc9cii aa7b693a13 Remove debug settings and minor cleanup. 10 years ago
cc9cii fbadaf55ee Multiple SceneManagers per physics engine now working. 10 years ago
Marc Zinnschlag ac58dd735b do not crash on exceptions while adding startup scripts 10 years ago
Marc Zinnschlag 4fa0bf63c5 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 45f14f0704 Fix stolen faction-owned items not being confiscated 10 years ago
cc9cii a2ac4c7650 Allow multiple scene managers per physics engine. Compiles but does not work properly. 10 years ago
Marc Zinnschlag 8ed3454774 Merge remote-tracking branch 'corristo/unshiled-include-fix' 10 years ago
cc9cii 0515159b74 Fix typo. 10 years ago
cc9cii 1741043f20 Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little. 10 years ago
Nikolay Kasyanov 0dc08e2983 Properly add libunshiled include dir 10 years ago
Alexander "Ace" Olofsson c1ce570e37 Use the enum value from Qt::KeyboardModifiers
This fixes the windows build at least
10 years ago
cc9cii 792fbd119f Resolve incorrect merge issues. 10 years ago
cc9cii c990ed4335 Merge branch 'mouse-picking-state' into mouse-picking
Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
10 years ago
cc9cii 6ca88dc541 Merge branch 'master' into mouse-picking
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
10 years ago
cc9cii 8e2a0ea90a Implemented moving objects around x-y plane. 10 years ago
scrawl f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 10 years ago
cc9cii 68b7532383 Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported. 10 years ago
scrawl e48dc45ede Fix creatures not being able to move with 0/0 encumbrance 10 years ago
scrawl c194226d08 Increase maximum height for finding spawn points to 500 (Fixes #2056) 10 years ago
scrawl aa02974d3b Fix Journal instruction for non-existing journal indices (Fixes #2063) 10 years ago
cc9cii 5afaa0083f Minimise false detection of grab & drag operation. 10 years ago
cc9cii a01a921644 Experimental mouse event state machine for 3d editing, starting with drag & drop objects. 10 years ago
Marc Zinnschlag e604fcf282 Merge branch 'double' 10 years ago
Marc Zinnschlag 6f4b753750 replaced regular function call from SubView to View with signal-slot-connection 10 years ago
Marc Zinnschlag 1aef9304e9 replaced the signal/slot user settings update with a regular function call 10 years ago
Marc Zinnschlag b0a7b457f7 made double click actions in tables configurable 10 years ago
cc9cii 815e832dbb Merge branch 'master' into mouse-picking-state 10 years ago
Marc Zinnschlag 275bf854ed added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window) 10 years ago
cc9cii 6c8320a638 More cleanup. 10 years ago
cc9cii c2c33eac0f Minor cleanup. 10 years ago
cc9cii 0b63ba5727 Move debug rendering code out of PhysicsSystem. 10 years ago
cc9cii dd2c067e17 Cleanup for better legibility. 10 years ago
cc9cii fb0f85c8db Report terrain position on cursor position. 10 years ago
cc9cii 95683bc8c3 Add user interface for top level window status-bar setting (implementation already existed). For feature #854. 10 years ago
cc9cii 8b0dc88db8 Use the correct name for deleting objects. 10 years ago
cc9cii b46df4034d Cleanup bullet objects in the destructors. 10 years ago
scrawl dab05471be Reset crime when bounty is reset to 0 by a script (Fixes #2057) 10 years ago
scrawl ac067564ea Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware. 10 years ago
scrawl 4680bc6c93 Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
Marc Zinnschlag aad13e6bff close view when closing last sub-view unless this view is the last view 10 years ago
scrawl 55c9c0a266 Audio resampling fixes
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
10 years ago
Marc Zinnschlag a9f5632afd extended double click functionality in tables 10 years ago
cc9cii 9337d6533a Add terrain collision. Support visibility mask for objects and terrain. 10 years ago
Marc Zinnschlag a87092d11b Merge remote-tracking branch 'miroslavr/master' 10 years ago
Marc Zinnschlag a4be214fb1 Merge remote-tracking branch 'scrawl/master' 10 years ago
cc9cii cc0acec64c Add settings to enable/disable debug rendering of mouse picking. 10 years ago
cc9cii dd9208afeb Merge remote-tracking branch 'upstream/master' into mouse-picking 10 years ago
cc9cii e01795556f Suppress some warnings for MSVC. 10 years ago
scrawl dbe30e31b9 Make creature's model take priority over base_anim.nif (Fixes #2055) 10 years ago
scrawl b39d69e98c Videoplayer fixes, play/pause & seeking
- Fix rindex overflow
 - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
 - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
 - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)

The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
10 years ago
MiroslavR ed3a3f717f Handle getdistance on objects inside a container (Fixes #2046) 10 years ago
MiroslavR fa746b8e54 Do not display weight or value in tooltip for zero-weight items (Fixes #2047) 10 years ago
MiroslavR 925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 10 years ago
scrawl e2bad395e5 Leak fix 10 years ago
cc9cii 54a6897df8 Use QString rather than std::to_string 10 years ago
cc9cii e5dd8d06a0 Store object reference id to RigidBody instead of scene node handles. 10 years ago
cc9cii cb53e714f7 Convert PhysicsSystem to a singleton. 10 years ago
cc9cii 98ff3e7307 No physics or mouse picking for object preview. 10 years ago
Marc Zinnschlag 19b380d0b4 Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag 6ff41c6a00 intercept shift/ctrl double-clicks in tables 10 years ago
cc9cii 2f26fc1188 Avoid Ogre exceptions and null pointers. 10 years ago
cc9cii 39cd89a9af Make gcc happy. 10 years ago
cc9cii 4d86371ca3 Minor refactoring and cleanup. 10 years ago
cc9cii cca6d0a024 Fixed issue with mouse picking accuracy. 10 years ago
scrawl eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
cc9cii fdee3fd919 Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance. 10 years ago
Marc Zinnschlag c1d867a213 Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag 8f0add75f5 Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag 94d5151273 Merge remote-tracking branch 'miroslavr/master' 10 years ago
scrawl bcb2d714c0 Add TODO comments for future videoplayer enhancements 10 years ago
cc9cii 4b53b8658b Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate. 10 years ago
scrawl 41df4289c6 Merge remote-tracking branch 'upstream/openmw-33' into HEAD
Conflicts:
	apps/openmw/mwworld/store.hpp
10 years ago
Alexander "Ace" Olofsson b5a57920b6 Fix compile error on Windows 10 years ago
scrawl 5711103322 Remove leftover comment 10 years ago
scrawl 202cfa879f Implement frame drop support in the videoplayer (Fixes #1343) 10 years ago
scrawl 290aacd2a6 Fix videoplayer crash on quit
The sound stream thread was trying to update the stream during/after destruction of the video state.
10 years ago
scrawl 8472695f89 Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
This reverts commit d77546b7dc.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
10 years ago
scrawl de0e0fedff Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
This reverts commit f5589b42ea.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
10 years ago
scrawl 681f3fa530 Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder."
This reverts commit b40c1ff26c.
10 years ago
Marc Zinnschlag 5fdd264d07 Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag 843493e90a fixed case-problem in OpenCS script compiler 10 years ago
scrawl 8b3755a770 Compile fix 10 years ago
scrawl f2877c69d7 Fix old alchemy apparatus still showing in alchemy window after removal 10 years ago
scrawl 192069a181 Add automatic potion naming 10 years ago
scrawl fd7c181e06 Fix alchemy producing potion IDs from content files 10 years ago
scrawl 9bb51fd9c2 Compile fix 10 years ago
scrawl ace8e0175b Fix old alchemy apparatus still showing in alchemy window after removal 10 years ago
scrawl 29ac97be7a Add automatic potion naming 10 years ago
scrawl 7f06e3e7e3 Fix alchemy producing potion IDs from content files 10 years ago
MiroslavR 5a7dbb19f7 Code clarity 10 years ago
scrawl 4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 10 years ago
scrawl b0f98687e6 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 10 years ago
Marc Zinnschlag 94ae222f0e Merge branch 'settings' 10 years ago
Marc Zinnschlag a5bbfff9e2 another layout correction 10 years ago
Marc Zinnschlag 5a1ce4943e added advance 3D rendering user settings section 10 years ago
cc9cii 8bcd415cca Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working. 10 years ago
MiroslavR ed6bdc0bde Use all topics to search for keywords in dialogues (Fixes #2013)
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
10 years ago
scrawl deabc52c16 Treat "Root Bone" as the animation root if existing (Fixes #2019) 10 years ago
scrawl 415f67f859 Treat "Root Bone" as the animation root if existing (Fixes #2019) 10 years ago
scrawl 5892fd9e65 Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 10 years ago
scrawl 8233f5894a Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 10 years ago
cc9cii 03a30c3f1d Experimental, compiles but does not work. 10 years ago
scrawl f117a75747 Force walk animation when flying (Fixes #2015) 10 years ago
scrawl 5f11ccc298 Show tooltip for non-affordable list items (Fixes #2025) 10 years ago