Commit Graph

9223 Commits (31fab533fe1f6db2634c2abff5f5697e76f7e2fd)

Author SHA1 Message Date
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
cc9cii 13f028e27b Avoid out of range exceptions. 10 years ago
cc9cii b3ef7a71e2 Different implementation of update overlay fix. 10 years ago
scrawl 8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 10 years ago
cc9cii 5d8022bdc5 Update overlay upon control elements button signal. 10 years ago
terrorfisch 0871d45790 Draft how to move temporary package state to CharacterController.
Example for a few values shown in AiWander.
10 years ago
cc9cii e2560de05a Don't use windows path separator. 10 years ago
cc9cii 4fd7537155 Use default sort until a more generic sort that uses numeric order can be implemented. 10 years ago
cc9cii e1197e75bc Handle change of names or regions to dynamically update the overlay. 10 years ago
sylar 70fd531722 None texturing filtering enable for android by default 10 years ago
sylar f75721a217 Add none texture filtering .It is fixes a bug with black objects in shaders glsles 10 years ago
Marc Zinnschlag 744c56943a Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup' 10 years ago
cc9cii 7836ee9ab6 Fixed crash exiting internal cells. Better starting camera position for external cells. 10 years ago
cc9cii a161ad3cd5 Sort cell id column by numerical order. 10 years ago
cc9cii 0cccdfd114 Added description below the cell id (name if exists, or region) 10 years ago
Jordan Ayers 56db525a93 Document the return value of getEffectMultiplier. 10 years ago
cc9cii 7640875f9d More cleanup. 10 years ago
cc9cii f48f841d31 Add full path for Ogre Overlay headers (workaround for osx). 10 years ago
cc9cii 0197f7088f Remove extra frame rendering after enabling/disabling the label. 10 years ago
MiroslavR d1dc9951d4 Do not display werewolf overlay in third person 10 years ago
MiroslavR 0e19c3fdeb Silence werewolves' footstep sounds when they are running with their claws sheathed 10 years ago
MiroslavR 4086bc4848 Do not spawn blood vfx on player if hit fader is enabled 10 years ago
MiroslavR b6abfb0145 Do not display hit fader if the player wasn't damaged 10 years ago
MiroslavR ff74d54e98 Merge branch 'master' of github.com:OpenMW/openmw 10 years ago
scrawl 8097d9801d Fix HasSoulgem function to return number of soulgems 10 years ago
scrawl 9ab8d0a8e6 Hotfix for crash when deleting an actor 10 years ago
cc9cii b3e09cce00 Remove mouse picking code. 10 years ago
cc9cii 972c789060 Add Ogre Overlay path to cmake. 10 years ago
cc9cii cc6153eb8e Removed temporary key bindings. 10 years ago
Internecine 3dee4c2b0e Fixes #1706 10 years ago
cc9cii 6d687993b8 Remove C++11 stuff. 10 years ago
cc9cii e38417e662 Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide.
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag.  No idea what is causing this.
10 years ago
Jordan Ayers aac2de270e Cleanup: Don't call <environment obj>.get().
mEnvironment.get() is redundant.  Switch the call to resemble the
surrounding environment get() calls, instead.
10 years ago
Jordan Ayers 2f5721bf61 Fix typo in comments. 10 years ago
cc9cii dbb2781817 Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default. 10 years ago
scrawl 9cce3bc31b Implement fDispositionMod according to research wiki 10 years ago
scrawl 39bc11681e Fix broken onGround status when levitating 10 years ago
scrawl 829a7bfd1b Fix being able to rest while water-walking (Fixes #1712) 10 years ago
scrawl d9165593d9 Fix footstep sounds played during water-walking 10 years ago
scrawl 064f1964ba More efficient water walking 10 years ago
MiroslavR e1799cbcf4 Fix a typo in condition 10 years ago
scrawl 04614651fa Fix recharging items not being updated for actor's initial inventory 10 years ago
MiroslavR de2cb8926a Feature #1697: Queue fade operations, implement hit fader & werewolf overlay 10 years ago
scrawl d790506525 Fix projectiles colliding with dead actors (Fixes #1971) 10 years ago
scrawl c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 10 years ago
scrawl fe4d74a6cb Fix not being able to move with 0/0 encumbrance (Fixes #1979) 10 years ago
scrawl 5c3bc6563b Fix divisions by zero in normalizedEncumbrance 10 years ago
scrawl 8dd410fe96 Teleport indirect followers as well when using a door (Fixes #1974) 10 years ago
Marc Zinnschlag 2d3ffc4483 fixed pathgrid saving 10 years ago
scrawl ff11745429 Fix magic projectile sound disappearing after multiple save/load cycles 10 years ago
cc9cii 85d93807c5 Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented. 10 years ago
Jordan Ayers 663647bee8 Simplify getEffectMultiplier.
Both return cases were same, except for some overflow conditions.
10 years ago
Lukasz Gromanowski bcb38c3eba Issue #1887: Equipped items do not emit sounds
Added handling of autoEquip and unequipAll cases.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
scrawl 20777c1b2e Optimize physics shape scaling on cell load 10 years ago
scrawl db6b04d127 Use the footstep volume slider for jump landing sounds (Fixes #1968) 10 years ago
scrawl 95378aa6ac Fix crash when a magic projectile has no sound defined (Fixes #1967) 10 years ago
Lukasz Gromanowski e566e4abf2 Issue #1887: Equipped items do not emit sounds
Added playing of sounds for equipped items (at this moment only for lights).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
Marc Zinnschlag be3b229a5f fixed pathgrid loading 10 years ago
Lukasz Gromanowski 6a89b67cb1 Revert "Issue #1887: Equipped items do not emit sounds"
This reverts commit 566211e753.
10 years ago
Marc Zinnschlag cd7cc4bec9 Merge remote-tracking branch 'miroslavr/master' 10 years ago
Lukasz Gromanowski 566211e753 Issue #1887: Equipped items do not emit sounds
Added playing of sounds for equipped items (at this moment only for lights).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
MiroslavR 95be7ea738 Revert spelling change to preserve consistency, fix a typo 10 years ago
MiroslavR 4829b1f9cc Support "right" alignment in books 10 years ago
cc9cii c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
10 years ago
cc9cii 3aea1bf5f9 CMake changes for using Ogre Overlay. 10 years ago
MiroslavR a13039ad1f Allow alignment for images in books 10 years ago
MiroslavR 3287d0b6ef Fix line breaks around IMG tags. 10 years ago
MiroslavR c5e85ebddc Merge branch 'master' of github.com:OpenMW/openmw 10 years ago
scrawl cecc64752e Increase maximum height for finding spawn points (Fixes #1633, Fixes #1881) 10 years ago
scrawl d4ac5c0b57 Use a raycast to find spawn point if convexSweepTest doesn't find one (Fixes #1623, Fixes #1679) 10 years ago
scrawl 6fc53e73ad Don't run AI for knocked-out actors (Fixes #1854) 10 years ago
Marc Zinnschlag 9fd82212b3 Merge remote-tracking branch 'cc9cii/opencs-settings' 10 years ago
scrawl 81a9dc0655 Hotfix for not being able to scroll the world map 10 years ago
cc9cii 115841d31d Do not save window size on exit. 10 years ago
scrawl 083bcaf483 Fix journal quest logs not being marked finished when there are multiple quest IDs in the log 10 years ago
scrawl 8dc20712de Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
scrawl 58672c6bb5 Fix for crash in main menu when reflections are enabled 10 years ago
Marc Zinnschlag a166034e12 Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup' 10 years ago
Marc Zinnschlag f64964d5dd Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 7d36a202a8 Implement cell loading threshold (Fixes #1874)
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.

Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
10 years ago
scrawl 861cc26aa6 Don't sell racial spells (Fixes #1961) 10 years ago
Marc Zinnschlag f4c9897bbd Merge branch 'master' into tables 10 years ago
Marc Zinnschlag 00073694c6 added pathgrid subview 10 years ago
scrawl cc63f7f051 Fix broken idle camera 10 years ago