gus
f6e3445414
Jittering gone + bugfix: chop animation works!
...
TODO: fix this unequip stuff
2013-07-16 09:50:59 +01:00
Chris Robinson
e5e9c83ed5
Merge remote-tracking branch 'zini/master' into animation-state
2013-07-16 01:33:46 -07:00
Chris Robinson
a932a89e02
Specify the velocity-based animation speed multiplier when playing it
2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20
Add a speed multiplier to the animation state
2013-07-16 00:43:31 -07:00
Chris Robinson
3a1facefdf
Store a pointer to the character controller for non-actor objects
2013-07-15 23:47:04 -07:00
Chris Robinson
06e631f213
Track death separately in the character controller
2013-07-15 23:43:33 -07:00
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.
2013-07-15 22:56:23 -07:00
scrawl
94d45e1518
Fix twohanded weapons not unequipping when equipping a torch
2013-07-15 23:21:01 +02:00
scrawl
daf9dca121
Fix exception when starting a new game
2013-07-15 20:37:36 +02:00
gus
f7f23ac5d8
improvement of the chop animation. Still some jittering.
2013-07-15 17:18:16 +01:00
gus
f7b711aabe
bugfix
2013-07-15 16:37:32 +01:00
gus
076f98cbba
change way animations keys are handled (thanks KittyCat!)
2013-07-15 16:37:25 +01:00
Marc Zinnschlag
fd9cc1c282
Merge remote-tracking branch 'vorenon/container'
2013-07-15 09:33:16 +02:00
Marc Zinnschlag
a0022e711b
Merge remote-tracking branch 'scrawl/raycast'
2013-07-15 09:20:16 +02:00
vorenon
66eb82b363
oops again
2013-07-15 02:26:22 +02:00
vorenon
33779ae23c
oops
2013-07-15 02:23:18 +02:00
vorenon
d4739a451a
added ability to close container windows with the activation key
2013-07-15 02:18:24 +02:00
scrawl
c81b852071
Fixes inaccurate ray casts; rely on getCameraToViewportRay
2013-07-15 00:39:37 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
scrawl
fa5198d7b2
Fix an assertion
2013-07-14 14:59:24 +02:00
scrawl
61661c8653
Fix first person meshes casting shadows
2013-07-14 14:55:07 +02:00
scrawl
a049638e7f
Fixes character previews getting shadowed randomly
2013-07-14 14:54:40 +02:00
Chris Robinson
3771e5839e
Allow some more third person fallbacks in first person
2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6
Attach the camera to the Head node in first-person
2013-07-13 16:12:38 -07:00
gus
3947f44aa3
Porting old work
2013-07-13 22:24:52 +01:00
Chris Robinson
2d7620e774
Rotate the neck when looking up and down in first-person
2013-07-13 12:39:06 -07:00
Chris Robinson
4df1f198a7
Avoid a map lookup for every skin body part when updating
2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa
Avoid casting shadows in first-person view
2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5
Use a multimap for the bodypart map
2013-07-12 22:32:04 -07:00
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.
2013-07-12 22:31:59 -07:00
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.
2013-07-12 22:31:57 -07:00
Chris Robinson
7883087586
Store a pointer to the character controller in the map
2013-07-12 22:31:50 -07:00
scrawl
bbb5d2b98a
Change tooltip positioning to resemble vanilla
2013-07-10 03:40:13 +02:00
Marc Zinnschlag
71a6955182
Merge remote-tracking branch 'scrawl/master'
2013-07-08 09:46:00 +02:00
scrawl
91f6d87126
Fix an uninitialized variable
2013-07-07 16:57:46 +02:00
Marc Zinnschlag
602e40e19d
Merge remote-tracking branch 'greye/coc'
2013-07-07 13:34:28 +02:00
greye
e553f285b8
update player position on engine start
2013-07-07 15:06:05 +04:00
greye
f3d54a7ba4
move finding default cell positions to World
2013-07-07 15:03:06 +04:00
greye
0c303aa285
fix fading on cell transition when cell is loaded
2013-07-07 14:30:11 +04:00
greye
6bb3942288
use Land height data for position in coc
2013-07-07 13:47:58 +04:00
greye
a3094b808e
update coc behaviour for interior cells
2013-07-07 13:47:58 +04:00
scrawl
744c5804ed
Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.
2013-07-07 03:52:17 +02:00
scrawl
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
2013-07-06 17:02:40 +02:00
scrawl
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
2013-07-06 16:40:57 +02:00
scrawl
5c8950f91c
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-07-06 16:08:29 +02:00
Marc Zinnschlag
f9d7c7574e
Merge remote-tracking branch 'swick/scrollbar'
2013-07-06 13:13:27 +02:00
Marc Zinnschlag
3dc42fb948
Merge remote-tracking branch 'greye/master'
2013-07-06 12:28:01 +02:00
greye
76d95dffb6
special case for loading StartScript records
2013-07-05 23:52:46 +04:00
Sebastian Wick
26bd2a5301
use the new scrollbar; range dependent step size; fix
2013-07-05 20:28:46 +02:00
Sebastian Wick
b43f41c2bd
use a mygui controller for scrollbar repeat
2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe
autorepeat scrollbar
2013-07-02 17:29:47 +02:00
Marc Zinnschlag
847ec9fa56
Merge remote-tracking branch 'swick/master'
2013-07-01 10:16:39 +02:00
Sebastian Wick
8bdc9ff3ae
set position of the window for multiple monitors
2013-07-01 03:56:33 +02:00
Marc Zinnschlag
56637a39a3
Merge remote-tracking branch 'vheuken/master'
2013-06-29 12:27:01 +02:00
Marc Zinnschlag
cd538538b5
fixed weather code
2013-06-28 09:00:21 +02:00
Vincent Heuken
f43b48015e
remove actor's collisionbox on death
2013-06-27 19:42:27 -07:00
Vincent Heuken
b095c24854
resize actor collision boxes on death
2013-06-27 14:11:20 -07:00
scrawl
123a60581f
Only link to SDL2main on windows
2013-06-27 21:45:32 +02:00
Glorf
88f8637145
Bugfix #795
2013-06-26 22:20:24 +02:00
Miroslav Puda
743b3dec99
Correction of libavutil version
2013-06-26 07:17:29 +02:00
Alexander "Ace" Olofsson
0a2ed8b0d7
Make OpenMW able to initialize SDL in windows builds
2013-06-25 15:05:10 +02:00
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.
2013-06-24 21:08:28 +02:00
Vincent Heuken
09cca0bf80
more detailed error message when SDL fails to initialize
2013-06-23 16:45:23 -07:00
Marc Zinnschlag
f5ba2b37e7
Merge remote-tracking branch 'vorenon/fixes'
2013-06-21 20:28:45 +02:00
vorenon
efdcd9649c
Fading for Exterior->Interior cell transitions
2013-06-21 20:19:35 +02:00
Marc Zinnschlag
8b909ff838
killed a stray srand
2013-06-21 08:58:52 +02:00
Miroslav Puda
8da3494d74
Revert "Type of weather changed from string to enum."
...
This reverts commit 04d90b4c47
2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d
Correction of sigsegv.
2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd
Static for nextWeather()
2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c
Removal of duplicit exterior checking and unneded string copiing.
2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a
WeatherResult added as member variable.
2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e
Simpler statistical calculation of next weather; minus before parens.
2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47
Type of weather changed from string to enum.
2013-06-19 03:24:30 +02:00
vorenon
4e8e048968
Added missing click sounds to dialogue
2013-06-19 01:46:38 +02:00
Marc Zinnschlag
b5926257f5
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 21:23:35 +02:00
scrawl
b16bc69479
Removed the no longer needed --debug switch
2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 20:37:15 +02:00
scrawl
4fd7891d2c
Fix a message box issue
2013-06-16 20:26:27 +02:00
vorenon
76a2abcbe3
added missing line break in front of multiple choice questions
2013-06-16 19:46:55 +02:00
scrawl
b16c92c2f5
Better handle SDL_TEXTINPUT events
2013-06-16 19:43:59 +02:00
vorenon
ed6098388f
return false instead of std::exit
2013-06-16 18:13:14 +02:00
vorenon
b97a051dc6
Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813
2013-06-16 18:12:09 +02:00
scrawl
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
2013-06-16 18:06:55 +02:00
Marc Zinnschlag
3e29506d5c
Merge remote-tracking branch 'vorenon/dialogue'
2013-06-16 17:03:50 +02:00
vorenon
9ac4a9c5eb
Don't start OpenMW if no master file is selected. This fixes bug #813
2013-06-16 04:59:34 +02:00
vorenon
4c0086b54c
Workaround for bug #820
2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
scrawl
5252ffa104
More cleanup
2013-06-15 17:06:27 +02:00
scrawl
289587b1a9
Cleanup
2013-06-15 16:29:25 +02:00
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
2013-06-15 15:33:47 +02:00
scrawl
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05
Moved window resize messages to sdlinputwrapper
2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58
Removed obsolete OIS workaround
2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846
We don't need Carbon on OS X anymore
2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676
Fix wrong indenting from my last commits.
2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
2013-06-13 18:04:38 +02:00
scrawl
0880805559
Minor cleanup
2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73
replace tabs with spaces.
2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b
Use mousewheel to turn book pages.
2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
2013-06-12 20:27:55 +02:00
scrawl
ab3634d692
Removed some remains of OIS
2013-06-12 20:13:19 +02:00
scrawl
14a2a26a56
Fullscreen resizing fix
2013-06-12 20:08:55 +02:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
scrawl
705488ddfb
Fix mouse movement events being discarded when there's more than one event in a frame
2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6
Fix mouse wheel triggering a click event in mygui
2013-06-12 15:10:04 +02:00
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
2013-06-12 14:58:07 +02:00
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
2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f
Merge branch 'openmw24'
2013-06-12 10:37:33 +02:00
darkf
fc0f04324c
Remove some superfluous mSkyManager NULL checks
2013-06-11 20:56:40 -07:00
Rohit Nirmal
fdeac21f22
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound
2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c
Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.
2013-06-10 19:42:38 -05:00
fstp
98e5cb6d7b
Added ifdef to keep backward compatibility with the FFmpeg library.
2013-06-10 15:10:39 +02:00
Rohit Nirmal
4eede86ce6
Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.
2013-06-09 23:27:47 -05:00
fstp
a3b2a76e60
Added virtual destructors to classes LocalMapBase and EffectEditorBase.
2013-06-09 23:08:57 +02:00
Marc Zinnschlag
48496a644f
Merge remote-tracking branch 'scrawl/master'
2013-06-06 23:42:21 +02:00
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02:00
Marc Zinnschlag
f586eef604
Merge remote-tracking branch 'torben/pathfindingoverhaul'
2013-06-01 10:44:23 +02:00
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).
2013-05-31 17:49:52 -07:00
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).
2013-05-31 17:01:42 -07:00
scrawl
8bd712cc95
Fix being able to move slowly when over encumbered
2013-05-31 04:08:44 +02:00
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.
2013-05-29 20:05:17 -07:00
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!).
2013-05-29 19:26:45 -07:00
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.
2013-05-29 17:33:33 -07:00
Torben Carrington
96fdaf7410
Pathfinding Overhaul - More cleanup.
2013-05-29 16:10:15 -07:00
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.
2013-05-29 15:59:23 -07:00
Miroslav Puda
dc17fa1636
Removal of duplicit enumeration and unnecessary conditions.
2013-05-29 00:01:18 +02:00
Marc Zinnschlag
bbec3680c6
Merge remote-tracking branch 'pakanek/enchanting-mechanics'
2013-05-28 10:02:03 +02:00
Marc Zinnschlag
6e7416d8c5
Merge remote-tracking branch 'scrawl/master'
2013-05-28 09:59:41 +02:00
scrawl
9a43927078
Fix weapons not appearing in Enchantable filter
2013-05-28 03:15:13 +02:00
Miroslav Puda
7a4a386cbe
Removal of tab characters.
2013-05-27 20:47:53 +02:00
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.
2013-05-27 11:44:46 -07:00
Miroslav Puda
b40e24c50c
Refactorization
2013-05-27 20:23:04 +02:00
Miroslav Puda
4e17bc1499
Fix for display of cast cost decimal value
2013-05-27 20:16:57 +02:00
Marc Zinnschlag
7927ac818c
Merge remote-tracking branch 'torben/aiwanderpatchpotential'
2013-05-27 18:29:15 +02:00
Miroslav Puda
9a9b075a02
Correct cast cost for enchantments.
2013-05-27 18:08:12 +02:00
Torben Carrington
ebc1fdd017
AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.
2013-05-27 09:05:42 -07:00
scrawl
0c7f48ec8a
Implement movement for creatures (formula is a stub)
2013-05-27 18:03:06 +02:00
Miroslav Puda
1c7b94e94f
Switching in nextCastStyle() is now based on enum CastingStyle.
2013-05-27 16:08:58 +02:00
Miroslav Puda
252a1d9223
Replacement of some magical constants
2013-05-27 15:50:47 +02:00
Miroslav Puda
9e1eb8b3b1
Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics
2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226
Better formula for enchantment cost and code refactorization.
2013-05-27 14:42:08 +02:00
Miroslav Puda
56edc1b213
Correction of getting spell range "Target".
2013-05-27 12:26:06 +02:00
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.
2013-05-27 03:24:41 -07:00
Marc Zinnschlag
86dd6d0847
Merge remote-tracking branch 'eroen/libcxx'
2013-05-27 10:27:31 +02:00
Marc Zinnschlag
fa63ebce78
Merge remote-tracking branch 'scrawl/master'
2013-05-27 10:19:02 +02:00
Marc Zinnschlag
bd8344b387
Merge remote-tracking branch 'torben/aiwander'
2013-05-27 10:16:37 +02:00
Torben Carrington
3b43ee751e
AI Execute Fix - May as well not create the object either to save extra time.
2013-05-26 19:54:59 -07:00
Torben Carrington
feb180724c
AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.
2013-05-26 19:33:45 -07:00
scrawl
3a6e54c4f5
Sell owned items in the cell
2013-05-27 02:18:36 +02:00
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.
2013-05-26 11:30:42 -07:00
