Commit Graph

5391 Commits (6dc216af3d82d4ca874c8f6c28ad5463cf283c9d)

Author SHA1 Message Date
Marc Zinnschlag 90ab7b2bf5 Merge remote-tracking branch 'swick/viewmodetransission' 12 years ago
Sebastian Wick 7c24c0a64e fix uninitialized variables 12 years ago
Sebastian Wick d2b7cb5bb2 First/Third person transitions with mouse wheel 12 years ago
Marc Zinnschlag 34c825ce52 added icons and type listing to UniversalId class 12 years ago
Marc Zinnschlag 661b290c49 automatically scroll table to the position of a newly created record 12 years ago
Sebastian Wick 1b310c5c5b use SDL resolutions in the ingame settings 12 years ago
Marc Zinnschlag 3fa4a194a7 Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl 6164e5bae6 Restored window resizing 12 years ago
Chris Robinson 3744850545 Fix hand-to-hand health damage reduction 12 years ago
Chris Robinson 39507e3f0f Decrease armor condition on successful hits 12 years ago
Chris Robinson 1af48ab6e0 Decrease weapon condition on successful hits 12 years ago
Chris Robinson 465f4d2063 Properly handle starting an animation at the end 12 years ago
Marc Zinnschlag 82958e6514 added custom creator for cell records 12 years ago
Chris Robinson 54f91d4b3a Implement hand-to-hand attacks 12 years ago
Marc Zinnschlag 899e18b2cf report ID errors also via input field tool tips 12 years ago
Marc Zinnschlag 5ec9d370cb check if ID is already in use when creating new IDs 12 years ago
Marc Zinnschlag 124a70906f added creator edit lock 12 years ago
Marc Zinnschlag 32c697abc6 validate IDs entered by the user 12 years ago
Marc Zinnschlag 4f6e99c391 more compact layout for the bottom box 12 years ago
Marc Zinnschlag 00fcb79f08 moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one) 12 years ago
Marc Zinnschlag 2d46a1db2f changed CreateCommand to work directly on the model instead of the proxy 12 years ago
Chris Robinson a34f0de3e1 Play the correct medium armor foot sounds 12 years ago
Chris Robinson db4f34b332 Play hit sounds when hitting creatures and NPCs 12 years ago
Chris Robinson 1a40d01afa Fix NPC armor rating calculation and reduce redundant lookups 12 years ago
Chris Robinson f73008546f Keep a sound updated with its object's position 12 years ago
Chris Robinson c94653dc49 Implement the ModRegion script function 12 years ago
Marc Zinnschlag f93af52486 handling down a reference to Data and the undo stack to the creators 12 years ago
Chris Robinson 1174b85ac8 Implement Disable/EnableTeleporting script functions 12 years ago
Marc Zinnschlag fee748d4b5 added creator bar UI and cancel button 12 years ago
Chris Robinson 3298eb1b37 Implement HitOnMe script function 12 years ago
Chris Robinson 5379e607cb Handle the OnPCHitMe script variable 12 years ago
Chris Robinson f215d2cc30 Only raise weapon skills for the player 12 years ago
Chris Robinson bec420c69b Add Class::onHit for creatures 12 years ago
Chris Robinson dd6edd21f8 Add a separate on-hit method to handle objects being hit 12 years ago
Marc Zinnschlag b8ac45defe added creator to bottom box layout and re-routed add record event to bottom box 12 years ago
Marc Zinnschlag d899cbb449 removed some junk 12 years ago
Marc Zinnschlag ed83e2e70a added creator to bottom box; more cleanup 12 years ago
Marc Zinnschlag 6c4bdc0101 minor cleanup; less pointer usage 12 years ago
Marc Zinnschlag ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 12 years ago
Emanuel Guevel aa14656ff2 esmtool: fix swapped comparison operators 12 years ago
Marc Zinnschlag 3fbbbdc64b Merge remote-tracking branch 'scrawl/master' 12 years ago
Chris Robinson a569ae367e Fix hit chance calculation 12 years ago
Chris Robinson 6195062d72 Try to figure out what gets hit
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
12 years ago
Chris Robinson b3a057d679 Handle hit chance and damage calculation
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
12 years ago
Marc Zinnschlag 4327b81bc3 fixed column handling in table (had problems with filtered out columns before) 12 years ago
Marc Zinnschlag 55e7e71c11 added optional per-subview status bar 12 years ago
Chris Robinson 1dcc893703 Merge remote-tracking branch 'zini/master' into combat 12 years ago
Chris Robinson 4ad28ed369 Don't play a weapon-down sound when unreadying a spell 12 years ago
Chris Robinson 92cc566fdc Rename the Class::attack method to Class::hit 12 years ago
Chris Robinson 0db02af807 Set up the weapon state in the CharacterController constructor 12 years ago
Chris Robinson d9a9c3d6bd Handle the "land" soundgen type 12 years ago
Chris Robinson 705498ec24 Play a swish sound when attacking 12 years ago
Chris Robinson d8ec813939 Say something from the "hit" dialog topic when losing health 12 years ago
Chris Robinson 59f1bc7542 Use time values for the aniamtion's start, stop, and loop points
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
12 years ago
Chris Robinson bf1d907d07 Don't play casting animations for enchantments 12 years ago
Chris Robinson cc8e8c1272 Use the attack strength as determined by how long the attack was held 12 years ago
Chris Robinson 0c8d4d9be2 Add beginnings of melee hits 12 years ago
Chris Robinson 45302f9e25 Handle controllers in the NPC's bound object parts 12 years ago
Marc Zinnschlag a80e80dd94 added layout to table sub view 12 years ago
Chris Robinson 11b094559f Play the appropriate casting animation sound 12 years ago
Emanuel Guevel 70a5a83419 Change the formula used to calculate initial NPC health 12 years ago
Chris Robinson 17282c69b1 Handle spell-casting animation sequences 12 years ago
Chris Robinson 4d157cb19a Handle marksmen weapon attack sequences 12 years ago
Chris Robinson fecb8c1cc4 Fix the completion amount for 0-length anims 12 years ago
Chris Robinson d5d832846e Rename the follow-up upper character state enum 12 years ago
Chris Robinson 537d5c4934 Avoid trying to play animations without any animation sources 12 years ago
Chris Robinson ad6d663e09 Remove some unnecessary debug messages 12 years ago
Chris Robinson 24567294ff Move NPC state update handling into a separate method 12 years ago
Chris Robinson 22e07968af Store the current weapon group name 12 years ago
Chris Robinson 0240efa6cf Improve weapon attack logic to better handle picks, probes, and h2h 12 years ago
Chris Robinson ef17fdeb15 Remove some unused methods 12 years ago
Marc Zinnschlag ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2'
Conflicts:
	apps/openmw/mwrender/animation.cpp
12 years ago
Marc Zinnschlag 7600d6c04b basic filter table 12 years ago
Marc Zinnschlag 66534a45da replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality 12 years ago
Emanuel Guevel 48f0e64ec3 Fix health calculation at character creation 12 years ago
Emanuel Guevel 1c330fc899 Use the correct formula for NPC health initialization 12 years ago
Emanuel Guevel 2356e6218e Complete health increase on level up 12 years ago
Emanuel Guevel 2a0644a7c3 Move some levelup logic from mwgui to mwmechanics 12 years ago
Emanuel Guevel 7837dcdc19 Calculate NPC health on loading instead of updating it continually
Only NPC with auto-calculated stats are concerned.
12 years ago
Emanuel Guevel 074e241c32 MWMechanics::DynamicStat: fix members initialization 12 years ago
Marc Zinnschlag a8168c58c2 Merge remote-tracking branch 'kolek/thirdpersonzoom' 12 years ago
Kolzi d12bac2d9e Third person zoom - fixed code review issues. 12 years ago
Marc Zinnschlag 0fad2e7f40 restructured main menu 12 years ago
Marc Zinnschlag 2497c18702 replaced settings change notifications for columns with a more robust implementation 12 years ago
Kolzi 1b7966ca27 Can zoom in and out in third person view. 12 years ago
Chris Robinson 0cb7d186e7 Use Play_TypeFoot for 'left' and 'right' soundgen keys 12 years ago
Chris Robinson 14e0c182f3 Allow specifying the sound type to playSound and playSound3D 12 years ago
Chris Robinson ac4dfd3b39 Play the appropriate foot sound based on footwear 12 years ago
scrawl bf332b633e Make VideoPlayer::playVideo block until the video finishes 12 years ago
Marc Zinnschlag 365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 12 years ago
Marc Zinnschlag fdd47e5b73 silenced a warning 12 years ago
graffy76 0ae254f6a8 Fixed segfault opening tables 12 years ago
Chris Robinson 9c13568bb7 Remove idles from the state list and rename it 12 years ago
Chris Robinson e803cdbe7f Handle swimdeath and missing death animations 12 years ago
Chris Robinson f01b0b48cc Don't start with an idle state if dead 12 years ago
Chris Robinson e78bdd2a5d Clear 'swim' from the animation name as a backup instead of 'sneak' 12 years ago
Chris Robinson 9ea6b22a83 Handle soundgen animation keys 12 years ago
Chris Robinson d6324d71bf Ensure mechanics actors/objects are cleared before adding them 12 years ago
Chris Robinson c7692acb79 Update the player's Ptr in mwrender when changing cells 12 years ago
graffy76 6486f342b5 Fixed setting synchronization issue
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
12 years ago
Marc Zinnschlag 1b4cd787a5 Merge remote-tracking branch 'kcat/animation-state' 12 years ago
Chris Robinson 0cd4df3edf Stop playing idles on death 12 years ago
Chris Robinson e2e278d06d Fix some animations not playing properly
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
12 years ago
scrawl dfe912dcab Enum renaming 12 years ago
scrawl 91e95e1404 Use the correct slash, chop or thrust animation 12 years ago
gugus 9043fe427f Merge pull request #4 from scrawl/melee
Fixes weapon input to use A_Use instead of hardcoding to mouse button
12 years ago
scrawl 9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 12 years ago
gus 66e3eacace fix bows 12 years ago
gus 701ff94887 bugfix for lockpick 12 years ago
gus 20341ae8b7 simplification + taking into account weapon speed. Seems too fast, but i'm not sure 12 years ago
gus 8fc6e73649 post-merge fix 12 years ago
gus ee47e99dad Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
Conflicts:
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
12 years ago
Marc Zinnschlag 47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 12 years ago
gus f6e3445414 Jittering gone + bugfix: chop animation works!
TODO: fix this unequip stuff
12 years ago
Chris Robinson e5e9c83ed5 Merge remote-tracking branch 'zini/master' into animation-state 12 years ago
Chris Robinson a932a89e02 Specify the velocity-based animation speed multiplier when playing it 12 years ago
Chris Robinson f296d13c20 Add a speed multiplier to the animation state 12 years ago
Chris Robinson 3a1facefdf Store a pointer to the character controller for non-actor objects 12 years ago
Chris Robinson 06e631f213 Track death separately in the character controller 12 years ago
Chris Robinson 4ae65c20e6 Separate movement and idle states
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
12 years ago
scrawl 94d45e1518 Fix twohanded weapons not unequipping when equipping a torch 12 years ago
scrawl daf9dca121 Fix exception when starting a new game 12 years ago
gus f7f23ac5d8 improvement of the chop animation. Still some jittering. 12 years ago
gus f7b711aabe bugfix 12 years ago
gus 076f98cbba change way animations keys are handled (thanks KittyCat!) 12 years ago
Marc Zinnschlag fd9cc1c282 Merge remote-tracking branch 'vorenon/container' 12 years ago
Marc Zinnschlag a0022e711b Merge remote-tracking branch 'scrawl/raycast' 12 years ago
vorenon 66eb82b363 oops again 12 years ago
vorenon 33779ae23c oops 12 years ago
vorenon d4739a451a added ability to close container windows with the activation key 12 years ago
scrawl c81b852071 Fixes inaccurate ray casts; rely on getCameraToViewportRay 12 years ago
scrawl 8407e2b3aa Fixes the console sometimes receiving text after it was closed 12 years ago
Marc Zinnschlag 1bc343f363 Merge remote-tracking branch 'kcat/first-person' 12 years ago
scrawl fa5198d7b2 Fix an assertion 12 years ago
scrawl 61661c8653 Fix first person meshes casting shadows 12 years ago
scrawl a049638e7f Fixes character previews getting shadowed randomly 12 years ago
Marc Zinnschlag 6a5ab34971 Merge branch 'region' 12 years ago
Chris Robinson 3771e5839e Allow some more third person fallbacks in first person 12 years ago
Chris Robinson 5ee889e8b6 Attach the camera to the Head node in first-person 12 years ago
gus 3947f44aa3 Porting old work 12 years ago
Chris Robinson 2d7620e774 Rotate the neck when looking up and down in first-person 12 years ago
Marc Zinnschlag 4cce466dc7 inverted region map y-axis 12 years ago
Chris Robinson 4df1f198a7 Avoid a map lookup for every skin body part when updating 12 years ago
Chris Robinson 6de56615aa Avoid casting shadows in first-person view 12 years ago
Chris Robinson 025fa4e0d5 Use a multimap for the bodypart map 12 years ago
Chris Robinson a5e4faaed2 Show arms and body parts in first person
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
12 years ago
Chris Robinson 908f010c74 Reset the NPC object root when switching POV
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
12 years ago
Chris Robinson 7883087586 Store a pointer to the character controller in the map 12 years ago
Marc Zinnschlag c26a6f884f added region map tooltips 12 years ago
greye 29b7734b52 add qualifiers for names in templates to make gcc 4.7+ happy 12 years ago