Commit Graph

4849 Commits (eb8afa5d35a6646150ab091f5cc8d22cb217a26d)

Author SHA1 Message Date
Chris Robinson 6a3ba41170 Don't store camera nodes, we don't need them. 12 years ago
Chris Robinson 90e29c83c0 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwmechanics/character.cpp
12 years ago
scrawl 007a3cf9bd rename IInterface to Interface 12 years ago
scrawl b5071ced23 Removed using namespace 12 years ago
scrawl 757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 12 years ago
scrawl c6edb0288a Remove unused file 12 years ago
scrawl 1315432322 Handle @# links in journal 12 years ago
scrawl d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 12 years ago
scrawl 166eac2e25 Cleanup 12 years ago
gus 006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 12 years ago
scrawl 38c399a698 Fix duplicate sounds 12 years ago
scrawl 062ff189a2 Merge branch 'master' into memory 12 years ago
scrawl 0f2866dc15 Text replace fix 12 years ago
scrawl 48c5e33c79 Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly. 12 years ago
scrawl a33e6b9c35 Fast forward to the last page in the journal when opening it 12 years ago
scrawl d16bb26a48 Added text colors, goodbye, message 12 years ago
scrawl f07497bbde Fix lockup 12 years ago
scrawl 78e6dab9d2 Dialogue history rewrite WIP 12 years ago
scrawl 6cd28d1156 Fix a bug in getPCNextRank 12 years ago
scrawl 0bb51fd91d Retrieve the correct case for topics in the journal 12 years ago
scrawl 1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 12 years ago
gus 7fe7111c19 Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding... 12 years ago
Marc Zinnschlag 2e6594f8f7 Merge remote-tracking branch 'glorf/bugfix-5' 12 years ago
scrawl 75dcf52552 Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made) 12 years ago
Glorf 517dfb4d75 Bugfix #732 part 2 12 years ago
Glorf 57f22c77c0 Bugfix #732 part 1 12 years ago
greye a8b1706678 init pointer value to prevent segfault 12 years ago
kpp dcccfd9f22 Initialize values 12 years ago
kpp 28ef4d97da Fixes Bug #734 'Book empty line problem'
Hides buttons 'Next' and 'Prev' at the last and at the first page
12 years ago
Chris Robinson 03a6190c5a Merge remote-tracking branch 'zini/master' into animations 12 years ago
Chris Robinson a120653c38 Implement handling weapon states 12 years ago
Marc Zinnschlag d5741c7141 Merge remote-tracking branch 'scrawl/master' 12 years ago
Marc Zinnschlag 95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'"
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
12 years ago
scrawl 1acfd849a2 Fix a case folding bug 12 years ago
Marc Zinnschlag 6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 12 years ago
Marc Zinnschlag 089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 12 years ago
scrawl 40a0969055 Insert records that may not exist in vanilla MW 12 years ago
Glorf b8630239d7 Code cleanup 12 years ago
Glorf 236ec3409f Finished acrobatics 12 years ago
scrawl 67422c397c GetWindSpeed 12 years ago
scrawl 5063d90dda GetStartingAngle was implemented, but not registered 12 years ago
scrawl 627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 12 years ago
scrawl 3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 12 years ago
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
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
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
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 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 98baf9fac1 Bugfix #718 12 years ago
scrawl 6ecd88af14 More fixes 12 years ago
scrawl 4ee1a6ee02 Put door physics in a separate method, some fixes 12 years ago
Marc Zinnschlag cd61177eed Merge remote-tracking branch 'gus/renderWeaponShield' 12 years ago
scrawl 9343b4459e Opening doors 12 years ago
Marc Zinnschlag a6b7f8e904 Merge remote-tracking branch 'scrawl/fall' 12 years ago
Marc Zinnschlag 93c98e1df4 Merge remote-tracking branch 'scrawl/athletics' 12 years ago
Marc Zinnschlag 738a54337d removed redundant case smashing 12 years ago
gus 3d9ceede77 little fix (weapons disapeared when tab was pressed) 12 years ago
gus 5388c25e64 Fix or lockpicks. 12 years ago
gus 766d1efa84 Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out. 12 years ago
scrawl 7d61459ccd Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway. 12 years ago
scrawl fdf80c1c4f Fix unused variable 12 years ago
scrawl db78d15fc4 Fix changeWeather 12 years ago
Chris Robinson ce7bc20fa1 Avoid special-casing player rotation 12 years ago
scrawl 07891fa213 Athletics skill increase 12 years ago
Glorf 3669d0a998 Bugfix #742 12 years ago
Chris Robinson ab52e68c05 Merge remote-tracking branch 'zini/master' into animations 12 years ago
Chris Robinson 137017b325 Don't allow forcing vanity mode 12 years ago
Glorf ade871ce12 Corrected unused opcodes 12 years ago
Glorf 89f7ef2472 Move, moveworld script instructions 12 years ago
Marc Zinnschlag 32138dbb0f silenced a warning 12 years ago
Chris Robinson 2822f431c4 Merge remote-tracking branch 'zini/master' into animations 12 years ago
Chris Robinson b666f1d551 Work around a problem with MWRender::Player::renderPlayer
NpcAnimation::setViewMode makes a call to the character controller, in the
mechanics manager, to forcefully update the character's state. This in turn
makes a call to the player's old NpcAniamtion object that was just deleted.

The mechanics manager will eventually remove and reinsert the player, so the
old character controller will be removed and a new one will get the right
Animation object again, but not in time for the setViewMode call.

There's many factors that all contribute to this run-around, which needs
discussion on how to best fix.
12 years ago
Chris Robinson 55ee4e65a9 Clean up the slotlist struct 12 years ago
scrawl 7821610ec6 Make OnDeath work with explicit reference 12 years ago
scrawl a373f53988 Added SetAtStart 12 years ago
Marc Zinnschlag 4e45222a63 Merge remote-tracking branch 'glorf/rotate-update1' 12 years ago
Glorf 240217ae42 Fixed rotations more than 360 degrees 12 years ago
Marc Zinnschlag 1e9656ee9c Merge remote-tracking branch 'glorf/rotate-update1' 12 years ago
Glorf 7cd4dd0c91 Improved local rotations 12 years ago
Chris Robinson 274f3c7b77 Force character state to update after switching view modes 12 years ago
Chris Robinson e4eb4b7e30 Keep track of the character looping state 12 years ago
Chris Robinson 9da2c9153e Don't store the animation group string in the character controller 12 years ago
Chris Robinson 849335d8cc Merge remote-tracking branch 'zini/master' into nifogre 12 years ago
Chris Robinson 2769adcee0 Implement switching to and from first-person animations
Note that the current animation gets interrupted, so switching to first person
may break movement until you stop and try to move again. This can be fixed by
alerting the character controller in the mechanics manager to force a state
update when switching POV.
12 years ago
Chris Robinson 9a2a32f2a5 Add a method to clear all Animation sources except the first
The first needs to remain, since that's where any mSkelBase entity comes from,
and where any retrieved nodes are from.
12 years ago
Chris Robinson 9be20b90f1 Fix potential infinite loop when layer 0 is empty 12 years ago
Marc Zinnschlag 08e2254628 Merge remote-tracking branch 'pvdk/spacefix' 12 years ago
pvdk d5d14c5147 Fixes issue with multiple spaces in plugin filename not being read correctly 12 years ago
Chris Robinson 76c8e81908 Merge remote-tracking branch 'zini/master' into nifogre 12 years ago
Marc Zinnschlag 247a76766d fixed a typo in a doxygen comment 12 years ago
Marc Zinnschlag 71fc8f5830 Merge remote-tracking branch 'scrawl/item' into next 12 years ago
Chris Robinson 86fda1bff6 Only set mSkelBase from the first objectlist 12 years ago
Chris Robinson 7eac37be23 Make sure the old layer is cleared before starting the next 12 years ago
Chris Robinson 09fc50948b Add methods to disable and get info for a layer 12 years ago
Chris Robinson 24f1eba902 Keep track of whether an animation supplies movement
Also handle it when it doesn't.
12 years ago
Nathan Jeffords 7db6447a00 dropped the I infront of the journal view model interfaces 12 years ago
Nathan Jeffords 36a6806faf drop the leading 'I' from the book page control interfaces 12 years ago
Nathan Jeffords 4c22afc29b made a pass at conforming to established naming convention 12 years ago
Nathan Jeffords c7ede9b523 port code to C++03 12 years ago
Nathan Jeffords 718af692c9 reworked journal to match bethesda's implemenation 12 years ago
Nathan Jeffords f02a53b121 Created a helper class to format books for display from the journal
view-model data.
12 years ago
Nathan Jeffords 50d688c2fc Created a view-model to present journal data to the UI in the form it
intends to display it.
12 years ago
Nathan Jeffords 55ca037411 Created a MyGUI widget to present a page of formatted text. 12 years ago
Nathan Jeffords 8dad04eef1 hid JournalWindow behind IJournalWindow interface, and put its entire
implementation, class definition and all, into journalwindow.cpp
12 years ago
scrawl 9e3917881d Don't fail on nonexistent items in a levelled list 12 years ago
Chris Robinson 0817d59f23 Allow specifying where to start in an animation 12 years ago
scrawl 933f894148 Added Blind and Night Eye effects 12 years ago
scrawl baa7a9160c Rank condition should always fail if NPC is not in a faction 12 years ago
scrawl a7092ef2d7 Fix activation not working sometimes
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
12 years ago
Nathan Jeffords 2dc01fe56b fixed the type of iterator uses in MWWorld::Store
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
12 years ago
scrawl 51580ead4f Fix consecutive dialogue choices 12 years ago
Marc Zinnschlag 87ce2110dc hotfix for CharacterPreview destructor 12 years ago
scrawl cd57e3f896 Auto calculate attributes if there are not specified in the NPC record 12 years ago
Glorf 53fb17da10 Rotation system fixes 12 years ago
Chris Robinson 333354fe62 Remove the character controller from the Animation class 12 years ago
Chris Robinson b80891099e Don't use the character controller to handle text keys
The Animation class has the Ptr and can call to whatever subsystem is needed.
12 years ago
Chris Robinson e8cabc9434 Pass the loop count from loopgroup to the play method
Instead of queueing each iteration separately.
12 years ago