Commit Graph

9306 Commits (report)

Author SHA1 Message Date
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
scrawl 2be65a89a7 Show tooltip for non-affordable list items (Fixes #2025) 10 years ago
Marc Zinnschlag 2106893563 silenced a compiler warning regarding null pointer dereferencing 10 years ago
Marc Zinnschlag 49938182e8 silenced a compiler warning regarding null pointer dereferencing 10 years ago
Marc Zinnschlag a3c894c1e2 Merge branch 'cellmarker' 10 years ago
Marc Zinnschlag 994159fafd fixed broken iterator 10 years ago
Marc Zinnschlag 8a05c0e5c0 fixed overlay singleton 10 years ago
Marc Zinnschlag ba46bcad40 Revert "Don't allow viewing non-existent cells from the regionmap."
This reverts commit 7cdab41501.
10 years ago
Marc Zinnschlag 4b921c3876 user settings cleanup 10 years ago
Marc Zinnschlag c97845d35d better script compiler diagnostics 10 years ago
scrawl c3ef39eb6f Fix ItemWidget text cleanup (Fixes #2022) 10 years ago
Marc Zinnschlag ed44f3ec7d added tooltip support to user settings UI 10 years ago
scrawl c4e81adb83 Fix settings window being too small for all tabs on some localizations 10 years ago
Marc Zinnschlag f4894deff1 removed special value text from spin boxes (broken feature, not used anyway) 10 years ago
Marc Zinnschlag dddd20ba1e added default values for display format settings 10 years ago
Marc Zinnschlag 799cd87b52 name convention and spelling fixes 10 years ago
Marc Zinnschlag e27da6a0d4 removed settings file mixup 10 years ago
Marc Zinnschlag c94c1adaf3 split off settings page label from internal section name 10 years ago
cc9cii 7cdab41501 Don't allow viewing non-existent cells from the regionmap. 10 years ago
cc9cii 094f046087 Convert OverlaySystem to a OpenCS style singleton. 10 years ago
scrawl 244db5cbfe Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33 10 years ago
Marc Zinnschlag 984b586bb1 fix for implicit references 10 years ago
Marc Zinnschlag 8afdf0f46b dagoth fix 10 years ago
scrawl 69bbbefc09 setDynamic workaround for broken endgame scripts (Fixes #2016) 10 years ago
Marc Zinnschlag 720ba2c0d8 split off settings label from internal settings name 10 years ago
Marc Zinnschlag daf7cab416 refactored section handling 10 years ago
Marc Zinnschlag 219fbd427f unclutter user settings declarations 10 years ago
Marc Zinnschlag 868fdfba51 reclaiming some unused space 10 years ago
Marc Zinnschlag e20fa209cc user settings UI layout improvements 10 years ago
cc9cii aff6f6fdb2 Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation. 10 years ago
cc9cii 1d0ac3b4df Delete Ogre::OverlaySystem before Ogre::Root 10 years ago
Alexander "Ace" Olofsson dc788512e2 Fix LNK2019 link error on Visual Studio 2010 builds
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
10 years ago
cc9cii 8cebfc411b Minor visual improvements. 10 years ago
cc9cii 994420aa57 Singleton wrapper for Ogre OverlaySystem. 10 years ago
cc9cii 57b337d368 Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much. 10 years ago
Marc Zinnschlag 6beee95151 Merge remote-tracking branch 'terrorfisch/aistate' 10 years ago
Marc Zinnschlag 528dcf761d Merge remote-tracking branch 'internecine/master' 10 years ago
Marc Zinnschlag e23a32c44f some cleanup 10 years ago
Marc Zinnschlag 8062faa51a fixed member variable access in OpenCS script compiler (Fixes #2011) 10 years ago
Marc Zinnschlag 02acf60c0b added tooltips for scopes in creator bar 10 years ago
cc9cii 961867e39f Hide overlay if off screen. 10 years ago
cc9cii 313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
Conflicts:
	apps/opencs/CMakeLists.txt
10 years ago
Marc Zinnschlag eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 10 years ago
Marc Zinnschlag 61731d3277 Merge remote-tracking branch 'miroslavr/master' 10 years ago
cc9cii 43838ccf01 Remove override (c++11) 10 years ago
cc9cii e58e5c2bf5 Update overlays independently from multiple viewports. 10 years ago
Thoronador 46496a35a1 fix uninitialized pointer variable in CSVDoc::SubView class 10 years ago
Thoronador 4d62541b62 fix usage of numeric_limits static functions min() and max()
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
cc9cii 47c5bc9a19 Set bounding box on manual objects rather than creating meshes. 10 years ago
MiroslavR 8456741eaa Fix blindness and create a separate fader for it 10 years ago
scrawl 9edcc332ec Don't remove player's sounds when unloading a cell 10 years ago
scrawl d51daf5875 Fix AI not using F_Always spells, for example "vampire touch" 10 years ago
scrawl 9323f96211 Move terrainstorage to opencs_units_noqt 10 years ago
scrawl 8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 10 years ago
Marc Zinnschlag aefe8cd4ae Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
Conflicts:
	apps/openmw/mwworld/class.cpp
10 years ago
Lukasz Gromanowski a6a3eca930 Fixes #1887: Equipped items do not emit sounds
Corrected wrong return type of Class::getSound() method.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
cc9cii 758ce0ed98 Various fixes as per feedback comments. 10 years ago
Lukasz Gromanowski e1663de7cf Fixes #1887: Equipped items do not emit sounds
Added getSound() method to MWClass class and implementation
into Light class.

Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
MiroslavR ad253059b1 Hit indicator for absorb/damage health effect 10 years ago
MiroslavR 8dd95fd77e Construct hit fader with correct texture right away to prevent mygui warning 10 years ago
MiroslavR a5e972aeb5 Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode 10 years ago
Lukasz Gromanowski b44ba84a80 Issue #1887: Equipped items do not emit sounds
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
MiroslavR 2162a9e1b9 Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available 10 years ago
Lukasz Gromanowski 1a0c3dc6cf Issue #1887: Equipped items do not emit sounds
Removed unused mUnequipping and mFirstEquip member variables.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
Lukasz Gromanowski 3b9cfba03c Issue #1887: Equipped items do not emit sounds
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
MiroslavR 0ae604990e Implement continuous damage indication (Fixes #1970) 10 years ago
MiroslavR 4dc613a04b Merge branch 'master' of github.com:OpenMW/openmw 10 years ago
Lukasz Gromanowski fa65c8981a Issue #1887: Equipped items do not emit sounds
Played sound items are based on parts not inserted items.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
cc9cii 809b8c6d5b Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
10 years ago
Marc Zinnschlag 3fd10d2a82 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 10 years ago
Marc Zinnschlag 82b4148a62 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 10 years ago
Thoronador f29a71b498 remove unused var. mSoftwareCursor in WindowManager 10 years ago
Nikolay Kasyanov 138e3032ce Fix: initialize boolean field with boolean value, not NULL 10 years ago
Thoronador 8361019456 fix uninitialized (pointer) vars in more classes 10 years ago
Thoronador 13a0c5624c fix uninitialized member variables in OcclusionQuery class 10 years ago
Thoronador db38108801 fix uninitialized pointer variables in some classes 10 years ago
Thoronador a5245d5a13 remove unused dummy variable 10 years ago
Thoronador ab364c9440 fix some more uninitialized class member fields 10 years ago
Thoronador 51cd2bb5d9 remove unused/double variable from CSMWorld::Column class 10 years ago
Thoronador a799353f60 fix uninitialized fields in CSMDoc::Operation class 10 years ago
Thoronador deb6452e0d fix uninitialized pointer fields in CS::Editor class 10 years ago
terrorfisch c4badcea6e removed warning 10 years ago
Thoronador f0d3fc73d5 fix uninitialized pointer fields in GraphicsPage class 10 years ago
terrorfisch c28dfc2fa4 Travis CI fix? 10 years ago
terrorfisch 4eb1668467 references now initialized when they are needed 10 years ago
terrorfisch bbca942601 -improved trigonometric precision
-cleanup
10 years ago
terrorfisch 5248917a6c - changed namespace 10 years ago
Marc Zinnschlag 21b16f8425 Merge branch 'tables'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
10 years ago
Marc Zinnschlag 23e969eae7 fixed pathgrid saving again (previous fix was incomplete) 10 years ago
Internecine 470d375177 Removed duplicate functions and moved pause check in weather.cpp 10 years ago
cc9cii 3e5027abbb Incorporate terrain height to labels and camera. 10 years ago
cc9cii bfd10a03c0 User configuration manager's resource directory. 10 years ago
cc9cii 406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 10 years ago
terrorfisch db1b93498d Added comment. 10 years ago
terrorfisch 730abf6841 Moved all variables in temporary storage for AiCombat and some more for AiWander.
+Buxfix for previous AiWander changes
10 years ago
MiroslavR 29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 10 years ago
Marc Zinnschlag c85735abed Merge remote-tracking branch 'scrawl/terrain' 10 years ago
Internecine 782e851eb1 Better fix, now allows for teleporting to change weather while still paused. 10 years ago
terrorfisch cae948df96 removed unecessary PathFinders 10 years ago
terrorfisch 4c36c67fb8 Updated AiCombat:
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
10 years ago
terrorfisch 4391c1fd00 Addded the parts of AiWander that I fully understand to the temporary storage.
The rest should be done by someone who has a clearer overview over the class.
10 years ago