Commit Graph

4630 Commits (5b060ffe8d07ce9cb2dee58f75862435cb1ad5cb)

Author SHA1 Message Date
Marc Zinnschlag fdd47e5b73 silenced a warning 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
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
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
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
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
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
scrawl bbb5d2b98a Change tooltip positioning to resemble vanilla 12 years ago
Marc Zinnschlag 71a6955182 Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl 91f6d87126 Fix an uninitialized variable 12 years ago
Marc Zinnschlag 602e40e19d Merge remote-tracking branch 'greye/coc' 12 years ago
greye e553f285b8 update player position on engine start 12 years ago
greye f3d54a7ba4 move finding default cell positions to World 12 years ago
greye 0c303aa285 fix fading on cell transition when cell is loaded 12 years ago
greye 6bb3942288 use Land height data for position in coc 12 years ago
greye a3094b808e update coc behaviour for interior cells 12 years ago
scrawl 744c5804ed Simplified doors, now they will stop after hitting an obstacle instead of trying to back off. 12 years ago
scrawl 72600a16cf Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea 12 years ago
scrawl 58fce74620 Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders 12 years ago
scrawl 5c8950f91c Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Marc Zinnschlag f9d7c7574e Merge remote-tracking branch 'swick/scrollbar' 12 years ago
Marc Zinnschlag 3dc42fb948 Merge remote-tracking branch 'greye/master' 12 years ago
greye 76d95dffb6 special case for loading StartScript records 12 years ago
Sebastian Wick 26bd2a5301 use the new scrollbar; range dependent step size; fix 12 years ago
Sebastian Wick b43f41c2bd use a mygui controller for scrollbar repeat 12 years ago
Sebastian Wick e3d8bdbafe autorepeat scrollbar 12 years ago
Marc Zinnschlag 847ec9fa56 Merge remote-tracking branch 'swick/master' 12 years ago
Sebastian Wick 8bdc9ff3ae set position of the window for multiple monitors 12 years ago
Marc Zinnschlag 56637a39a3 Merge remote-tracking branch 'vheuken/master' 12 years ago
Marc Zinnschlag cd538538b5 fixed weather code 12 years ago
Vincent Heuken f43b48015e remove actor's collisionbox on death 12 years ago
Vincent Heuken b095c24854 resize actor collision boxes on death 12 years ago
scrawl 123a60581f Only link to SDL2main on windows 12 years ago
Glorf 88f8637145 Bugfix #795 12 years ago
Miroslav Puda 743b3dec99 Correction of libavutil version 12 years ago
Alexander "Ace" Olofsson 0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 12 years ago
eroen d75391de8e libav-9 - fix missing includes
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
12 years ago
Vincent Heuken 09cca0bf80 more detailed error message when SDL fails to initialize 12 years ago
Marc Zinnschlag f5ba2b37e7 Merge remote-tracking branch 'vorenon/fixes' 12 years ago
vorenon efdcd9649c Fading for Exterior->Interior cell transitions 12 years ago
Marc Zinnschlag 8b909ff838 killed a stray srand 12 years ago
Miroslav Puda 8da3494d74 Revert "Type of weather changed from string to enum."
This reverts commit 04d90b4c47.

Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/weather.hpp
12 years ago
Miroslav Puda 26a6bdb27d Correction of sigsegv. 12 years ago
Miroslav Puda f9940413fd Static for nextWeather() 12 years ago
Miroslav Puda bf31e5385c Removal of duplicit exterior checking and unneded string copiing. 12 years ago
Miroslav Puda 8a45686e0a WeatherResult added as member variable. 12 years ago
Miroslav Puda f01aa8f55e Simpler statistical calculation of next weather; minus before parens. 12 years ago
Miroslav Puda 04d90b4c47 Type of weather changed from string to enum. 12 years ago
vorenon 4e8e048968 Added missing click sounds to dialogue 12 years ago
Marc Zinnschlag b5926257f5 Merge remote-tracking branch 'scrawl/sdl_input2' 12 years ago
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
Marc Zinnschlag 57ce87bf12 Merge remote-tracking branch 'scrawl/sdl_input2' 12 years ago
scrawl 4fd7891d2c Fix a message box issue 12 years ago
vorenon 76a2abcbe3 added missing line break in front of multiple choice questions 12 years ago
scrawl b16c92c2f5 Better handle SDL_TEXTINPUT events 12 years ago
vorenon ed6098388f return false instead of std::exit 12 years ago
vorenon b97a051dc6 Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813 12 years ago
scrawl 03682184c6 Enable SDL_TEXTINPUT events only when a text input widget currently has key focus 12 years ago
Marc Zinnschlag 3e29506d5c Merge remote-tracking branch 'vorenon/dialogue' 12 years ago
vorenon 9ac4a9c5eb Don't start OpenMW if no master file is selected. This fixes bug #813 12 years ago
vorenon 4c0086b54c Workaround for bug #820 12 years ago
scrawl 4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
scrawl 5252ffa104 More cleanup 12 years ago
scrawl 289587b1a9 Cleanup 12 years ago
scrawl f1ff9b69b3 Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches 12 years ago
scrawl 9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 12 years ago
scrawl 4fb32f7f05 Moved window resize messages to sdlinputwrapper 12 years ago
Nikolay Kasyanov 9807eacb58 Removed obsolete OIS workaround 12 years ago
Nikolay Kasyanov 5984a15846 We don't need Carbon on OS X anymore 12 years ago
Rohit Nirmal e5ddaaf676 Fix wrong indenting from my last commits. 12 years ago
Marc Zinnschlag df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 12 years ago
scrawl 0880805559 Minor cleanup 12 years ago
Rohit Nirmal 9d4ecc3e73 replace tabs with spaces. 12 years ago
Rohit Nirmal aac3ada14b Use mousewheel to turn book pages. 12 years ago
scrawl fcf35d3871 Removed the UI cursor sensitivity slider 12 years ago
scrawl ab3634d692 Removed some remains of OIS 12 years ago
scrawl 14a2a26a56 Fullscreen resizing fix 12 years ago
scrawl 403704b92a Use openmw.png for SDL_SetWindowIcon 12 years ago
scrawl 705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 12 years ago
scrawl cc077eaba6 Fix mouse wheel triggering a click event in mygui 12 years ago
scrawl 918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 12 years ago
scrawl 495aeb5d3b Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
12 years ago
Marc Zinnschlag bd08677a7f Merge branch 'openmw24' 12 years ago
darkf fc0f04324c Remove some superfluous mSkyManager NULL checks 12 years ago
Rohit Nirmal fdeac21f22 Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound 12 years ago
Rohit Nirmal b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 12 years ago
fstp 98e5cb6d7b Added ifdef to keep backward compatibility with the FFmpeg library. 12 years ago
Rohit Nirmal 4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 12 years ago
fstp a3b2a76e60 Added virtual destructors to classes LocalMapBase and EffectEditorBase. 12 years ago
Marc Zinnschlag 48496a644f Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl daab4f55a3 Use Morrowind's fonts 12 years ago
Marc Zinnschlag f586eef604 Merge remote-tracking branch 'torben/pathfindingoverhaul' 12 years ago
Torben Carrington 09beafd044 Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes). 12 years ago
Torben Carrington a4caec56cf Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit). 12 years ago
scrawl 8bd712cc95 Fix being able to move slowly when over encumbered 12 years ago
Torben Carrington 73a9671742 Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes. 12 years ago
Torben Carrington c080785235 Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!). 12 years ago
Torben Carrington 7b465ae4f1 Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM. 12 years ago
Torben Carrington 96fdaf7410 Pathfinding Overhaul - More cleanup. 12 years ago
Torben Carrington 4838678944 Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding. 12 years ago
Miroslav Puda dc17fa1636 Removal of duplicit enumeration and unnecessary conditions. 12 years ago
Marc Zinnschlag bbec3680c6 Merge remote-tracking branch 'pakanek/enchanting-mechanics' 12 years ago
Marc Zinnschlag 6e7416d8c5 Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl 9a43927078 Fix weapons not appearing in Enchantable filter 12 years ago
Miroslav Puda 7a4a386cbe Removal of tab characters. 12 years ago
Torben Carrington dbbc96f600 AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander. 12 years ago
Miroslav Puda b40e24c50c Refactorization 12 years ago
Miroslav Puda 4e17bc1499 Fix for display of cast cost decimal value 12 years ago
Marc Zinnschlag 7927ac818c Merge remote-tracking branch 'torben/aiwanderpatchpotential' 12 years ago
Miroslav Puda 9a9b075a02 Correct cast cost for enchantments. 12 years ago
Torben Carrington ebc1fdd017 AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens. 12 years ago
scrawl 0c7f48ec8a Implement movement for creatures (formula is a stub) 12 years ago
Miroslav Puda 1c7b94e94f Switching in nextCastStyle() is now based on enum CastingStyle. 12 years ago
Miroslav Puda 252a1d9223 Replacement of some magical constants 12 years ago
Miroslav Puda 9e1eb8b3b1 Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics 12 years ago
Miroslav Puda 4788b5e226 Better formula for enchantment cost and code refactorization. 12 years ago
Miroslav Puda 56edc1b213 Correction of getting spell range "Target". 12 years ago
Torben Carrington bd6d54cc8f AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still. 12 years ago
Marc Zinnschlag 86dd6d0847 Merge remote-tracking branch 'eroen/libcxx' 12 years ago
Marc Zinnschlag fa63ebce78 Merge remote-tracking branch 'scrawl/master' 12 years ago
Marc Zinnschlag bd8344b387 Merge remote-tracking branch 'torben/aiwander' 12 years ago
Torben Carrington 3b43ee751e AI Execute Fix - May as well not create the object either to save extra time. 12 years ago
Torben Carrington feb180724c AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior. 12 years ago
scrawl 3a6e54c4f5 Sell owned items in the cell 12 years ago
Torben Carrington fd96d47fe4 AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research. 12 years ago
Torben Carrington 96daad7a22 AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value." 12 years ago
Torben Carrington e37324b967 AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm. 12 years ago
eroen 2850032d9e libc++ fixes: avcodec/avformat workaround
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.

Moving the string inclusion after that eyesore shouldn't break anything.
12 years ago
Marc Zinnschlag 5fac75845c Merge remote-tracking branch 'torben/aiescortclean' 12 years ago
Torben Carrington ddf28ca201 AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem. 12 years ago
Marc Zinnschlag 94474e8952 Merge remote-tracking branch 'torben/checkidlecomplete' 12 years ago
Marc Zinnschlag 81cd1c6e30 Merge remote-tracking branch 'torben/aitravelcleanup' 12 years ago
Torben Carrington c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 12 years ago
scrawl 1e7cf4ae1c GLES2 experiment 12 years ago
Torben Carrington 56b1384c90 AITravel Cleanup - Removed unnecessary includes and other varius cleanups. 12 years ago
riothamus d9350be8da Console Object Selection Fix 12 years ago
Marc Zinnschlag b1a8dc35e0 minor adjustments 12 years ago
Marc Zinnschlag 62479cd885 Merge remote-tracking branch 'torben/aiwanderrepeat' 12 years ago
Torben Carrington 1cfe037d6b AIWander - Added support for the Repeat parameter to mimic vanilla. 12 years ago
scrawl 32e90bb733 Fix chargen statssheet 12 years ago
riothamus 7187f50c40 Bug 788 12 years ago
Miroslav Puda 3cebb41459 missing break 12 years ago
Edmondo Tommasina f0482dd796 dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘"
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
12 years ago
scrawl d3effdf34c Fix exception when trying to equip a shield while a lockpick is equipped 12 years ago
scrawl d9dd02c610 Security fixes 12 years ago
scrawl 2715520d6f Cleanup Security class 12 years ago
scrawl 5173779f4b Add sounds for security skill 12 years ago
scrawl 7a2d1cd8ce Security skill 12 years ago
scrawl c7805e7dd2 Fix sun glare persisting after changing to an interior cell 12 years ago
scrawl 4983d08fe4 Fix a problem with statics disappearing sometimes on the map
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
12 years ago
scrawl 60563afc10 Fix a new game crash, reset camera 12 years ago
Chris Robinson 53d1c3939c Merge remote-tracking branch 'zini/master' into animations 12 years ago
Chris Robinson e8bbb755c3 Play the left-arm torch animation when it's equipped 12 years ago
scrawl d096b19307 Fix not being able to equip arrows/bolts 12 years ago
scrawl 3cadb5918f Fix containers showing random items from my commit earlier 12 years ago
Chris Robinson ee585046ac Don't show weapons in first-person 12 years ago