Commit Graph

6979 Commits (f1ff9b69b307fda028fcbcb5749ef9af358d0062)
 

Author SHA1 Message Date
scrawl 8bc59f8fe6 Merge branch 'master' into journal 12 years ago
Chris Robinson d01351431c Merge remote-tracking branch 'zini/master' into animations 12 years ago
Chris Robinson 4b15da076b Move getStateInfo into the character controller 12 years ago
Glorf d30e43784a Fatigue decrease when jumping, live decrease when falling 12 years ago
Glorf 5a8c1661be Jump acrobatics working, started falling acrobatics implementation 12 years ago
scrawl 1420a2cb33 Tweaked adjustPosition. Now uses a very thin box for tracing the feet only. 12 years ago
scrawl 91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 12 years ago
Glorf add3cd6456 Advance acrobatics on jump 12 years ago
scrawl 2a42556aa5 Merge branch 'master' into HEAD 12 years ago
scrawl 20d5ba0eec Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs"
This reverts commit 6dbb53493b.
12 years ago
scrawl 24f968623f Revert "reworked Nif::KeyListT into Nif::CurveT"
This reverts commit e7665582ad.
12 years ago
scrawl de3c76a54b Revert "reworked NIFStream to use a type-handler"
This reverts commit 03ee7663a3.
12 years ago
Marc Zinnschlag 61e476118d Merge remote-tracking branch 'kcat/animations' 12 years ago
Marc Zinnschlag 2cb7e1f3d5 Merge remote-tracking branch 'glorf/bugfix-4' 12 years ago
scrawl c0dd383cd0 Fix door collision to work with all possible movement directions 12 years ago
Chris Robinson 05060e57ec Add a weapon state to the character controller 12 years ago
Glorf d283f8d85f Bugfix #748 12 years ago
Chris Robinson 020e3e8a8e Show the equipped weapon in the inventory screen
And use the proper pose based on what's equipped.
12 years ago
Chris Robinson 854de1c6c1 Make sure the weapon is in the proper group 12 years ago
Chris Robinson 15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
12 years ago
Chris Robinson 063322b081 Declare some variables closer to where they're used 12 years ago
Chris Robinson 0cf531ba12 Make sure to update parts when the weapon changes 12 years ago
Marc Zinnschlag 93868c8bca Merge remote-tracking branch 'scrawl/master' 12 years ago
Marc Zinnschlag bab899513a Merge remote-tracking branch 'glorf/bugfix-4' 12 years ago
Glorf 74de8b83b6 Enabled collision when new game 12 years ago
Marc Zinnschlag 236751ec45 some IdCollection and IdTable cleanup 12 years ago
Chris Robinson a15758ac85 Fix preview and vanity cameras 12 years ago
Glorf 6222b3f52a Bugfix #744 12 years ago
Chris Robinson d17e1e83d5 Rename MWRender's Player to Camera 12 years ago
Chris Robinson dbba126344 Use a method to check if the view should be first person 12 years ago
scrawl d5c7a26041 Fix broken loose file resources when using Ogre 1.9 12 years ago
Chris Robinson bb8277920b Manage the player's NpcAnimation object in the RenderingManager
It may be more appropriate to manage it in MWRender::Actors with the other
Animation-based objects, but that will need some (minor) interface changes.
12 years ago
scrawl 6c5ea1ea7a Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes 12 years ago
scrawl 5ff098b8fb Fix quick keys being triggered when in UI mode 12 years ago
scrawl 867c7db014 Fix wrong door sounds 12 years ago
scrawl 9648804af5 Fix terrain material leak, this should in theory allow the terrain to free its temporary resources 12 years ago
scrawl 78596cad83 Fix enchantment points value 12 years ago
Chris Robinson ba3a67f84b Don't store the player base node in MWRender::Player 12 years ago
Chris Robinson 4cedf0fbab Avoid colliding with AvoidNodes
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
12 years ago
Chris Robinson 24e503330b Merge remote-tracking branch 'zini/master' into animations 12 years ago
Marc Zinnschlag 11a45b3034 Merge remote-tracking branch 'scrawl/doors' 12 years ago
scrawl 67e5e939a1 Fix some doors 12 years ago
Marc Zinnschlag f2a5377b2b Merge remote-tracking branch 'glorf/bugfix-4' 12 years ago
Marc Zinnschlag 116ac05677 Merge remote-tracking branch 'scrawl/doors' 12 years ago
Glorf 6ea82333d4 Headers cleanup 12 years ago
Glorf 98baf9fac1 Bugfix #718 12 years ago
scrawl 2e1dda9010 Fix old bullet versions 12 years ago
scrawl 6ecd88af14 More fixes 12 years ago
scrawl 208f9ca8c5 Fix problem with newer (or older?) bullet version (thanks travis) 12 years ago
scrawl 4ee1a6ee02 Put door physics in a separate method, some fixes 12 years ago