scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
2015-11-14 03:01:24 +01:00
Marc Zinnschlag
c312162b57
Merge branch 'openmw-37'
2015-11-13 14:24:57 +01:00
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
2015-11-13 01:34:36 +01:00
scrawl
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
2015-11-12 23:05:44 +01:00
scrawl
9897400d97
Restore the previous key focus widget after playing video
2015-11-12 19:03:24 +01:00
Emmanuel Anne
af7b5e636e
improves InterpreterContext::updatePtr
...
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
2015-11-12 17:53:17 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
scrawl
19cd987208
Fix Ptr updates in PositionCell
...
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
2015-11-12 14:32:39 +01:00
scrawl
9e3eb8291f
Rotations: fix the rotation order for doors
2015-11-12 02:09:00 +01:00
scrawl
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
2015-11-12 01:44:29 +01:00
scrawl
3647af8d73
Rotations: use different rotation order when object is rotated via script ( Fixes #2062 )
2015-11-12 01:44:00 +01:00
scrawl
b4ce73f179
Rotations: remove LocalRotation
...
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
2015-11-12 01:16:37 +01:00
scrawl
666fbba1e0
Rotations: World::rotateObject takes radians instead of degrees
...
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
2015-11-12 01:09:39 +01:00
scrawl
6405049add
Rotations: move doors via Rotation rather than LocalRotation
...
Now LocalRotation is unneeded, will remove in next commit.
2015-11-12 00:58:29 +01:00
scrawl
8aacbc398f
Rotations: don't wrap the angle values for non-actors
...
It's not really necessary, and just complicates logic elsewhere. Neither does vanilla MW do it. As well, the question is if wrapping to [-PI, PI] or [0, 2*PI] would be the desired range.
2015-11-12 00:52:36 +01:00
scrawl
a68fd791c8
Remove a stray method declaration
2015-11-11 17:24:27 +01:00
scrawl
79c44d0bfe
Style fix
2015-11-11 17:23:47 +01:00
scrawl
02148a43f5
Node mask fix
2015-11-11 17:22:31 +01:00
scrawl
0a52ee17c3
Fix Drawable removal issues
2015-11-11 17:04:06 +01:00
scrawl
afa590bddb
Leak fix
2015-11-11 16:04:17 +01:00
scrawl
c62c1693e9
Disable copy constructor and operator= in PartHolder
2015-11-11 01:47:26 +01:00
scrawl
2e9805fa0e
Leak fix
2015-11-11 00:50:57 +01:00
scrawl
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
2015-11-10 21:55:21 +01:00
scrawl
8e3bc981a2
Fix self-referencing camera
2015-11-10 21:45:53 +01:00
MatthewRock
a662a00c62
Fixing bug for merchant
2015-11-10 19:18:02 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
scrawl
f1ac408f35
Place Drawables directly in the scene graph when built with OSG 3.4
...
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.
There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5
Refactor lighting mask
2015-11-10 17:23:12 +01:00
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
2015-11-10 17:00:33 +01:00
scrawl
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
2015-11-10 01:01:41 +01:00
scrawl
3c338b9da9
ObstacleCheck: tweak the stuck detection parameters
...
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
2015-11-09 20:35:31 +01:00
scrawl
d233bc483d
ObstacleCheck: fix evasion issue
...
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
2015-11-09 20:35:31 +01:00
scrawl
caa523a959
ObstacleCheck: fix the framerate not being taken into account
2015-11-09 20:35:31 +01:00
scrawl
801dc8eee3
ObstacleCheck: fix weird distance calculation
2015-11-09 20:17:21 +01:00
scrawl
1b52749ae1
Adjust third person camera height based on character height
2015-11-09 17:42:35 +01:00
scrawl
b89945804c
BookPage: implement hit test with margin for error
2015-11-09 02:57:49 +01:00
scrawl
055841e721
Improve cloud lighting
2015-11-09 02:22:40 +01:00
scrawl
f0a1434578
Dead actors underwater will float to the surface
2015-11-08 20:58:00 +01:00
scrawl
66925be440
Partially revert 682f30ef9c
...
This change made dead netch fall through the floor, because the animation moves the creature *below* its external collision box.
2015-11-08 19:59:33 +01:00
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
2015-11-08 18:30:22 +01:00
scrawl
a7ad45e73e
WindowBase::center use the layer size instead of render window size
2015-11-08 18:30:21 +01:00
scrawl
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
2015-11-08 18:30:21 +01:00
scrawl
6c12c9a467
Layer renaming fix
2015-11-07 19:45:30 +01:00
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0
layer renaming
2015-11-07 17:49:11 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
13c7235b6b
Remove old FPS setting code
2015-11-07 00:13:13 +01:00
scrawl
2407f393ce
Fix double update traversal in screenshot function
2015-11-06 23:14:27 +01:00
scrawl
6e69808129
Fix the frameNumber not being incremented in certain frames
2015-11-06 23:14:27 +01:00
scrawl
8e4e4e5e38
Fix infinite loop in addToLevList
2015-11-05 01:18:01 +01:00
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
2015-11-04 20:34:50 +01:00
scrawl
1cf1c944b7
Don't attempt to render weather particles on the refraction and reflection textures
2015-11-03 23:20:17 +01:00
scrawl
209fa52883
Hide weather particles underwater ( Fixes #2701 )
2015-11-03 23:15:43 +01:00
scrawl
e3b30baff9
clipFudge fix
2015-11-03 23:10:52 +01:00
scrawl
682f30ef9c
Fix incorrect uses of PhysicsSystem::getHalfExtents
...
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
2015-11-03 19:05:36 +01:00
scrawl
46e07e4b19
Head tracking: fall back to target collision box center if the target has no head node
2015-11-03 18:27:15 +01:00
scrawl
a5f8ffb83d
aimToTarget: Fix the collision box translation not being taken into account
2015-11-03 18:15:47 +01:00
scrawl
de97a8a3da
Do not allow disabling the player object
2015-11-03 17:53:57 +01:00
scrawl
b72d5c5190
Don't play idlestorm animation when swimming
2015-11-03 17:48:35 +01:00
scrawl
c0a81030bb
Make use of INI settings for the simple water
2015-11-03 02:24:50 +01:00
scrawl
30c828dff0
Include cleanup
2015-11-03 02:17:42 +01:00
scrawl
8e8f72408d
Use diffuse/ambient lighting for the simple water
2015-11-03 02:12:00 +01:00
scrawl
380256977b
Fix another renderBin issue with the weather particles
...
Depth sorting w.r.t. the rest of the scene was broken
2015-11-03 01:53:38 +01:00
scrawl
9902dfc9ef
Comment
2015-11-03 01:53:22 +01:00
scrawl
ad016da31d
Enable fog on weather particles
2015-11-03 01:42:37 +01:00
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
2015-11-02 23:38:34 +01:00
scrawl
d6f45c3390
Fix the renderbin for weather particles
...
Regression from commit 2ee6b41887
2015-11-02 21:51:01 +01:00
scrawl
bd1f3493d7
Fix weather particles not being cleared when changing from one particle effect to another
2015-11-02 21:35:03 +01:00
scrawl
0348b8df1c
Fix applying of plane height in ClipCullNode ( Fixes #2985 )
2015-11-02 01:23:21 +01:00
scrawl
3f988327c7
Destructor fix
2015-11-02 00:57:59 +01:00
scrawl
913bbe347b
Don't check the extension string every frame
2015-11-02 00:52:20 +01:00
scrawl
c60388afb6
Add fudge factor to move the water mesh away from camera when the camera gets too close
2015-11-02 00:34:09 +01:00
scrawl
4690ec12cc
Render the water plane with GL_DEPTH_CLAMP if supported ( Fixes #996 )
2015-11-02 00:29:09 +01:00
scrawl
802620a86b
Use TimeOfDayInterpolator for Land Fog Depth
...
Fixes the sudden fog jump at nightfall.
2015-11-01 23:03:16 +01:00
scrawl
45bf3e6788
Create TimeOfDayInterpolator class to refactor time handling in WeatherManager
2015-11-01 22:59:26 +01:00
scrawl
8da4530957
Use INI-imported underwater fog settings ( Fixes #2907 , Fixes #1511 )
2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560
Use the correct scale for actor swim height ( Fixes #2833 )
2015-11-01 21:45:58 +01:00
scrawl
7b817ba010
Fix the node masks of water cameras being reset (Bug #2984 )
...
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
2015-10-31 03:14:05 +01:00
scrawl
93f4d31cf9
Raytest mask fix ( Fixes #2984 )
2015-10-31 01:30:02 +01:00
scrawl
b9b154a015
Minor cleanup
2015-10-31 00:01:12 +01:00
scrawl
d90fa977e8
GL_DEPTH_COMPONEN24 fix
2015-10-29 13:52:48 +01:00
scrawl
7692ae175a
Disable sun rendering on the reflection camera
...
Not needed, we have specular highlights.
2015-10-29 01:17:23 +01:00
scrawl
9b8e45fc01
Fix ripple particles z-fighting with the water surface
2015-10-29 00:28:09 +01:00
scrawl
d394b0793f
waterLevel fix
2015-10-29 00:27:42 +01:00
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
2015-10-29 00:27:42 +01:00
scrawl
8433e0679f
Water: connect to settings window
2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573
Water code cleanup
2015-10-29 00:25:24 +01:00
scrawl
11c997d09d
Water: move reflection code to a new class
2015-10-29 00:25:24 +01:00
scrawl
ebdf25ccb9
Water: move refraction code to a new class
2015-10-29 00:25:24 +01:00
scrawl
7bbdb13138
Remove debug code
2015-10-29 00:25:24 +01:00
scrawl
6ba9f561ea
Use simple water for the local map
2015-10-29 00:25:24 +01:00
scrawl
09631385c3
Use boost ifstream for water resources
2015-10-29 00:25:24 +01:00
scrawl
d485dd0782
Water: fix world UV coords
2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37
Water: pass the near and far planes
2015-10-29 00:25:24 +01:00
scrawl
37c9c12962
Water: clipping plane offset
2015-10-29 00:25:23 +01:00
scrawl
700a0099c3
Remove debug code
2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
2015-10-29 00:25:23 +01:00
scrawl
944e6d0844
Fix adjustment of inventory preview size when guimode changes ( Fixes #2973 )
2015-10-26 14:26:02 +01:00
scrawl
515c52211e
Disable mipmaps for temporary screenshot texture
2015-10-25 18:28:50 +01:00
scrawl
7b954e8cc3
Remove unnecessary dependency on MWScrollBar
2015-10-24 16:04:08 +02:00
scrawl
ef5838df7e
SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras
2015-10-24 15:46:15 +02:00
scrawl
69f234d97b
Small delay before the loading screen shows
...
Kinda irritating to have the loading bar pop up for a fraction of a second.
2015-10-23 16:50:08 +02:00
scrawl
6ef139e1d7
Implement a custom RenderBin for first person models ( Fixes #1612 )
2015-10-19 22:17:04 +02:00
scrawl
93565eccbf
Update the dialogue topic list after running greeting script
2015-10-18 21:40:16 +02:00
scrawl
04df656f54
Remove some junk
2015-10-18 21:39:53 +02:00
Marc Zinnschlag
90036e23b3
Merge remote-tracking branch 'scrawl/enchantment_error'
2015-10-14 09:33:51 +02:00
scrawl
8459a79a2c
Fix AI being able to open locked doors ( Fixes #2948 )
2015-10-13 19:05:17 +02:00
scrawl
f36d463617
Enchantment error handling fix ( Fixes #2959 )
...
Catch errors about missing enchantments before they propagate up the stack and interrupt the whole frame update.
2015-10-13 18:15:39 +02:00
scrawl
ee450471fd
Disable head controller for non-bipedal creatures ( Fixes #2843 , Fixes #2966 )
2015-10-13 17:55:57 +02:00
scrawl
a88d56148b
Read the Sun Glare Fader ini settings
2015-10-13 16:35:31 +02:00
Marc Zinnschlag
2f808f957d
fixed for compiler not recognising script names in some situations
2015-10-08 14:01:29 +02:00
Emmanuel Anne
944dfa5372
a light without the carry flag can't be equipped !
...
it fixes Antares big mod teaching disciplines, it adds a light which should
not be equipped to npcs which have learnt something.
2015-10-07 12:28:25 +02:00
Marc Zinnschlag
379d13c7b9
Merge remote-tracking branch 'scrawl/unstack_script'
2015-10-07 08:12:02 +02:00
Marc Zinnschlag
7e7215b3b3
Merge remote-tracking branch 'scrawl/master'
2015-10-07 08:09:27 +02:00
scrawl
91bf5ae237
Add new script instance when a container item is unstacked (Bug #2962 )
2015-10-07 02:43:21 +02:00
Marc Zinnschlag
231935356a
Merge remote-tracking branch 'origin/master'
2015-10-06 14:30:45 +02:00
Marc Zinnschlag
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
2015-10-06 14:30:32 +02:00
scrawl
7b6fe149f2
getSpellSuccessChance return 0 for used powers ( Fixes #2944 )
2015-10-05 15:41:43 +02:00
scrawl
77cb438714
Fix potential case smashing issue
2015-10-05 15:41:07 +02:00
artemutin@yandex.ru
ec4fff588d
uncomment updateActor call in buildPlayer for magicka recalc
2015-10-05 23:07:13 +10:00
Marc Zinnschlag
9279ae4ba0
Merge remote-tracking branch 'zelurker/removed_items'
2015-09-26 11:24:56 +02:00
Marc Zinnschlag
bebd442b49
Merge remote-tracking branch 'scrawl/godmode'
2015-09-26 11:23:33 +02:00
Emmanuel Anne
6ec8f9123e
Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items
2015-09-26 09:24:56 +02:00
scrawl
899e35591c
Escape MyGUI markup codes in console output
2015-09-26 02:08:23 +02:00
scrawl
387624e158
Add a threshold to AiFollow distance
...
Idle animations can move the actor around slightly, which sometimes causes AiFollow to constantly toggle between "arrived" and "following" state even when the player isn't moving. Could be observed by summoning a bonelord.
2015-09-26 02:02:50 +02:00
scrawl
b9c6a6862a
Don't reset god mode, scripts enabled and sky enabled flags when loading a save game
...
These flags aren't stored in the save file, so it makes no sense to reset them to their default each time a save game is loaded. Instead, reset on "new game".
2015-09-26 01:49:58 +02:00
Emmanuel Anne
2fff6b06cc
removed items by mods do not break cell loading
...
like fortify intelligence potions removed by sris_alchemy which break the
loading of the firewatch mages guild
2015-09-25 14:23:49 +02:00
Alexander "Ace" Olofsson
caa119f13c
Fix instantiation on non-Visual Studio
2015-09-24 15:55:38 +02:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
Marc Zinnschlag
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
2015-09-22 08:33:33 +02:00
scrawl
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87
Minor cleanup
2015-09-21 17:50:36 +02:00
scrawl
d812434fee
Add a subtle fading effect to the sun flash texture
2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05
Remove dead code
2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba
Scale the sun flash texture depending on occlusion query
2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71
Add the full-screen sun glare effect
2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
2015-09-21 17:20:08 +02:00
scrawl
d191a52847
Create occlusion query nodes for the sun flash
2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
2015-09-21 17:19:53 +02:00
scrawl
8de3ce90a7
Add comments for weather IDs
2015-09-19 18:04:24 +02:00
dteviot
60d0ad9283
When stuck, try moving backwards as well as to side.
2015-09-19 16:14:00 +12:00
dteviot
5369d20682
Moved pathfinding logic from AiCombat to Pathfinding.
2015-09-19 15:34:02 +12:00
scrawl
a37dee09e2
Fix invisibility effect disappearing after a view mode switch
2015-09-18 21:30:02 +02:00
Marc Zinnschlag
b58a63e14e
Merge remote-tracking branch 'scrawl/deathanim'
2015-09-17 14:54:29 +02:00
Marc Zinnschlag
96880b4dfe
Merge remote-tracking branch 'scrawl/tabs'
2015-09-17 09:30:31 +02:00
Marc Zinnschlag
c35ce88ee7
Merge remote-tracking branch 'scrawl/aiming'
2015-09-17 09:25:33 +02:00
Marc Zinnschlag
ed373aa320
Merge remote-tracking branch 'scrawl/animation'
2015-09-17 09:24:11 +02:00
scrawl
a7f898057b
Don't activate the initial death animation when skipAnim is set ( Fixes #2513 )
2015-09-17 04:38:42 +02:00
scrawl
c4b5a41ac3
Improve combat AI vertical aiming ( Fixes #1366 , Fixes #1330 )
2015-09-17 03:41:15 +02:00
Emmanuel Anne
29a84452ab
durations in tooltips : use "show effect duration" setting
2015-09-16 22:42:54 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6
durations in tooltips : water walking effects is seen differently
...
so move the duration info out of this block...
2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583
add duration to spell icons too
...
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce
show duration of light sources in tooltip
...
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
2015-09-16 17:53:06 +02:00
scrawl
f8d4bc378f
Move setAlpha from NpcAnimation to Animation ( Fixes #2917 )
2015-09-16 16:15:55 +02:00
scrawl
126960261f
Keep playing IdleSneak on the lower body when casting spells / using weapons
2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae
Add convenience operator [] to AnimPriority
2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7
Use the actual sneak state to determine visibility of indicator ( Fixes #2915 )
2015-09-16 15:37:36 +02:00
Marc Zinnschlag
c693656307
Merge branch 'localvarfix'
2015-09-15 14:01:45 +02:00
Marc Zinnschlag
2a981a5272
make sure local variables are loaded when trying to access them from outside of a script ( Fixes #2659 )
2015-09-15 13:58:07 +02:00
dteviot
0feae19140
AiCombat use evadeObstacles() from AiPackage.
2015-09-14 19:57:22 +12:00
Marc Zinnschlag
2c37731494
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d
Fixed errors pointed out by Zini.
...
1. Removed "Actor" from name of function isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12:00
Marc Zinnschlag
0ff786bebd
Merge remote-tracking branch 'origin/master'
2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
dteviot
10eabc9d51
actorutil.hpp includes mwworld/ptr.hpp
...
As pointed out by Scrawl, fixes compiler error if getPlayer() is called before MWWorld::Ptr is defined, because getPlayer() returns a Ptr by value.
2015-09-11 18:43:06 +12:00
dteviot
6f97187bb6
Fix travis warning about no newline at end of file.
2015-09-10 22:26:33 +12:00
dteviot
573a14993a
Moved isActorNearInactiveCell() logic to own function.
...
Also, triggers when actor is near edge of cell, not when less than 1/2 way to edge.
2015-09-10 21:53:31 +12:00
dteviot
e9c796166a
Added MWMechanics::isPlayerInCombat()
2015-09-10 18:48:34 +12:00
scrawl
cd0f8e556b
Merge pull request #753 from slothlife/thunderstorm-support
...
Improve thunderstorm support.
2015-09-09 14:44:36 +02:00
slothlife
29d74f0249
Improve thunderstorm support.
...
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
2015-09-08 22:05:33 -05:00
Marc Zinnschlag
353d6973e2
Merge remote-tracking branch 'origin/master'
2015-09-08 08:27:00 +02:00
scrawl
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
2015-09-07 22:31:11 +02:00
scrawl
5aa33fde43
Include cleanup
2015-09-07 22:16:15 +02:00
scrawl
e5d54fb539
Check for actor being the player in various actions
2015-09-07 22:15:17 +02:00
scrawl
fd48c1d6f4
Make the Equip script function "use" items (drink potion, use alchemy, etc)
2015-09-07 22:09:08 +02:00
scrawl
481f23d955
Implement framerate limit setting
...
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
2015-09-07 16:05:51 +02:00
dteviot
96e3933ee9
Fixed bug in smoothTurn()
...
Now correctly handles changing direction from 178 to -178 degrees.
2015-09-06 17:39:48 +12:00
scrawl
acbea2461b
Fix a typo
2015-09-04 23:27:33 +02:00
scrawl
d11952c48a
Stop rendering when the window is minimized
2015-09-04 03:44:14 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
b3fdf92d2b
more const-ness fixes
2015-08-31 16:08:19 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
7a96a04b75
Merge remote-tracking branch 'origin/master'
2015-08-31 09:22:19 +02:00
Marc Zinnschlag
a8bee25757
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-08-31 09:18:36 +02:00
Marc Zinnschlag
4b7a034cf9
Merge remote-tracking branch 'slothlife/weather-transition-fix'
2015-08-31 09:03:04 +02:00
scrawl
8aaba0af6f
Fix journal page navigation bug introduced by 7dd09dd637 ( Fixes #2899 )
2015-08-30 17:38:21 +02:00
dteviot
1dfe438a5d
reduce "reset if stuck" AiWander timeout.
...
Now is about 14 seconds, instead of 300.
2015-08-30 16:43:35 +12:00
dteviot
39c2ba8efe
Pathfinding bugfix.
...
Observed at Ebonheart (coe 1, -13). Especially at the western tower. Guards try to walk though tower door.
Cause: buildPath() adds destination (even when unreachable) when only using single node from pathgrid.
2015-08-30 16:12:51 +12:00
dteviot
f2c9b9351f
Try going right and left to "unstick" actor.
2015-08-30 10:06:09 +12:00
dteviot
31d82b6b0c
Unifiy evadeObstacles() logic between AiWander and AiPackage
...
Can't use same code, but logic is now same.
2015-08-30 08:32:47 +12:00
dteviot
f59e918a3b
removed useless code.
...
zTurn ignores turns < 0.0087 radians.
2015-08-29 17:34:33 +12:00
dteviot
0677799839
movement logic in AiPackage uses ObstacleCheck.
2015-08-29 17:21:18 +12:00
slothlife
2b48a20b76
Fix weather transition bugs
2015-08-28 23:12:39 -05:00
slothlife
d9a7986b3a
Remove redundant fast forward check
2015-08-28 18:04:22 -05:00
Marc Zinnschlag
45e7522aa6
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-28 16:09:18 +02:00
dteviot
300c48329d
Creature::isFlagBitSet() changed to free function.
2015-08-28 18:38:05 +12:00
slothlife
4fd00a75d5
Merge advanceTime and advanceTimeByFrame
2015-08-27 14:53:52 -05:00
slothlife
cd8ec5c11e
Improve checking for older weather records
2015-08-27 13:44:06 -05:00
slothlife
7817c52cbb
Discard old save game weather records
2015-08-27 09:57:32 -05:00
dteviot
95d2d82abf
extracted isFlagBitSet()
2015-08-27 18:36:46 +12:00
slothlife
c907ed517d
Remove C++11 explicit on conversion operator
2015-08-26 23:34:15 -05:00
slothlife
54fa5273dc
Refactor weather transitions to act more like MW
...
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
2015-08-26 22:59:21 -05:00
Marc Zinnschlag
a9f9a8d58e
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-26 15:59:28 +02:00
dteviot
541d7fb4fb
Fixed assorted issues
...
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
2015-08-25 18:19:16 +12:00
Marc Zinnschlag
8f7f29943a
Merge remote-tracking branch 'jordan-ayers/topic/dead-code'
2015-08-24 15:13:53 +02:00
Jordan Ayers
cd5bef958f
Remove dead code from alchemywindow.
...
Also align some braces.
2015-08-24 07:43:30 -05:00
dteviot
bb54bbd273
Pulled duplicated functions into common base class
2015-08-24 19:54:02 +12:00
scrawl
b509a18065
Remove code setting PcRace ( Fixes #2886 )
...
This is already handled by the RaceCheck script.
2015-08-23 14:30:23 +02:00
Marc Zinnschlag
a52b947efe
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-08-23 12:11:30 +02:00
scrawl
542c648e69
Fix incorrect assignment of PcRace, need to sort race IDs ( Fixes #2884 )
2015-08-22 22:53:06 +02:00
Marc Zinnschlag
50ec8b10f5
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-22 10:37:43 +02:00
scrawl
ba8e4c22aa
Avoid using loops to wrap angle values ( Fixes #2882 )
2015-08-21 20:17:42 +02:00
scrawl
52d8bc555c
Add missing checks to see if spell still exists when loading a savegame (Bug #2883 )
2015-08-21 14:24:49 +02:00
dteviot
5dd0ad6841
Fixed rest of travis errors.
2015-08-21 22:41:31 +12:00
dteviot
3fa5c6a0e7
fixed travis build failure
2015-08-21 22:00:08 +12:00
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb
replaced FLT_MAX with numeric_limits.
2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
dteviot
3b231b85bb
removed incorrect optimization.
...
Now it fixes #2871
2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-20 20:42:35 +02:00
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
2015-08-20 20:39:44 +02:00
Marc Zinnschlag
5cb0353b5c
Merge remote-tracking branch 'jeffreyhaines/npcsdontscream'
2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f
Correctly handle disjoint pathgrid ( Fixes #2871 )
...
Bugfix:
When
1. Cell has multiple subgrids (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
2015-08-20 21:50:58 +12:00
dteviot
0ee7407101
extracted common sub-expressions.
2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e
extracted function CreatureStats::isParalyzed()
2015-08-20 18:12:37 +12:00
Jeffrey Haines
f94d3237fc
Removed unused cmake import
2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4
Removed long int parameter
2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119
Time played display setting
2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf
Updated parameter name to reflect units
2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1
Time played displayed in save/load menus
2015-08-19 10:05:08 -04:00
Marc Zinnschlag
9918b57341
Merge remote-tracking branch 'origin/master'
2015-08-19 16:03:01 +02:00
Jeffrey Haines
e1baf1ea48
NPCs scream when they die
2015-08-19 09:51:04 -04:00
scrawl
232dfdc07e
Make an error message slightly more helpful
2015-08-19 01:24:54 +02:00
scrawl
681183df31
Restore handling of fog depth == 0 values (Bug #1549 )
2015-08-19 01:13:14 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
dca08b0b42
Remove a firing assert ( Fixes #2871 )
2015-08-18 14:51:32 +02:00
Marc Zinnschlag
e888fd7034
Merge remote-tracking branch 'scrawl/delete_noop'
2015-08-17 18:21:56 +02:00
Marc Zinnschlag
3992125b61
Merge remote-tracking branch 'scrawl/master'
2015-08-17 14:05:51 +02:00
Marc Zinnschlag
dc72b24f4e
Merge remote-tracking branch 'dteviot/PathfindingRefactorDraft'
2015-08-17 14:04:56 +02:00
Marc Zinnschlag
b5f3f0522a
Merge remote-tracking branch 'slothlife/weather-settings-fix'
2015-08-17 14:03:54 +02:00
scrawl
b583a2ec33
Make SetDelete a no-op for items in containers ( Fixes #2864 )
2015-08-17 00:06:26 +02:00
Jordan Ayers
be7bd9529d
Classes shouldn't use MWBase::Environment to access their own members.
2015-08-16 16:56:44 -05:00
scrawl
9fad33cd14
Don't reset the item model's sort/filter options in updatePlayer ( Fixes #2863 )
2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25
Remove an unused function
2015-08-16 17:40:20 +02:00
dteviot
4d9d8a060d
Pathing bugfix.
...
When path contains one one point from path grid, point is no longer being discarded.
2015-08-16 18:56:28 +12:00
dteviot
942a987d52
centralize the world/cell coordinate conversion logic.
2015-08-16 18:55:02 +12:00
dteviot
5049c9ab6a
removed unnecessary tests.
2015-08-16 17:41:33 +12:00
slothlife
3d419a612a
Corrected some weather transition calculations
...
Reversed some formulas for Transition Delta and Clouds Maximum Percent
and implemented them. Refactored Weather some to encapsulate those
formulas (to more closely match MoonModel). Did some small cleanup of
WeatherManager.
2015-08-15 23:38:49 -05:00
scrawl
8426d376f0
Use separate touch spell raycasts for actors and objects ( Fixes #2849 )
2015-08-16 02:06:04 +02:00
scrawl
afb3d94ba4
Fix cell names in the save/load menu not being localised ( Fixes #2840 )
2015-08-16 01:55:14 +02:00
scrawl
c25dacb480
Fix "Level" string in the save/load menu not being localised (Bug #2840 )
2015-08-16 01:53:58 +02:00
scrawl
8241976368
Don't attempt to play non-existing hit animations ( Fixes #2856 )
2015-08-15 23:27:37 +02:00
scrawl
7dd09dd637
Fix being able to flip journal pages with the mousewheel when the options overlay is active ( Fixes #2855 )
2015-08-15 20:44:15 +02:00
scrawl
58cd2b1a84
Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? ( Fixes #2148 )
2015-08-15 19:01:21 +02:00
scrawl
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
2015-08-15 16:09:53 +02:00
scrawl
d76fb2d266
Apply disintegrate only to weapons and armor ( Fixes #2853 )
2015-08-14 13:38:39 +02:00
Marc Zinnschlag
5aeabe22f0
Merge remote-tracking branch 'dteviot/PathfindingRefactor'
2015-08-14 10:13:04 +02:00
scrawl
e8c9d3ea2a
Fix cell names on world map not always being translated ( Fixes #2832 )
2015-08-13 17:08:21 +02:00
scrawl
1e18a73b1c
Don't play magic effect sounds & visual effects for unsuitable targets ( Fixes #2811 )
2015-08-13 17:08:21 +02:00
scrawl
211deeb63e
Don't attempt to lock or unlock unsuitable objects ( Fixes #2826 )
2015-08-13 17:08:21 +02:00
scrawl
0d8f07d563
Properly apply changes when backing out of chargen dialogs ( Fixes #2627 )
2015-08-13 17:08:21 +02:00
scrawl
86f0e505e9
Add a fixPosition for the --start exterior cell ( Fixes #2790 )
2015-08-13 17:08:20 +02:00
Marc Zinnschlag
d511772534
Merge remote-tracking branch 'rohit-n/gamepad'
2015-08-13 10:15:27 +02:00
Rohit Nirmal
d9b11f963a
Gamepad: Slow down simulated mouse with right trigger
...
in menus.
2015-08-11 21:46:54 -05:00
dteviot
55e3aaaa35
made variable const.
2015-08-10 20:30:43 +12:00
dteviot
e42a2478dc
Removed tests that are not necessary.
2015-08-09 17:58:40 +12:00
dteviot
2b9e22f593
extracted function stopAttack().
2015-08-09 14:29:38 +12:00
dteviot
0884a3796f
extracted function isTargetMagicallyHidden().
2015-08-09 14:20:55 +12:00
dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:08:42 +12:00
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:06:52 +12:00
Marc Zinnschlag
d29862eac3
Merge remote-tracking branch 'emperorarthur/anim_fail'
2015-08-08 10:47:46 +02:00
Marc Zinnschlag
b74a14211f
Merge remote-tracking branch 'origin/master'
2015-08-08 10:42:02 +02:00
Marc Zinnschlag
1eed1c4d23
Merge remote-tracking branch 'dteviot/AiCombatPerFrameUpdate'
2015-08-08 10:35:58 +02:00
scrawl
56b7196bea
Remove incorrect implementation of "Clouds Maximum Percent" weather setting
2015-08-07 15:34:01 +02:00
slothlife
3235cecddf
Use Glare View for visibility of celestial bodies
...
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
2015-08-07 00:08:18 -05:00
slothlife
238ae419a3
Fix use of incorrect material for Sun
2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579
Use diffuse alpha to fade Sun
2015-08-05 21:03:21 -05:00
slothlife
ea2f88a355
Fix several sky rendering bugs, maybe also #639
...
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
2015-08-04 21:07:42 -05:00
dteviot
58f732ebc9
Update path following checks each frame in AiCombat.
2015-08-04 18:20:05 +12:00
dteviot
ad9bab0b68
Removed redundant if.
2015-08-04 18:17:08 +12:00
dteviot
4256e151b1
Fixed error in deciding type of attack
2015-08-04 18:15:58 +12:00
dteviot
21e249cb92
pass parameters as const &
2015-08-04 18:14:36 +12:00
scrawl
664ae079db
Improve setting of culling mask for the savegame screenshot camera
2015-08-02 18:05:15 +02:00
scrawl
88c61ed2b6
Fix NotifyDrawCompletedCallback in single threaded mode
2015-08-02 17:57:50 +02:00
Marc Zinnschlag
e73c115ff5
Merge remote-tracking branch 'origin/master'
2015-08-02 13:44:17 +02:00
Marc Zinnschlag
529041f6f6
Merge remote-tracking branch 'slothlife/moon-settings'
2015-08-02 13:43:55 +02:00
Marc Zinnschlag
9ee3f1bfe7
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-02 13:42:39 +02:00
slothlife
0244a9b329
Correct moon texture with respect to trajectory
2015-08-01 07:57:05 -05:00
Marc Zinnschlag
9392e426c0
Merge remote-tracking branch 'origin/master' into mergetool
2015-08-01 10:16:20 +02:00
Marc Zinnschlag
15e8275443
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-01 10:14:28 +02:00
Arthur Moore
08d5aaf0fc
Remove more comments
2015-07-31 18:23:07 -04:00
Arthur Moore
6fce49bfb5
Don't warn twice when unable to play an idle animation
2015-07-31 18:01:02 -04:00
Arthur Moore
61c3835637
Don't try to play animations we know are bad
...
Prevents log spam
2015-07-31 18:01:02 -04:00
scrawl
7644a46ded
Creatures with no movement should not attempt to start combat ( Fixes #2786 )
2015-07-31 01:26:26 +02:00
scrawl
f326b8e5d2
Fix weapon animations playing on the lowerbody when swimming
2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e
Play swimming animation fallback on the upper body when possible
2015-07-31 00:35:41 +02:00
scrawl
1f755a2bc0
Don't use a shared Material in AlphaFader
2015-07-31 00:03:01 +02:00
slothlife
67a63cc662
Add some const correctness to MoonModel
2015-07-30 14:00:08 -05:00
Stanislav Bas
d13766cb3c
Remove redundant template specializations
2015-07-30 16:08:22 +03:00
Stanislav Bas
f15adb4e4f
Store::load() overwrites loaded records with the same IDs
2015-07-30 15:38:07 +03:00
Arthur Moore
5ea596f38d
Refactor onChooseActionStatePerFrameActions
...
This prevents playIdle errors from tyring to play idleAnimation 0
2015-07-30 08:15:45 -04:00
Arthur Moore
f69de1f263
Alert the user if trying to play a non-idle animation
...
Continue to propagate success/failure up the call stack.
2015-07-30 08:08:58 -04:00
Arthur Moore
5e6fcc2aef
Alert the user if attempting to play an animation fails
...
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
2015-07-30 08:00:26 -04:00
Marc Zinnschlag
26ea3aa1ad
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-30 10:26:40 +02:00
slothlife
a4e1630ec2
Remove unreferenced member in MoonModel
2015-07-30 00:41:30 -05:00
slothlife
8dc7e158c6
Fix forward declaration of MoonState
2015-07-30 00:18:56 -05:00
slothlife
24ba54f4fe
Implement accurate moon settings ( fixes #672 )
2015-07-29 23:57:45 -05:00
scrawl
7ba399fc92
Change a message to upper case spelling
...
More consistent with other loading messages
2015-07-28 03:21:44 +02:00
Marc Zinnschlag
bafa86d3e9
Merge remote-tracking branch 'scrawl/master'
2015-07-27 11:10:16 +02:00
dteviot
04aee1fe20
extracted function reactionTimeActions().
2015-07-26 17:32:29 +12:00
dteviot
c7aacaee70
extracted function returnToStartLocation().
2015-07-26 17:29:32 +12:00
dteviot
5e519ef550
extract function isPackageFinished().
2015-07-26 17:29:01 +12:00
dteviot
ad0d807103
extracted function reactionTimeActions().
2015-07-26 17:28:32 +12:00
dteviot
9c0e3d6c28
extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions().
2015-07-26 17:25:44 +12:00
dteviot
76f95eafe7
extract function onWalkingStatePerFrameActions().
2015-07-26 17:25:00 +12:00
dteviot
5ec310dfba
extract function onIdleStatePerFrameActions().
2015-07-26 17:24:33 +12:00
dteviot
b3d5b47fea
extracted function UpdateActorsMovement().
2015-07-26 17:23:45 +12:00
scrawl
dff84adf7e
Fix weapon animation priority
2015-07-26 01:35:36 +02:00
dteviot
aba7225817
Removed some duplicated operations.
2015-07-26 11:15:21 +12:00
scrawl
41996b0aad
Don't play turning animations in first person mode
2015-07-25 18:59:16 +02:00
scrawl
e0ee2fc01b
Adjust the movement animation speed every frame ( Fixes #1921 )
2015-07-25 18:22:48 +02:00
scrawl
278076e609
Include cleanup
2015-07-25 04:14:22 +02:00
scrawl
3bca3e73d4
Fix GetWeaponDrawn and GetSpellReadied script functions for creatures
2015-07-25 02:11:59 +02:00
scrawl
b3f5ac5dbb
Include cleanup
2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0
Outdated comment fix
2015-07-25 00:28:47 +02:00
scrawl
3f3c3d0ad3
Remove an already resolved todo comment
2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc
Include cleanup
2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35
Changed a settings variable responsible for number of loaded exterior cells.
2015-07-24 22:01:49 +02:00
scrawl
7f66339790
Remove a redundant function
2015-07-24 20:23:27 +02:00
scrawl
71bc22401f
Include cleanup
2015-07-24 18:23:23 +02:00
scrawl
7e4e59efb9
Fix excessive auto-equipping in InventoryStore::removeItem ( Fixes #2792 )
2015-07-23 02:29:09 +02:00
scrawl
7900631d51
Print the missing player cell to error output
2015-07-23 02:29:09 +02:00
scrawl
8286dc6c5a
Player followers don't report crimes ( Fixes #2457 )
2015-07-23 02:29:09 +02:00
Stanislav Bas
daaff1284e
Remove unused includes
2015-07-22 22:18:26 +03:00
Stanislav Bas
67c8f95c4e
Load/read methods (for ESM records) accept a deleted flag in OpenMW
2015-07-22 22:15:37 +03:00
Marc Zinnschlag
6e3032efc1
Merge remote-tracking branch 'koncord/fix-gold-beh'
2015-07-22 08:30:43 +02:00
Koncord
6c3c85f0d4
Fix indent
...
Remove misc.hpp in containerstore.cpp
2015-07-20 21:53:20 +09:00
Marc Zinnschlag
f3d3cbc58b
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-20 09:57:46 +02:00
Marc Zinnschlag
d2cd151f77
Merge remote-tracking branch 'kunesj/master'
2015-07-20 09:45:14 +02:00
dteviot
2a4d35b98c
fixed "comma at end of enumerator list" warning.
2015-07-20 18:20:57 +12:00
Koncord
7a86c8d8b6
Fix OpAddItem, OpGetItemCount and OpRemoveItem.
2015-07-20 12:48:19 +09:00
Koncord
a24df8cb66
Revert addImp() and remove()
...
add isGold() in MWWorld::Class
2015-07-20 12:43:58 +09:00
Koncord
9485aa5e44
Fix "removeitem gold_100" behavior
2015-07-20 09:53:08 +09:00
Koncord
aefcd1ad07
Fix "additem gold_100" behavior
2015-07-20 08:20:28 +09:00
Koncord
75e5023590
fix code duplication
2015-07-20 08:06:43 +09:00
Jiří Kuneš
a14a3c82de
added description of new syntax to the onRetrieveTag function comment
2015-07-19 19:52:50 +02:00
Stanislav Bas
5fd48efd28
Some refactoring. Remove unused code
2015-07-19 14:58:14 +03:00
Marc Zinnschlag
9b3d5c958f
Merge remote-tracking branch 'scrawl/music'
2015-07-19 11:49:00 +02:00
dteviot
00eef585af
renamed mPlayedIdle to mIdleAnimation.
2015-07-19 18:04:42 +12:00
dteviot
22f49128cc
replaced multiple booleans with single state variable.
2015-07-19 18:02:13 +12:00
dteviot
1ed6e95c07
Got rid of some radians to degrees to radians conversions.
2015-07-19 18:01:25 +12:00
dteviot
3ebe9fb34f
renamed mRotate to mTurnActorGivingGreetingToFacePlayer
2015-07-19 18:00:49 +12:00
scrawl
b01abe4d19
Stop title music when the game starts ( Fixes #2468 )
2015-07-19 02:08:24 +02:00
scrawl
1156668843
Render certain map markers on top of the player arrow ( Fixes #2559 )
2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5
define owned colours in settings.cfg
2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
2015-07-18 21:29:38 +02:00
scrawl
278a078e9d
Unify magic effect tick functions
...
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
2015-07-18 20:39:45 +02:00
scrawl
77f1387da8
Include cleanup
2015-07-18 20:36:28 +02:00
Jiří Kuneš
75f5972898
show owned - better settings
2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
2015-07-18 16:56:57 +02:00
scrawl
111cf5462b
Merge pull request #666 from scrawl/animation
...
Animation refactoring & fixes
2015-07-18 13:33:41 +02:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
2015-07-18 11:40:36 +02:00
Marc Zinnschlag
964cd44e96
Merge remote-tracking branch 'kunesj/master'
2015-07-18 11:34:04 +02:00
slothlife
f8f0380413
Fix for loading window icon on Windows
2015-07-17 21:41:53 -05:00
scrawl
a33ca75742
Pass AnimPriority by const reference
2015-07-18 03:23:41 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
scrawl
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127
fixed comment, save settings to member variable, removed usless include, changed variable to const
2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16
removed setCrosshairOwned from windowmanager
2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d
use correct mechanics manager
2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf
crosshair owned - settings option
2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93
change collor of crosshair
2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01
disable cusor when item/container is owned
2015-07-17 16:32:35 +02:00
scrawl
91d71d0fcd
Disable MyGUI's scrollbar autorepeat ( Fixes #2779 )
...
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
2015-07-17 03:39:09 +02:00
scrawl
660e7f5d89
Don't update animation states in skipAnim mode ( Fixes #2782 )
2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2
Don't restart the jump animation when equipping a different weapon ( Fixes #2286 )
2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1
Fix enchantments casting more than once per button press, broken by a1432b0255
2015-07-16 19:56:09 +02:00
scrawl
f6f82d433c
Fix bug with loop key assignment
...
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.
This fixes incorrect playing of the jump animation, one aspect of Bug #2286 .
2015-07-16 19:55:05 +02:00
scrawl
f8d360190d
Remove an unneeded virtual
2015-07-15 19:10:09 +02:00
scrawl
992b770315
Don't set OnPcEquip for items that failed to equip ( Fixes #2776 )
2015-07-15 18:52:23 +02:00
Stanislav Bas
e8a9567be3
Move DELE handling to CellRef record
2015-07-15 19:39:01 +03:00
scrawl
17ada63fcb
Don't play turning animations on the upperbody when in first person mode ( Fixes #2287 )
2015-07-15 16:43:11 +02:00
scrawl
3656851750
Remove the now unused changeBlendMask
2015-07-15 16:43:11 +02:00
scrawl
83cceeee72
Use the extended animation priority for Block animations, allow starting attacks during a block animation ( Fixes #2761 )
2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c
Use the extended animation priority for Hit animations
2015-07-15 16:33:10 +02:00
scrawl
50db6ed396
Use the extended animation priority for weapon animations
2015-07-15 14:40:36 +02:00
scrawl
e93a578f23
Extend the animation priority system to one priority value per bone group / distinct blend mask
2015-07-15 14:18:31 +02:00
scrawl
335ef97cf5
Rename Animation::Group to Animation::BlendMask
...
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
2015-07-15 13:49:16 +02:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
scrawl
dca4704b4b
Print exceptions in CharacterCreation::spawnDialog
2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a
Select the current resolution in resolution list on game start ( Fixes #2768 )
2015-07-13 18:00:41 +02:00
Stanislav Bas
c8c79dc1ef
Move ID loading into a separate method for Dialogue and DialInfo records
2015-07-13 11:26:23 +03:00
Marc Zinnschlag
d22f8703e5
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-13 09:09:01 +02:00
Stanislav Bas
c266315a35
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
2015-07-12 15:20:22 +03:00
Stanislav Bas
2ed182b144
Update to upstream/master. Resolve merge conflicts in MWWorld::Store
2015-07-12 12:01:18 +03:00
dteviot
ddeabcdfbe
Removed unused field that was giving compiler warning.
2015-07-12 17:15:41 +12:00
dteviot
e294cd95cd
extracted function playIdleDialogueRandomly()
2015-07-12 17:15:14 +12:00
dteviot
22059d68f6
Remove duplicated code.
2015-07-12 17:14:48 +12:00
dteviot
0b089a5564
extracted function evadeObstacles()
2015-07-12 16:38:36 +12:00
dteviot
1ef78b1e56
extracted playGreetingIfPlayerGetsTooClose()
2015-07-12 16:37:31 +12:00
dteviot
df421fce92
extracted function setPathToAnAllowedNode()
2015-07-12 16:35:15 +12:00
dteviot
b508846a64
Renamed mStoredAvailableNodes to mPopulateAvailableNodes.
...
Don't call getAllowedNodes() needlessly.
2015-07-12 16:32:48 +12:00
Stanislav Bas
e0983c815c
Some fixes for ESM Dialogues and Infos
2015-07-11 22:17:53 +03:00
Marc Zinnschlag
dacb93c57f
Merge remote-tracking branch 'scrawl/coverity_scan'
2015-07-11 11:53:43 +02:00
scrawl
24ae1d5ace
Fix some issues found by coverity
2015-07-11 03:34:08 +02:00
scrawl
667c80fb2a
Add brackets around a correct expression to fix coverity warning
2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993
Fix code that I forgot to uncomment (thanks coverity)
2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
12f413ba9b
Don't instantiate specialized templates
...
This fixes the VS2012 build issue
2015-07-10 20:21:55 +02:00
Marc Zinnschlag
ba9a9d16bb
Merge remote-tracking branch 'scrawl/master'
2015-07-10 09:06:04 +02:00
Marc Zinnschlag
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
2015-07-10 08:58:53 +02:00
scrawl
f12619b86a
Implement fStromWindSpeed ( Fixes #2764 )
2015-07-10 02:34:00 +02:00
Stanislav Bas
20723581a1
Letter case fix for MWWorld::Globals
2015-07-10 00:29:43 +03:00
Stanislav Bas
00bf87b561
Convert IDs of loaded records to lower case in MWWorld::Store
2015-07-10 00:29:41 +03:00
Stanislav Bas
897a52cdda
Remove NAME handling from MWWorld::Globals
2015-07-10 00:29:40 +03:00
Stanislav Bas
9301bc148e
Remove NAME handling from MWWorld::ESMStore
2015-07-10 00:29:38 +03:00
Stanislav Bas
89e44c8f1f
Remove explicit record ID in load/read methods of MWWorld::Store
2015-07-10 00:29:36 +03:00
Alexander "Ace" Olofsson
b3b55a5842
Explicitly instantiate MWWorld::Store
2015-07-09 19:22:04 +02:00
Alexander "Ace" Olofsson
b1cc74dd9a
Explicity instantiate MWMechanics::Stat
2015-07-09 14:41:37 +02:00
dteviot
f1774ee7c3
Fixed compile failing on OSX and Linux.
2015-07-08 19:34:33 +12:00
dteviot
52cf8541f5
End point tolerance restored to 64 units.
...
Corrected problem pointed out by Scrawl.
Destination needs tolerance of 64 to avoid overcrowding.
2015-07-08 18:41:03 +12:00
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
2015-07-07 19:19:37 +02:00
dteviot
40a925ad37
Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726
2015-07-07 18:16:15 +12:00
Marc Zinnschlag
e89614a35d
Merge remote-tracking branch 'origin/master'
2015-07-06 13:10:04 +02:00
Marc Zinnschlag
88f1220a77
Merge remote-tracking branch 'dteviot/Bug2726'
2015-07-06 13:07:40 +02:00
scrawl
49c07de773
Merge pull request #643 from ace13/win-build-fix
...
Fix build error and a pair of warnings
2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson
aaaee74a4d
Fix the comments
2015-07-05 21:56:04 +02:00
scrawl
531bca1273
Add a threshold for changing aicombat targets ( Fixes #2755 )
2015-07-05 18:09:13 +02:00
Marc Zinnschlag
432384d280
Merge remote-tracking branch 'scrawl/aicombat'
2015-07-05 14:47:20 +02:00
dteviot
1239667cb4
AiWander uses points between PathGrid points ( Fixes #1317 )
...
When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.
2015-07-05 18:21:35 +12:00
dteviot
eb2aa965b9
Extracted function SetCurrentNodeToClosestAllowedNode()
2015-07-05 18:17:18 +12:00
dteviot
76f20b8b20
fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning.
2015-07-05 18:10:02 +12:00
dteviot
0095737c40
Use correct type of variable. Remove unnecessary casts.
2015-07-05 18:09:14 +12:00
dteviot
f942db2b27
Simplified code.
2015-07-05 18:08:09 +12:00
dteviot
9a02a85a24
Pulled duplicate code into function.
2015-07-05 18:07:14 +12:00
scrawl
c90841d649
Fix head tracking for NPCs
2015-07-04 21:00:01 +02:00
mrcheko
c773ed9f9a
move checkWayIsClear to pathfinding; move shortcut logic to separate func (AiPackage::shortcutPath); rework AiPackage::pathTo
2015-07-04 18:00:16 +03:00
dteviot
fae93e3d82
Bugfix: was not resetting mStuckCount.
2015-07-04 19:00:27 +12:00
dteviot
46a654286b
Remove fix for #1317
...
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
2015-07-04 18:57:56 +12:00
dteviot
164994f3d3
Made PathFinder::buildPath() private.
...
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
2015-07-04 18:47:26 +12:00
scrawl
6bcea21e14
Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876 )
2015-07-04 05:19:05 +02:00
scrawl
a7bd050928
Accurate attack timings in AiCombat
2015-07-03 05:58:12 +02:00
scrawl
741e5db862
Fix for non-bipedal creatures that use weapons, e.g. rieklings
2015-07-03 05:37:18 +02:00
scrawl
82740c1645
Remove completely broken code
2015-07-03 02:29:42 +02:00
scrawl
d07b176b36
Take into account hit recovery, knockdown and other animations for AiCombat attack timing
2015-07-03 02:18:35 +02:00
scrawl
520a832a9a
Remove an already resolved todo comment
2015-07-02 22:24:23 +02:00
scrawl
6724585777
Light magic effect
...
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364 )
2015-07-02 20:46:34 +02:00
scrawl
bf9c62fa42
Fix for some coverity scan defects
2015-07-02 20:46:34 +02:00
scrawl
dcb8fbc69c
Accurate handling of fog depth/density ( Fixes #2752 )
2015-07-02 20:46:34 +02:00
scrawl
6691891bee
Include cleanup
2015-07-02 19:16:44 +02:00
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
2015-07-02 19:14:28 +02:00
scrawl
519fb9482a
Minor cleanup
2015-07-02 18:45:11 +02:00
Alexander "Ace" Olofsson
5d24091364
Fix build error and a pair of warnings
...
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
2015-07-01 15:06:38 +02:00
scrawl
20d03c7e39
Refuse loading save games of unknown format
2015-06-30 17:41:44 +02:00
scrawl
a081d402c5
Use the format field instead of version field
2015-06-30 17:26:33 +02:00
scrawl
4637750601
Savegame loading optimization
2015-06-30 16:47:41 +02:00
scrawl
4eaaa5e855
Increment save file version and mark it as used, will be used in next commit
2015-06-30 16:47:40 +02:00
scrawl
ca21e9ecb1
Fix magic hit VFX showing when casting on a static object
2015-06-30 03:14:49 +02:00
scrawl
4b2391c60f
Ignore effect meshes in getScreenBounds
2015-06-30 02:51:32 +02:00
scrawl
d5a47cfafe
Include cleanup
2015-06-30 01:41:03 +02:00
scrawl
017c9f7ac9
Fading for weather particle effects
2015-06-29 20:19:46 +02:00
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
2015-06-28 05:53:03 +02:00
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
2015-06-28 00:38:39 +02:00
scrawl
59db9664ba
Pass the CharacterController to AiPackage::execute
2015-06-26 17:47:04 +02:00
scrawl
a44be148d8
Fix door collisions
2015-06-26 06:40:28 +02:00
scrawl
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
2015-06-26 05:15:07 +02:00
scrawl
beb1086260
Fix attackStrength being unset for creatures with no weapons
2015-06-26 04:21:10 +02:00
scrawl
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
2015-06-26 02:32:41 +02:00
scrawl
4ef6aa6b7f
Fix weather particles disappearing
2015-06-26 02:30:39 +02:00
scrawl
ea0339d471
Make the string argument to BetaComment optional
2015-06-25 21:45:59 +02:00
scrawl
8a3889a81e
Rain fading
2015-06-25 17:38:12 +02:00
scrawl
3a21f05f6e
Rain effect
2015-06-25 17:23:01 +02:00
scrawl
6f34a0501a
Attempting to make a potion with no effects removes the ingredients ( Fixes #2722 )
2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722 )
2015-06-24 05:17:45 +02:00
scrawl
d7695f2560
Remove unused NpcAnimation visibilityFlags
2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55
Move HeadAnimationTime to the implementation file
2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13
Move head tracking from NpcAnimation to Animation (Bug #2720 )
2015-06-22 21:06:27 +02:00
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
2015-06-22 20:09:02 +02:00
Marc Zinnschlag
83961e9109
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-22 15:20:58 +02:00
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
2015-06-21 18:45:49 +02:00
scrawl
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
dteviot
c65e7a31e7
Aquatic creatures no longer try to get onto land.
...
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
2015-06-21 16:23:40 +12:00
scrawl
ad6764fa6a
Fix bug #2715
2015-06-20 17:08:46 +02:00
scrawl
efad4efe19
Star fading (Bug #2693 )
2015-06-19 20:55:04 +02:00
scrawl
74260a9a44
Tweak moon sizes
2015-06-19 20:30:04 +02:00
scrawl
f5c50aa581
Disable FreezeOnCull for effect particles
2015-06-19 18:38:44 +02:00
scrawl
1ed4e33815
Fading for mooncircle texture
2015-06-19 18:19:52 +02:00
scrawl
38d90f47a6
Moon fading fix (Bug #2713 )
2015-06-19 18:15:23 +02:00
scrawl
2b53e5d965
Fix for explosion effects playing when the game is paused
2015-06-19 03:32:48 +02:00
scrawl
e0dfc1425e
Correct moon blending
2015-06-19 02:51:01 +02:00
scrawl
0c4ebee6b3
Cloud opacity & cross-fading
2015-06-19 01:03:12 +02:00
scrawl
fb94395628
Fix atmosphere lighting
2015-06-18 23:15:13 +02:00
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-06-18 15:00:21 +02:00
scrawl
04010b8a1a
Set OnPcHitMe even for missed hits
2015-06-18 15:00:04 +02:00
scrawl
fabc5126f3
Include cleanup
2015-06-18 00:30:51 +02:00
scrawl
0ffa1f964b
Fix water ripple height
2015-06-17 22:49:20 +02:00
scrawl
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
2015-06-17 20:49:01 +02:00
scrawl
3ebfb4e0d9
Ignore particle systems in getScreenBounds
2015-06-17 18:22:31 +02:00
scrawl
b543308e3e
Remove an already resolved todo comment
2015-06-17 18:16:05 +02:00
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-17 15:56:01 +02:00
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
2015-06-17 15:13:41 +02:00
scrawl
7b35882814
RemoveParticlesVisitor fix
2015-06-17 15:13:17 +02:00
scrawl
1c151f2f0a
Re-enable some outcommented sky code
2015-06-16 20:56:48 +02:00
scrawl
3da8f6e62e
Water ripples
2015-06-16 20:36:48 +02:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
scrawl
b73947033d
Rotate sky meshes
2015-06-16 16:33:31 +02:00
scrawl
2d072aab2d
Broken bone references from .kf files are no longer a fatal error (Bug #2687 )
2015-06-15 22:42:14 +02:00
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
07937c741a
Improve exception handling when starting a new game from the main menu
2015-06-15 16:19:05 +02:00
scrawl
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
2015-06-14 23:56:35 +02:00
scrawl
f017fd6860
Reduce includes in animation.hpp
2015-06-14 23:13:26 +02:00
scrawl
b90fc8ad92
Fix for various Viewer::frame calls resetting the simulationTime
2015-06-14 18:19:53 +02:00
scrawl
9fc2c2e8ee
Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677 )
2015-06-14 16:32:34 +02:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +02:00
scrawl
2476cd4f9a
Error message fix
2015-06-14 16:12:18 +02:00
scrawl
195e1a8410
Fix the Viewer's FrameStamp not being set correctly during Engine::frame
2015-06-14 15:28:22 +02:00
Marc Zinnschlag
0994893bc5
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-14 12:05:53 +02:00
dteviot
520fbd63c4
simplified pathfinding code.
...
remove mIsPathConstructed. Instead call !mPath.empty().
2015-06-14 15:14:02 +12:00
scrawl
28caeadef4
Improve error message for not found records
2015-06-14 02:31:00 +02:00
dteviot
bfff84ba8f
replaced #include with forward class declaration, as suggested by slaugherfish.
2015-06-14 10:30:55 +12:00
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
2015-06-13 21:11:24 +02:00
scrawl
d4c45efb2b
Remove useless #undef's for windows now that we have NOMINMAX flag
2015-06-12 04:39:44 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
7407bbdac9
Add a function for SDL error handling
2015-06-12 01:08:58 +02:00
scrawl
800bd511f6
Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649 )
2015-06-12 00:12:12 +02:00
scrawl
76bdf7a5b7
Add night-eye effect
2015-06-11 23:16:05 +02:00
scrawl
712cef36b0
Minor cleanup
2015-06-11 18:01:00 +02:00
scrawl
f81c3bcd6d
Fix for broken InitWorldSpaceParticles on projectile effects
2015-06-11 16:40:26 +02:00
scrawl
c94c87d409
Attach effects to the insert node instead of the object root (Bug #2654 )
2015-06-11 16:22:09 +02:00
scrawl
c7493eb45c
Fix bug with invisibility effect for meshes w/ vertex colors
2015-06-11 16:14:51 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
2015-06-11 18:28:31 +12:00
scrawl
15453e3d90
Use MyGUI::UString for unicode conversion
2015-06-10 16:59:35 +02:00
scrawl
f511cb08ff
Compatibility with bullet versions < 2.81
2015-06-08 21:03:04 +02:00
scrawl
0330d3d61e
Restore the "transparent" loading screen
2015-06-07 21:21:57 +02:00
scrawl
f3cbe7b9da
Hide FPS widget since it currently doesn't work, use F3 instead
2015-06-07 19:38:59 +02:00
scrawl
bf02c7f6e4
Sun visibility fix
2015-06-07 19:28:12 +02:00
scrawl
508c57d6e2
addEffect crash fix for objects with no model
2015-06-07 17:09:37 +02:00
scrawl
16e080e252
Fix the physics debug drawer lagging a frame behind
2015-06-07 17:00:00 +02:00
scrawl
b33fe8fb62
Fix the inventory listener bug
2015-06-07 16:50:34 +02:00
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
2015-06-07 15:23:54 +02:00
scrawl
0a411cbd7c
Enable particle lighting
2015-06-07 04:41:55 +02:00
Stanislav Bas
49512a2b57
Correct the explanation for the Console::acceptCommand()
2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba
Add the explanation to Console::acceptCommand()
2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f
Reset Console editbox before command execution
2015-06-05 22:00:02 +03:00
scrawl
4c09ecef72
Normalize fixes
2015-06-05 03:41:10 +02:00
scrawl
1fd48e6f81
Fix not being able to move during ashstorm
2015-06-05 03:36:18 +02:00
scrawl
700000cbca
Error handling fix
2015-06-05 02:57:50 +02:00
scrawl
403ce30a35
Graceful handling for failing to create SDL window
2015-06-05 02:53:10 +02:00
scrawl
ddfed35d1c
Object placement raycasts should use the rendering meshes
2015-06-05 02:26:16 +02:00
Stanislav Bas
c40987338d
Scrollbars don't save their positions between openings
2015-06-04 23:09:40 +03:00
scrawl
a0b0ae9bd1
Remove an unused variable
2015-06-04 21:51:24 +02:00
scrawl
30ab15e605
Fix -Wunused-private-field clang warnings
2015-06-04 20:42:05 +02:00
scrawl
e23775e338
Fix -Woverloaded-virtual clang warnings
2015-06-04 20:31:28 +02:00
scrawl
141e9d36a4
Get rid of unused DialogueManager::mScriptVerbose
2015-06-04 20:12:39 +02:00
scrawl
78ac37b52a
Remove BOOST_STATIC_ASSERT to fix clang warnings
2015-06-04 20:11:40 +02:00
scrawl
93656aa6cf
Add a header missing from CMakeLists
2015-06-04 20:10:07 +02:00
scrawl
869f8a329a
Cloud scrolling fix
2015-06-04 20:08:44 +02:00
scrawl
ce0d93caed
Fix for "GlobalMap trying to erase an inactive camera" spam in main menu
2015-06-04 16:32:21 +02:00
scrawl
91eea1258c
doc.hpp fix
2015-06-04 01:30:16 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
b70383d127
Remove last remains of Ogre math
2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0
Remove dependency on Ogre::StringConverter
2015-06-03 19:59:54 +02:00
scrawl
cc6d5a3ba0
Fix player setup bug
2015-06-03 19:44:21 +02:00
scrawl
7bacb9418d
Various math code ported to osg
2015-06-03 19:41:19 +02:00
scrawl
0cc9b1bb40
Remove dependency on OgrePlatform.h
2015-06-03 18:49:52 +02:00
scrawl
e642f20a65
Restore screenshot key functionality
2015-06-03 17:25:18 +02:00
scrawl
2a85a22dba
Write savegame screenshot
2015-06-03 16:40:16 +02:00
scrawl
24551c7bab
Fix for savegame incompatibility with master branch
2015-06-03 14:56:57 +02:00
scrawl
41cce5240f
Delete remaining files that won't be of any use
2015-06-03 03:29:21 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3
Unify raycasting techniques for "on touch" magic
...
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
2015-06-03 03:16:26 +02:00
scrawl
cee1db532f
Improve area orb positioning for "on touch" spells
2015-06-03 03:04:39 +02:00
scrawl
2883ecc19a
Fix the hilarious bug of NPCs falling to their deaths in interiors
2015-06-03 02:48:45 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
58ebf57154
Apply a comment that got lost in the endless depths of my git stash
2015-06-02 17:13:30 +02:00
scrawl
8c50f8ed26
Fix for lights with no mesh
2015-06-02 17:06:55 +02:00
scrawl
5a7f2a4f1f
Restore light attenuation settings
2015-06-02 17:02:56 +02:00
scrawl
01944c33f5
Basic water rendering
2015-06-02 16:35:35 +02:00
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
2015-06-01 23:49:40 +03:00
scrawl
de8e5f0db1
Restore projectiles
2015-06-01 21:41:13 +02:00
scrawl
c85764b654
Wireframe mode
2015-06-01 17:02:44 +02:00
scrawl
7f9f9a32d2
InitWorldSpaceParticles fix
2015-06-01 16:29:42 +02:00
scrawl
987918ca15
NpcAnimation::setAlpha
2015-06-01 16:18:57 +02:00
scrawl
bed31996c9
Camera raycast
2015-06-01 15:34:46 +02:00
scrawl
2869424847
Fix first person camera for beast races
2015-06-01 04:41:03 +02:00
scrawl
f88079fddd
Restore the isOnGround hack
2015-06-01 02:40:42 +02:00
scrawl
ccd95419e5
Restore various raycasting
2015-06-01 01:57:15 +02:00
scrawl
8e0a988289
Icon fix
2015-06-01 01:32:02 +02:00
scrawl
e306853570
Fix chargen crash
2015-06-01 00:50:55 +02:00
scrawl
84fd682e4e
Fix for unnecessary exceptions when opening sounds
...
This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.
2015-06-01 00:41:44 +02:00
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
2015-06-01 01:14:11 +03:00
scrawl
5b846ebc71
Camera precision fix
2015-05-31 23:09:37 +02:00
scrawl
ed4863ad7d
Restore ranged weapon aiming
2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b
Restore head tracking
2015-05-31 18:04:14 +02:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
60f55997fd
Rotate first person meshes, sneak camera offset in first person
2015-05-31 02:26:58 +02:00
scrawl
a066b24303
Restore WeaponAnimation
2015-05-31 01:07:43 +02:00
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
2015-05-30 17:20:49 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
scrawl
988a9cad58
getHitContact Head exception fix
2015-05-30 01:41:38 +02:00
scrawl
cc3bfe2bb2
Restore collision tracker
2015-05-30 01:32:00 +02:00
scrawl
b2fe21dd3b
Minor cleanup
2015-05-30 01:11:00 +02:00
scrawl
fd50be0fb8
Restore various gameplay
2015-05-30 01:00:24 +02:00
scrawl
5c7ecb9c1d
string::compare exception fix
2015-05-29 23:38:31 +02:00
scrawl
af2f26d04d
Particle fixes
2015-05-29 20:45:27 +02:00
scrawl
7e715decd3
Color fix
2015-05-29 02:26:58 +02:00
scrawl
6d3528af70
Port global map exploration
2015-05-29 01:49:52 +02:00
scrawl
7a1408cfed
Restore display of global map overlay, no exploration yet
2015-05-28 18:49:24 +02:00
scrawl
72d0a69132
Fix global map markers not being cleared on a new game
2015-05-28 18:44:34 +02:00
scrawl
9ee63dc3f4
Change stats viewer key to f3
2015-05-28 16:28:48 +02:00
scrawl
5f7a82e0da
Fog of war fix
2015-05-28 16:20:29 +02:00
scrawl
f4ee805e3b
Object animation fix
2015-05-28 15:44:58 +02:00
scrawl
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
2015-05-28 03:50:49 +02:00
scrawl
5628a2b823
Camera zoom fix
2015-05-28 03:47:53 +02:00
scrawl
8b3054aa8b
Fix for player collision cleanup issue
2015-05-28 02:45:38 +02:00
scrawl
6555ee8d80
Minor include cleanup
2015-05-28 02:37:35 +02:00
scrawl
025a1a7866
Restore savegame screenshot display
2015-05-28 02:34:38 +02:00
scrawl
1f00174c02
Use a btCollisionWorld instead of btDiscreteDynamicsWorld
...
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
2015-05-27 23:09:38 +02:00
scrawl
fe439e53ff
Bullet include cleanup
2015-05-27 22:32:11 +02:00
Marc Zinnschlag
b6878c2e0c
improved error handling in LocalScripts::add
2015-05-27 19:45:26 +02:00
scrawl
2f97649540
Fix for cleanup issue when exiting after a failed savegame load ( Fixes #2580 )
2015-05-27 00:30:39 +02:00
scrawl
723beb1cac
Move IncrementalCompileOperation to SceneManager
2015-05-26 20:20:18 +02:00
scrawl
099f93f00d
Sky fixes
2015-05-26 18:22:21 +02:00
scrawl
c4951d1e73
Map rotation fix
2015-05-26 18:10:31 +02:00
scrawl
3dcb167066
Map rendering
2015-05-26 16:40:44 +02:00
scrawl
76dd3e4034
Fix lip animation regression
2015-05-24 04:40:09 +02:00
scrawl
1fd9fba7a3
Fix debug drawer crash
2015-05-24 04:28:34 +02:00
scrawl
95465a1489
Player raycast fix
2015-05-24 04:01:36 +02:00
scrawl
d84990be85
Restore getCollisions
2015-05-24 03:59:22 +02:00
scrawl
8b322fcd06
Implement getFacedObject using osgUtil::IntersectionVisitor
2015-05-24 03:36:34 +02:00
scrawl
c2131e7c31
Make near clip distance configurable
2015-05-24 02:34:20 +02:00
scrawl
9a0db5d55a
Restore cell changes
2015-05-24 01:32:00 +02:00
scrawl
152d690a7a
Minor cleanup
2015-05-23 23:10:53 +02:00
scrawl
da24e298ee
Fix -Wreorder warnings
2015-05-23 22:44:00 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
scrawl
0de6839890
Minor cleanup
2015-05-23 06:07:11 +02:00
scrawl
0b042b75cc
Restore actor visibility mask
2015-05-23 05:42:37 +02:00
scrawl
04e827ecf6
Don't try to play an empty video
2015-05-23 05:42:21 +02:00
scrawl
cd81ec92db
Minor cleanup
2015-05-23 05:41:53 +02:00
scrawl
8092f37ce5
New game crash fix
2015-05-23 05:40:24 +02:00
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
85345e663a
Restore getHitContact
2015-05-22 04:36:33 +02:00
scrawl
627fee07bc
Minor cleanup
2015-05-22 04:36:33 +02:00
scrawl
cac7c1e535
Restore various physics features
2015-05-22 04:36:33 +02:00
scrawl
d6da5c8007
Fix for crosshair not showing
2015-05-22 04:36:33 +02:00
scrawl
5ea61af6ac
Fix for applying view distance
2015-05-22 04:36:33 +02:00
scrawl
2235d2978b
Restore animation text key handling
2015-05-22 04:36:33 +02:00
scrawl
9b8e2e9db3
Port MWRender::Camera
2015-05-22 00:29:27 +02:00
scrawl
0fb97bd2e7
Readded baseonly parameter to Animation::setObjectRoot
...
Fixes the first person view.
2015-05-21 23:24:22 +02:00
scrawl
6031db7882
Character sliding fix
2015-05-21 21:04:48 +02:00
scrawl
cfe57199d7
Minor cleanup
2015-05-20 04:09:21 +02:00
scrawl
c4452afd89
Inventory item picking
2015-05-20 04:09:21 +02:00
scrawl
72c1f37527
Port CharacterPreview
2015-05-20 02:18:20 +02:00
scrawl
820f4a2688
Fix light direction
2015-05-20 02:07:18 +02:00
Stanislav Bas
163c12d3eb
Merge remote-tracking branch 'upstream/master'
2015-05-19 21:39:48 +03:00
Stanislav Bas
196be7283d
Reset an activated reference after activation's exectution ( Fix #1738 )
2015-05-19 21:39:17 +03:00
scrawl
8bcfac1ea3
Fix adjustPosition not always working correctly ( Fixes #2563 )
...
moveObject was returning an incorrect Ptr for cell movements.
2015-05-17 18:16:42 +02:00
scrawl
75ace9f8b5
Global map base layer
2015-05-16 14:48:20 +02:00
scrawl
1b41f6c4c5
Sleep interruption fix
2015-05-16 12:29:26 +02:00
scrawl
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
2015-05-15 23:21:29 +02:00
scrawl
737c2114dc
Change viewer stats keybinding to F9
2015-05-15 19:43:48 +02:00
scrawl
b7fa645530
Don't destroy a NULL window
2015-05-15 19:34:18 +02:00
scrawl
49df07ea7f
Implement UI scaling factor
2015-05-15 00:41:21 +02:00
scrawl
842ff4d874
Catch exception for not found videos
2015-05-15 00:23:31 +02:00
scrawl
24bb2e152c
Apply texture filter setting changes
2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6
Apply video mode & gamma setting changes
2015-05-14 20:31:16 +02:00
scrawl
3e86dd7df0
Apply runtime changes to field of view & view distance
2015-05-14 18:46:28 +02:00
scrawl
b7258c8d23
Readded Objects::updatePtr
2015-05-14 17:34:55 +02:00
scrawl
bc237ee1fe
Actor placement fix
2015-05-14 17:14:49 +02:00
scrawl
4ad0b83aa5
Eliminate string lookups in AnimationTime
2015-05-14 16:33:41 +02:00
scrawl
e3b1707bbd
Pause simulationTime when the GUI is up
2015-05-14 02:26:19 +02:00
scrawl
a18663c8b3
Improve MyGUI texture updates
2015-05-14 01:26:10 +02:00
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
2015-05-13 18:56:14 +02:00
scrawl
39fb46601a
Readded input & event handling
2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef
Create the GraphicsWindowSDL2 directly
2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0
Readded window icon
2015-05-13 15:03:21 +02:00
scrawl
36e0cfbc9d
Cleanup
2015-05-13 03:36:20 +02:00
scrawl
375b736e74
Use SDL to create the window
...
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.
Thanks to KittyCat for the GraphicsWindowSDL2 code.
2015-05-13 02:53:09 +02:00
scrawl
7a3bc69df7
Readded sound listener
2015-05-12 19:02:56 +02:00
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
2015-05-12 17:40:42 +02:00
scrawl
56ff280230
Mention the RefId in "error during rendering: " errors
2015-05-12 16:50:43 +02:00
scrawl
4036978718
Empty model exception fix
2015-05-12 16:50:31 +02:00
scrawl
e8ec4387d6
Creature collision fix
2015-05-12 16:50:11 +02:00
scrawl
2bc95df265
Actor collision object placement fix
2015-05-12 16:49:28 +02:00
scrawl
65f0195c71
Readded animated collision shape support
2015-05-12 16:26:11 +02:00
scrawl
19988d5e45
Remove RefData::getHandle
2015-05-12 04:04:54 +02:00
scrawl
47758c11cd
Readded collision objects and movement physics
2015-05-12 03:02:15 +02:00
scrawl
5abeab21ed
Various integer/floating point roll adjustments based on wiki
2015-05-11 16:55:09 +02:00
scrawl
58a2ad663c
Fix regression of sleep interruption chance
2015-05-11 16:38:16 +02:00
scrawl
97c35da441
Change exterior water level to z=-1 ( Fixes #1405 )
2015-05-11 16:38:16 +02:00
scrawl
c819180aa1
Minor cleanup
2015-05-11 16:38:16 +02:00
scrawl
9d86e5b028
GetSpellEffects returns true for active abilities ( Fixes #2530 )
2015-05-11 16:38:16 +02:00
scrawl
ac88326909
Exit out of choice when no responses are found ( Fixes #2525 )
2015-05-11 16:38:16 +02:00
scrawl
3b8b217888
Fix no punishment for stealing when taking an item with the inventory opened
2015-05-11 16:38:16 +02:00
scrawl
eef8f71797
Add a comment
2015-05-11 16:38:16 +02:00
scrawl
b312f50b1f
Fix regression with detect spells detecting deleted objects ( Fixes #2518 )
2015-05-11 16:38:15 +02:00
scrawl
033719ccd7
Correct the icon used for custom map markers
2015-05-11 16:38:15 +02:00
scrawl
ca53457a1c
Correct the map icons used for detect spells ( Fixes #2519 )
2015-05-11 16:38:15 +02:00
scrawl
54c1f19c18
Readded height fields
2015-05-10 02:08:25 +02:00
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
2015-05-10 01:09:00 +02:00
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
2015-05-10 00:28:51 +02:00
scrawl
48ffeab191
Remove old BulletShapeManager
2015-05-09 01:06:55 +02:00
scrawl
52a4456cf7
LoadingScreen update
2015-05-09 00:02:38 +02:00
scrawl
c8eb77c557
Move StatsHandler construction to allow profiling of loading screen
2015-05-08 16:22:42 +02:00
scrawl
5db0639983
IncrementalCompileOperation tweak
2015-05-08 16:20:40 +02:00
scrawl
cf0fc43004
GUI shutdown fix
2015-05-08 15:10:17 +02:00
scrawl
483dc9de45
Stop viewer threading before changing MyGUI textures
2015-05-07 23:17:47 +02:00
scrawl
00f4f78717
Give a name to video streams for logging purposes
2015-05-07 23:08:52 +02:00
scrawl
77f733362c
Add stats graphs for Script, Mechanics and Physics timings
2015-05-07 21:57:02 +02:00
scrawl
100d6e5fff
Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance
2015-05-05 02:38:59 +02:00
scrawl
e191f0e044
Rename MWRender::Debugging to MWRender::Pathgrid
2015-05-04 17:41:30 +02:00
scrawl
c1edc30ad7
Dead code removal
2015-05-04 03:29:12 +02:00
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
2015-05-04 02:41:50 +02:00
scrawl
f0789352c6
Silence error message
2015-05-04 00:34:30 +02:00
scrawl
5a759f8b0d
GUI cleanup fix
2015-05-03 18:35:29 +02:00
scrawl
9de575ad42
Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
...
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
2015-05-03 18:16:54 +02:00
scrawl
37e3118d21
FontLoader cleanup fix
2015-05-03 17:52:50 +02:00
scrawl
283b252142
Stub InputManager
2015-05-03 17:24:35 +02:00
scrawl
31ead3a9f4
Increase loading screen FPS
...
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
2015-05-03 17:04:21 +02:00
scrawl
351fd842fd
Port loading screen
2015-05-03 16:58:05 +02:00
Marc Zinnschlag
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
2015-05-03 09:54:32 +02:00
scrawl
92cbc13964
Remove BtOgre
2015-05-03 00:50:56 +02:00
scrawl
1943110170
Add bullet debug drawer
2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e
Pathgrid rendering
2015-05-02 22:45:39 +02:00
scrawl
1a5407af98
Reduce texture memory usage in OpenMW
2015-05-02 19:36:36 +02:00
scrawl
d772da3720
Main menu background videos
2015-05-02 18:15:00 +02:00
scrawl
dc9b27acfe
Create manual GUI textures
2015-05-02 18:06:54 +02:00
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
2015-05-02 17:48:24 +02:00
scrawl
bddd31e385
Dead code removal
2015-05-02 17:11:51 +02:00
scrawl
d9d84bd7b2
Remove bullet raycasting shapes, to be replaced with OSG ray casts
2015-05-01 21:43:21 +02:00
scrawl
82c4d01b37
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
scrawl
bd8f0248f0
Player rendering
2015-05-01 18:21:50 +02:00
scrawl
b0804734e5
Port VideoWidget
2015-05-01 03:03:44 +02:00
scrawl
223e3a53f5
Move OEngine::Gui::Layout to MWGui
2015-05-01 02:22:51 +02:00
scrawl
6afb0e43ef
Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69
2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7
Move MyGUI platform to components
2015-05-01 01:44:21 +02:00
scrawl
db7fe1952d
Move MyGUI texture to a separate file
2015-05-01 01:44:21 +02:00
scrawl
62847f0489
Use node masks to separate Scene and GUI
2015-05-01 01:44:21 +02:00
scrawl
c90125f936
Uninitialized basenode fix
2015-05-01 01:44:21 +02:00
scrawl
83c6ba97c0
Disable skinning updates for actors beyond the AI processing distance
2015-04-30 00:10:24 +02:00
k1ll
96d9afec38
More header case fixes
2015-04-29 18:31:30 +02:00
k1ll
a230050ec8
Boost tr1 unordered map does not work with mingw
2015-04-29 18:31:29 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
scrawl
48a6d7c1a0
Remove mygui platform libraries from cmake
2015-04-28 16:33:30 +02:00
scrawl
a27446c8fb
Remove unused headers
2015-04-28 16:02:29 +02:00
scrawl
8971a200f7
Sky fix
2015-04-26 14:34:14 +02:00
scrawl
7809caf9dc
Dead code removal
2015-04-25 15:53:11 +02:00
scrawl
0ff7b2ff11
MechanicsManager, frame update
2015-04-25 15:19:17 +02:00
scrawl
2db097f80e
Fix nested callbacks bug
2015-04-25 15:10:37 +02:00
scrawl
372a54bbc7
Dead code removal
2015-04-25 01:28:01 +02:00
scrawl
a3417a9c49
CharacterController compiles
2015-04-25 01:20:07 +02:00
scrawl
15164e20f7
Cleanup fix
2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c
Add mygui backend by chris
2015-04-24 21:55:30 +02:00
scrawl
9f12e53956
Scale NPCs by their Weight property ( Fixes #814 )
2015-04-24 14:49:20 +02:00
scrawl
1c0e3a6488
rotateObject, scaleObject
2015-04-23 23:50:46 +02:00
scrawl
6f3e920f85
Animation port complete
2015-04-23 23:30:06 +02:00
scrawl
86b4a610cb
Movement accumulation works
2015-04-23 22:46:07 +02:00
scrawl
09742d5b95
Animation playback works, no movement accumulation yet
2015-04-23 20:41:31 +02:00
scrawl
1a19cd3607
Some cleanup
2015-04-22 19:08:56 +02:00
scrawl
8c810e3620
Move rng to components
2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a
Dead code removal
2015-04-22 17:48:06 +02:00
scrawl
04accb7652
Add LightController
2015-04-22 17:37:39 +02:00
scrawl
e49b8fe690
Fix persuasion mechanics using player stats instead of NPC's ( Fixes #2475 )
2015-04-22 01:17:34 +02:00
scrawl
dfd8e08698
Dead code removal
2015-04-21 23:40:10 +02:00
scrawl
26766b8e0a
Dead code removal
2015-04-21 23:36:36 +02:00
scrawl
9e177df61b
Add fog, view distance, and far plane culling
2015-04-21 23:36:36 +02:00
scrawl
c53a56ed6e
clear stream errors before attempting the read
2015-04-21 16:10:11 +02:00
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b
Port video player
2015-04-19 20:07:18 +02:00
scrawl
68f93294da
Port EffectManager
2015-04-19 17:55:56 +02:00
scrawl
fcc7aa02ab
Port addExtraLight
2015-04-19 15:03:08 +02:00
scrawl
c924e64047
Port HeadAnimationTime
2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930
Port BoneOffset
2015-04-19 14:25:36 +02:00
scrawl
9c4b2ea61a
CreatureAnimation compiles
2015-04-19 03:05:47 +02:00
scrawl
27cfe8fb58
Crash fix
2015-04-19 02:39:10 +02:00
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
scrawl
edc5cad79e
Port Animation::addEffect
2015-04-19 01:57:52 +02:00
scrawl
083c41c950
Environment map for enchanted objects
2015-04-17 01:23:37 +02:00
scrawl
c334a76a6f
Fix skinning bug
2015-04-15 22:38:43 +02:00
scrawl
5b8c28f641
NpcAnimation compiles
2015-04-15 22:11:38 +02:00
scrawl
13a1ba0aab
Moon rendering
2015-04-15 18:50:50 +02:00
scrawl
c516e897ee
Move Controller base classes to SceneUtil, add visitor to assign ControllerSources
2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe
More efficient StateSetController, beginnings of sky rendering
2015-04-14 15:58:16 +02:00
scrawl
8c7c89a4aa
Port SoundManager
2015-04-13 22:48:37 +02:00
scrawl
246b06ca27
Forgot to add
2015-04-13 17:30:32 +02:00
scrawl
61aaf0cf70
Attach light lists to the object base nodes instead of each renderable
...
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
2015-04-12 18:03:36 +02:00
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
2015-04-12 15:38:30 +02:00
scrawl
642c1d2d36
Build fix
2015-04-10 15:31:19 +02:00
dteviot
0a5de33a1a
fireEquipmentChangedEvent() updates the InventoryWindow. ( Fixes #2424 )
2015-04-06 15:13:09 +12:00
dteviot
fe69dc2863
Made LineInfo a struct, as requested by Scrawl.
2015-04-05 14:56:29 +12:00
dteviot
52de622e97
provide incremental update of SpellWindow ( Fixes #2411 )
...
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d
removed redundant calls.
2015-04-03 13:45:13 +13:00
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
dteviot
be6ee927b9
AiWander, use closest two points if distance is too small ( Fixes #1317 )
...
In AiWander, if wander distance is set too small to get two points, take the closest two points.
2015-03-28 20:05:54 +13:00
scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
dteviot
63ab856024
Removed duplicated code.
2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6
Waypoint check only considers X & Y distance ( Fixes #2423 )
...
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
2015-03-23 20:09:46 +13:00
scrawl
5cb61fa01c
Don't mark gold as stolen, adjust stolen tooltip ( Fixes #2465 )
2015-03-22 17:28:27 +01:00
Marc Zinnschlag
47bac13749
Merge remote-tracking branch 'scrawl/master'
2015-03-18 12:07:40 +01:00
Marc Zinnschlag
c032113247
Merge remote-tracking branch 'sandstranger/release-jni-memory'
2015-03-17 11:41:41 +01:00
scrawl
d573458896
Fix case sensitivity bug in default head/hair selection ( Fixes #2453 )
2015-03-16 17:42:15 +01:00
sylar
db10c87b89
release jni memory
2015-03-16 18:21:38 +04:00
Marc Zinnschlag
545ca9c9b4
Merge remote-tracking branch 'sandstranger/fix-bad-code-in-command-line'
2015-03-16 08:42:22 +01:00
sylar
bd4e832cf3
fix memory leaks in emulating command line
2015-03-16 07:41:51 +04:00
Marc Zinnschlag
e6e02714a0
Merge remote-tracking branch 'sandstranger/command-line-support-for-Android'
2015-03-15 22:52:34 +01:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
sylar
a418b70937
command line support for Android
2015-03-15 21:15:58 +04:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Rohit Nirmal
2540a901d5
Remove unused variable.
2015-03-13 20:04:47 -05:00
cc9cii
4d46d7ba72
Fix some compiler warnings.
2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
767624f518
Combat mechanic fixes
2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3
Update hit chance according to wiki and implement fCombatInvisoMult
2015-03-12 02:47:16 +01:00
scrawl
f603a68144
Allow binding Hand To Hand in quick keys menu ( Fixes #2024 )
2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2
CharacterCreation refactoring
2015-03-12 00:43:28 +01:00
scrawl
d00c75d428
Remove more outdated TODO comments.
2015-03-12 00:37:28 +01:00
scrawl
3879ce6ac1
Get rid of "player" string checks ( Fixes #2216 )
2015-03-11 23:07:39 +01:00
scrawl
68de876051
Switch to weapon drawstate when creating a bound weapon ( Fixes #2387 )
2015-03-11 21:12:08 +01:00
scrawl
48ea6286fd
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
scrawl
457c135097
Remove old workaround
2015-03-09 03:15:11 +01:00
scrawl
36e1b6cc48
Support fatigue below zero for the Drain effect ( Fixes #2430 )
2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190
Adjust fix for maximum attribute damage limit
2015-03-09 03:15:11 +01:00
Ivy Foster
4f100e6870
Fix rapid toggling when holding sneak button.
2015-03-08 16:08:45 -05:00
Ivy Foster
ba7fc8609c
Add toggle sneak option; fix bug #2119
...
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.
Outstanding issues:
- In toggle sneak mode, holding the Sneak button causes
rapid, repeated toggling.
- The button in the settings menu doesn't do anything.
2015-03-08 15:23:46 -05:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
f19863b545
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 18:11:54 +13:00
dteviot
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
2015-03-08 13:22:56 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
scrawl
58807064b4
Revert "Fix reference cell movement leaving behind deleted Ptrs for script access"
...
This reverts commit 666248618e
2015-03-07 15:31:21 +01:00
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
dteviot
27f91a8326
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-06 19:47:46 +01:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
dteviot
80fe24207c
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
9f155df761
Merge remote-tracking branch 'maqifrnswa/bug2407' into openmw-35-1
2015-03-04 17:09:13 +01:00
Marc Zinnschlag
2e31f01585
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-04 16:55:46 +01:00
scrawl
cced508916
Remove unintended 1.5 factor for damage/restore magic effects
2015-03-04 01:49:00 +01:00
scrawl
8931ddf428
Remove unneeded casts
2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d
PositionCell/PlaceItemCell: add console message if cell doesn't exist
2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2
Merge remote-tracking branch 'scrawl/master' into openmw-35-1
2015-03-03 18:23:38 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
Marc Zinnschlag
3b8d709583
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01:00
scrawl
f09cbfb167
Add a comment
2015-03-02 23:29:33 +01:00
scrawl
666248618e
Fix reference cell movement leaving behind deleted Ptrs for script access
2015-03-02 23:20:59 +01:00
scrawl
8eb1f4e70e
Remove more log spam
2015-03-02 22:13:50 +01:00
scrawl
e3f1cb8305
Remove "loading cell" message
...
This spams the log too much, in particular when loading a savegame.
2015-03-02 21:12:21 +01:00
scrawl
653ddd3f25
Warning fix
2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
2015-03-02 20:01:31 +01:00
Scott Howard
53213bf236
if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407
2015-03-02 11:53:59 -05:00
scrawl
730138035d
Cycle infinite loop fix ( Fixes #2421 )
2015-03-02 17:25:26 +01:00
scrawl
191c0104f6
Crash fix for creatures with no skeleton base ( Fixes #2419 )
2015-03-02 15:19:57 +01:00
scrawl
a653716e2c
Fix for damage/restore effects using the instant apply path when they have a duration
2015-03-01 22:22:20 +01:00
scrawl
239c0071f5
Armor tooltip should show the effective armor rating
2015-03-01 19:40:38 +01:00
Marc Zinnschlag
185757da43
Merge remote-tracking branch 'dteviot/Bug2367'
2015-03-01 10:24:02 +01:00
dteviot
cdee6f41fc
fix: multi effect spell with different ranges ( Fixes #2285 )
...
Applies all effects for a spell with multiple effects, where not all effects have the same range.
2015-03-01 15:34:18 +13:00
dteviot
41e15e0c2d
Limit maximum attribute damage ( Fixes #2367 )
...
Maximum damage that an attribute can have = base + fortify.
2015-03-01 10:27:51 +13:00
scrawl
2f2a95f735
Fix crash for terrain without data, part 2
2015-02-28 19:33:49 +01:00
scrawl
f82751422d
Fix constant effect restore enchantments being applied incorrectly ( Fixes #2408 )
2015-02-28 16:31:22 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
Digmaster
84ff11d0ab
check if v2 exists before attemping to copy it
2015-02-27 22:21:33 +01:00
Digmaster
464bbe4d6f
if v2 doesn't exist, don't erroneously set keyboardUserExists to true.
2015-02-27 22:21:07 +01:00
Digmaster
5d77ebdc60
If v3 doesn't exist, copy from v2
2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c
uses v3 input bindings, not v2
2015-02-27 22:19:13 +01:00
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0
Fix activating every frame when action is bound to a trigger
2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
scrawl
2eedb3acec
Include fix
2015-02-27 20:22:43 +01:00
sylar
cda3782cf2
fix crash game on Android after start loading
2015-02-26 18:30:38 +04:00
sylar
1bb29f610f
enable mipmapping for Android again
2015-02-26 18:29:38 +04:00
Marc Zinnschlag
281e0042ab
Merge remote-tracking branch 'scrawl/master'
2015-02-26 13:23:15 +01:00
scrawl
e7989a197d
Add defaults for some required globals ( Fixes #2397 )
2015-02-25 20:35:11 +01:00
Jordan Ayers
659a8ba279
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash on confiscating items if a prison marker cannot be found.
2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash when finding the closest marker to an exterior position.
2015-02-24 20:51:57 -06:00
scrawl
24de6ba27e
Fix crash for LAND records without data
2015-02-24 21:42:40 +01:00
Marc Zinnschlag
da9bd09a8c
Merge remote-tracking branch 'miroslavr/master'
2015-02-23 20:53:44 +01:00
Marc Zinnschlag
9109162030
Merge remote-tracking branch 'scrawl/master'
2015-02-23 20:51:18 +01:00
scrawl
77bb77b367
Fix for instant restore effects ( Fixes #2392 )
2015-02-23 19:07:12 +01:00
MiroslavR
47c053444f
Make the jail progress last one second
2015-02-23 00:23:09 +01:00
Marc Zinnschlag
8e007c91fd
Merge remote-tracking branch 'jordan-ayers/bugfix/1533'
2015-02-22 21:58:01 +01:00
Marc Zinnschlag
07c27065d6
Merge remote-tracking branch 'slothlife/msvc-warning-fixes'
2015-02-22 21:34:46 +01:00
Jordan Ayers
5edafc2a4c
Cleanup: Add const to read-only CellRefList access.
...
OMW Bug #1533
2015-02-22 12:25:10 -06:00
Jordan Ayers
399259a95c
Improve CellStore exception messages.
2015-02-22 12:12:54 -06:00
Jordan Ayers
c21b59ecff
Teleportation: Avoid marking searched cells as changed.
...
OMW Bug #1533
Only mark cells with the target marker / evidence chest as 'changed'.
2015-02-21 17:55:05 -06:00
scrawl
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
2015-02-20 00:00:13 +01:00
scrawl
6d62aa7544
Don't prompt for spell deletion when using cycling keys ( Fixes #2382 )
2015-02-18 19:06:36 +01:00
Marc Zinnschlag
4c5bba2947
Merge remote-tracking branch 'dteviot/SpellCastingFixes'
2015-02-17 16:44:14 +01:00
Marc Zinnschlag
8686ffcedb
Merge remote-tracking branch 'scrawl/master'
2015-02-17 11:55:12 +01:00
dteviot
6e2d6a0282
Minor correction, MWWorld::getMaxActivationDistance() is now public.
2015-02-17 22:51:30 +13:00
dteviot
8d7de7d1ec
Telekinesis allows safe opening of traps ( Fixes #1916 )
...
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
2015-02-17 22:14:25 +13:00
cc9cii
efdee19477
Suppress warning about the lack of virtual destructor.
2015-02-16 16:41:53 +11:00
slothlife
a9b74671a6
Fix various MSVC warnings
2015-02-15 20:10:21 -06:00
Jordan Ayers
6d1aec6970
Confiscate stolen goods: Support Mournhold prisons.
...
OMW Bug #1533
2015-02-14 16:09:17 -06:00
Jordan Ayers
5ef78903dc
Teleportation: Support markers in Mournhold.
...
OMW Bug #1533
Note: the 'stolen goods' search is not yet correct for Mournhald.
2015-02-14 15:43:09 -06:00
scrawl
81925645a3
Unreachable enemies combat AI fix ( Fixes #2271 )
2015-02-14 16:51:54 +01:00
scrawl
37a85e31d6
Ripples fix
2015-02-14 16:51:47 +01:00
scrawl
93ffdb427c
Small tweak to ripples
2015-02-14 15:53:01 +01:00
scrawl
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01:00
Jordan Ayers
1d18d3ff4c
Add a full search to findInteriorPositionInWorldSpace.
...
Part of OMW Bug #1533
Implement a search for one of the 'nearest' exterior cells. In this
case, 'nearest' means the fewest number of cells away via door markers.
This causes the world map position to update immediately after teleporting,
unless the new cell has no connecting path to an exterior. Intervention
spells and Jail travel will be much closer to vanialla Morrowind,
except for in Mournhold.
2015-02-12 22:38:08 -06:00
scrawl
75db4d6473
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
2015-02-11 12:11:59 +01:00
scrawl
dfaab1188f
Fix for broken levelled creature spawning ( Fixes #2365 )
2015-02-11 12:10:46 +01:00
Marc Zinnschlag
2b619296d7
Merge remote-tracking branch 'scrawl/master'
2015-02-11 11:30:44 +01:00
scrawl
bf1839b370
Always print the exception to stderr
2015-02-10 22:01:57 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
Alexander "Ace" Olofsson
1a19253158
Fix MSVC build due to missing M_PI define
...
Apparently the header guard on cmath only adds the defines if _USE_MATH_DEFINES is defined when cmath is included for the first time.
So enabling that define and moving cmath up to be the first include, so that nothing else includes it without the define set.
2015-02-10 15:32:54 +01:00
scrawl
218f789d88
Fix player DrawState reset when selecting enchanted item ( Fixes #2356 )
2015-02-09 20:16:29 +01:00
scrawl
801c0eb57c
Detect Creature should detect alive creatures only ( Fixes #2353 )
2015-02-09 20:15:41 +01:00
scrawl
c27c20a859
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
files/materials/water.shader
2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe
Fix ripples for D3D - added simpler effect ( Fixes #1649 )
2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
2015-02-09 18:03:28 +01:00
Marc Zinnschlag
985f7cbff9
Merge remote-tracking branch 'miroslavr/master'
2015-02-09 17:58:57 +01:00
Alexander "Ace" Olofsson
fce404acc5
Remove some including of mwbase/world.hpp
...
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
2015-02-09 17:45:48 +01:00
Alexander "Ace" Olofsson
f2c5060cc0
Fix cstdint issue on travis GCC build
2015-02-09 16:37:20 +01:00
Alexander "Ace" Olofsson
d3128a12b6
Remove a large include form mwbase/windowmanager.hpp
2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
8c49812d56
Remove unneeded include in obstacle.hpp
2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de
Move manualref code out of header
2015-02-09 15:01:49 +01:00
Jordan Ayers
ec3487b669
Sun trajectory: handle mNightStart <= mSunriseTime
...
OMW Bug #781
Note: mNightStart == mSunriseTime is treated as 24-hour night.
2015-02-08 14:31:45 -06:00
scrawl
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c
Adjust fix for Bug #2360 to repair affected savegames
2015-02-08 21:26:58 +01:00
scrawl
b542143e3a
Fix faction reputation case sensitivity issue ( Fixes #2360 )
2015-02-08 21:04:01 +01:00
scrawl
ad8790fba0
Fix setWaterLevel script instruction not affecting physics
2015-02-08 15:50:40 +01:00
scrawl
01e32aef79
Fix exception moving a disabled object between cells
2015-02-08 14:34:31 +01:00
MiroslavR
2223a69ab8
Fix getpcinjail returning 0 when the console is open
2015-02-07 20:13:11 +01:00
Jordan Ayers
23024d2beb
Re-work the sun's trajectory.
...
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
2015-02-07 12:36:27 -06:00
MiroslavR
9bbe6f8c5e
Remove todo
2015-02-07 18:39:05 +01:00
MiroslavR
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
2015-02-07 18:38:41 +01:00
Jordan Ayers
2d17eaa5ea
Fix argument name for setSunDirection.
2015-02-06 22:26:58 -06:00
MiroslavR
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
2015-02-07 04:05:28 +01:00
Marc Zinnschlag
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
2015-02-06 09:23:45 +01:00
scrawl
01b4177872
Make sure birthsign spells are added when loading savegame
2015-02-06 01:27:17 +01:00
scrawl
9ce3e4b4e1
UI consistency fix in levelup dialog
2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8
Cap the displayed attribute multiplier in levelup to attribute points left to 100
2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78
Fix iLevelUpTotal not being used in the levelUp logic
2015-02-06 01:27:17 +01:00
scrawl
55cd9b526c
Skill progress bar changed to match MW
2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0
ESSImport: import player skill progress
2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e
Skill progress refactoring
2015-02-06 01:27:16 +01:00
scrawl
dd8aab2a7f
Adjust help for --load-savegame again
2015-02-06 01:27:16 +01:00
scrawl
356d1c7657
ESSImport: convert stolen item tracker
2015-02-06 01:27:16 +01:00
scrawl
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
2015-02-06 01:27:16 +01:00
scrawl
c1862cbfc2
Clarify documentation for --load-savegame
2015-02-05 04:18:43 +01:00
scrawl
8087a7d920
Add possibility to dress up corpses ( Fixes #2221 )
2015-02-05 04:18:43 +01:00
scrawl
aa6ebcd75c
Change stolen items handling to match MW ( Fixes #1443 , Fixes #2290 )
2015-02-05 04:18:43 +01:00
scrawl
955505c167
Remove unused function
2015-02-05 04:18:43 +01:00
scrawl
27dc49a135
Rewrite game settings manager
...
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
2015-02-05 04:18:42 +01:00
scrawl
6ea59c93ab
Ignore the object scale in Move instruction ( Fixes #2275 )
2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd
Normalise spelling of "levelled" throughout the code
2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
Jordan Ayers
1f036c0381
Patch for COC Spawn Issue.
...
OMW Bug #1079
Fall back to the first static's position, if there are no door markers.
2015-02-04 12:10:56 -06:00
scrawl
fbb8998184
Account for not yet listed cells in getInteriorPtrs
2015-02-04 16:41:14 +01:00
scrawl
14923f3e8b
Fix for broken unsetRefNum
2015-02-03 23:05:06 +01:00
MiroslavR
ee8f88fc42
Reset health modifier when actor dies ( Fixes #2330 )
2015-02-01 22:04:49 +01:00
Marc Zinnschlag
82ff737c31
Merge remote-tracking branch 'scrawl/master'
2015-02-01 12:10:28 +01:00
scrawl
7e33471edb
Fix code duplication
2015-01-31 22:40:43 +01:00
scrawl
c98b7db4c1
Fix swim height, use fSwimHeightScale GMST
2015-01-31 22:40:43 +01:00
scrawl
56799c79f4
Fix attachArrow exception when changing weapon ( Fixes #2332 )
2015-01-31 22:40:42 +01:00
scrawl
fec8cf91f5
Add exception handling to various uses of DataStream::read
2015-01-31 22:40:42 +01:00
scrawl
86165d38d2
Add exception handling in addObjectToScene
2015-01-31 22:40:42 +01:00
scrawl
73e57f53a8
Always print openmw version in the log
2015-01-31 22:40:42 +01:00
scrawl
cbe135c60f
Don't require magicka for casting spells in God Mode ( Fixes #2331 )
2015-01-31 22:40:42 +01:00
scrawl
7d76f1a113
PlaceAt count argument should spawn independent references ( Fixes #2283 )
2015-01-31 22:40:41 +01:00
scrawl
7542fb5cd9
Show map notes on door marker leading to the cell with the note ( Fixes #2284 )
2015-01-31 22:40:41 +01:00
scrawl
54e79c8c98
Use mouse pressed event for pin button instead of mouse click
2015-01-31 22:40:41 +01:00
scrawl
c093e284d9
Delegate cleanup
2015-01-31 22:40:41 +01:00
scrawl
bdcc3a4036
Add missing swish sound for thrown weapons
2015-01-31 22:40:40 +01:00
scrawl
326eaea8a6
Add missing sound for drawing throwing weapons ( Fixes #2308 )
2015-01-31 22:40:40 +01:00
scrawl
0497a40d09
Fix incorrect sound for thrown weapons
2015-01-31 22:40:40 +01:00
scrawl
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
2015-01-31 22:40:40 +01:00
scrawl
bd0a0e64a9
Fix overwriting script records not working
2015-01-31 22:40:40 +01:00
scrawl
d1b5956a98
Fix crash on exit
2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd
Remove friendly hits from the save file
...
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
2015-01-31 22:40:39 +01:00
scrawl
5a9b30a8ca
Don't show VFX on the map ( Fixes #2324 )
2015-01-31 22:40:38 +01:00
scrawl
417f60f467
Use the mooncircle textures ( Fixes #1624 , Fixes #1743 )
2015-01-31 22:40:38 +01:00
scrawl
dac1290597
Reduce size of water plane and increase subdivisions ( Fixes #969 )
2015-01-31 22:40:37 +01:00
Marc Zinnschlag
c02c72e134
Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set'
2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121
Dialogue: Use std::set for known topics in the manager.
...
There were three different data structures being used for topic lists
in this code. (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >. This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.
The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
2015-01-29 18:28:13 -06:00
scrawl
e712b0353b
Terrain refactoring, reduce game startup time and memory usage
2015-01-29 03:39:01 +01:00
scrawl
62a32220ff
Use low-LOD heightmap for world map rendering
...
Add vanilla-accurate colour palette (thanks Hrnchamd)
2015-01-29 03:39:01 +01:00
scrawl
c0a88161b2
Get rid of unneeded setSize/setCoord overrides
2015-01-29 03:38:59 +01:00
scrawl
f4c8064d39
Fix camera not being attached properly when player becomes vampire ( Fixes #2319 )
2015-01-28 19:14:57 +01:00
scrawl
9bcc84ceec
Add option to stretch menu backgrounds/cutscenes to the whole screen
2015-01-28 00:22:56 +01:00
scrawl
431f540791
ESSImport: fix NPC factions
2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b
Improve INFO struct naming
2015-01-27 23:12:21 +01:00
scrawl
4cbb79191f
Don't put duplicate lines in the console history
2015-01-27 23:12:20 +01:00
scrawl
6f41e0d12e
Reapply quest index when loading quest from savegame (Bug #2260 )
2015-01-27 23:12:20 +01:00
scrawl
f35c9b7a69
Clang warning fixes (thanks hemite)
2015-01-27 23:12:20 +01:00
scrawl
d34c8526f6
Enchanted arrows should not be added to victim ( Fixes #2306 )
2015-01-27 23:12:20 +01:00
scrawl
67491c7164
Fix leveled item argument issue ( Fixes #2302 )
2015-01-27 23:12:20 +01:00
scrawl
9d3f0b2ed5
Remove some unused code, include cleanup
2015-01-27 23:12:13 +01:00
scrawl
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
2015-01-27 23:05:19 +01:00
scrawl
697ab16ec5
Fix for coverity defects
2015-01-27 19:00:26 +01:00
Jordan Ayers
1410819e20
Dialog fix for line breaks in the middle of words.
...
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
2015-01-25 22:36:20 -06:00
scrawl
72f7c2e555
Move weather reset to clear() method
2015-01-24 16:45:36 +01:00
scrawl
b1bd236345
ESSImport: convert script local variables
...
Had to add special reading code to openmw, because the variable names are not stored.
2015-01-24 16:45:36 +01:00
scrawl
b0c2aec374
Add warning for missing body parts
2015-01-23 17:31:26 +01:00
scrawl
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
2015-01-23 16:45:47 +01:00
scrawl
a619cff615
Implement EnableLevelupMenu to trigger level-up
2015-01-23 15:34:47 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0
Fix wrong magic number for JOUR in openmw savegames
2015-01-23 15:34:47 +01:00
scrawl
378e91545d
Fix Tribunal/BM summon effects not working
2015-01-23 15:34:47 +01:00
scrawl
0fd5575efe
Improve warning message in ContainerStore::readState
2015-01-23 15:34:47 +01:00
scrawl
cc7be1600d
Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart
2015-01-23 15:34:14 +01:00
scrawl
69676906ae
Don't clear known spells when reading from the savegame
...
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74
Revert "Revert "Light charge handling fix""
...
This reverts commit b95748d044
2015-01-23 15:33:39 +01:00
scrawl
d13335ba40
Ensure the item can be equipped in the given slot when loading inventory
2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0
Revert "Change save format to store relative equipment index"
...
This reverts commit 89d9649b50
2015-01-23 02:32:43 +01:00
scrawl
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b
2015-01-23 02:32:38 +01:00
Marc Zinnschlag
cd62dbc5b7
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-21 15:12:04 +01:00
scrawl
5e0428243b
Light charge handling fix
2015-01-21 01:59:45 +01:00
scrawl
89d9649b50
Change save format to store relative equipment index
...
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +01:00
scrawl
eede2c8e55
ESSImport: convert breath meter and skill increases
2015-01-20 19:30:39 +01:00
Alexander "Ace" Olofsson
3a88f4ebd5
Fix windows build, MessageBox is a defined symbol
...
Windows and its stupid defines...
2015-01-20 17:07:26 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +01:00
scrawl
235683e449
Remove LightState from openmw save format to streamline inventory loading
2015-01-19 11:36:00 +01:00
scrawl
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
2015-01-19 09:29:21 +01:00
scrawl
14aacf9a72
Add comment
2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
scrawl
714b19015c
Fix unknown record error message
2015-01-15 20:31:08 +01:00
scrawl
fc6aa256bf
Add comment
2015-01-15 16:05:25 +01:00
scrawl
bf915d929a
Update idle voices according to research
2015-01-15 03:35:46 +01:00
scrawl
6b2df95167
Fix for some coverity defects
2015-01-15 02:03:27 +01:00
scrawl
edbac30a57
Change another dynamic_cast to static_cast (coverity)
2015-01-15 01:23:58 +01:00
scrawl
cef72385d4
Fix extreme frame drop when running into certain corners ( Fixes #2023 )
2015-01-15 00:58:12 +01:00
scrawl
52ed3d92a8
Fix btCompoundShape scaling ( Fixes #1683 )
2015-01-14 17:59:04 +01:00
scrawl
a3c861b7fa
Idle voice fix
2015-01-14 00:07:14 +01:00
scrawl
2ac4a74a34
Fix running AI for dead actors
2015-01-13 18:13:02 +01:00
scrawl
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
2015-01-13 17:19:39 +01:00
scrawl
3ce22d31d8
Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up
2015-01-13 05:37:44 +01:00
scrawl
fafc14d5a0
Add proper air movement mechanics ( Fixes #2077 )
2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
4ed3e7bbb7
Enchanting code cleanup
2015-01-12 23:29:58 +01:00
scrawl
bb718f216d
Initialize ENAMstruct in SpellCreationDialog (Coverity)
2015-01-12 23:29:58 +01:00
scrawl
08d8dd287c
I think this was committed by accident
2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
2015-01-12 23:29:58 +01:00
scrawl
cda2eea906
Enchanting: use fEnchantmentConstantDurationMult and fEffectCostMult
2015-01-12 23:29:58 +01:00
scrawl
871d59de6c
Reduce Idle voice chance ( Fixes #1964 )
2015-01-12 23:29:58 +01:00
scrawl
82eaa9f1bc
Fix loading crash (don't apply viewmode before player is set up) ( Fixes #2272 )
2015-01-12 23:29:39 +01:00
scrawl
c3f3f8b3d0
Use only Cell records for saving progress bar ( Fixes #2259 )
2015-01-11 18:01:06 +01:00
scrawl
0ec018f7f1
More accurate savegame loading progress bar, uses position in the file (Bug #2259 )
2015-01-11 17:54:15 +01:00
scrawl
1780bcc238
Print RefNum in BetaComment
2015-01-11 17:04:58 +01:00
scrawl
4d4f2fc475
Add maximum distance for teleporting followers on using a door
2015-01-11 17:04:58 +01:00
scrawl
b108fbe986
Remove incorrect implementation of fGreetDistanceReset
...
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
2015-01-11 17:04:58 +01:00
scrawl
716e14a37a
Print missing savegame dependencies on the console
2015-01-11 17:04:58 +01:00
Marc Zinnschlag
289a912817
Merge remote-tracking branch 'scrawl/master'
2015-01-11 12:24:51 +01:00
dteviot
458b82c308
Centralized "fish can't attack non-swimmer" logic.
2015-01-11 14:25:46 +13:00
dteviot
7aa0f887c0
Minor changes to ESM::RefNum
...
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
scrawl
f9227beedd
Add warning when loading a savegame that depends on non-existing content files ( Fixes #2261 )
2015-01-11 00:06:52 +01:00
scrawl
579f5d232f
Move interactive messageBox to separate function
2015-01-10 23:23:48 +01:00
scrawl
91571f51be
Ogre crash workaround ( Fixes #1745 )
2015-01-10 22:45:08 +01:00
Marc Zinnschlag
595c08817f
Merge remote-tracking branch 'scrawl/master'
2015-01-10 17:02:46 +01:00
scrawl
37bea9d4dc
Fix exception for empty dialog topics ( Fixes #2267 )
2015-01-10 15:06:30 +01:00
Marc Zinnschlag
e439065897
Merge remote-tracking branch 'scrawl/master'
2015-01-10 11:33:04 +01:00
scrawl
5b9d10f851
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
scrawl
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
2015-01-10 03:01:01 +01:00
scrawl
eecea4131f
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
scrawl
4b704f665f
Reduce includes, move DragAndDrop to separate file
2015-01-10 01:21:17 +01:00
scrawl
eb99ed697b
Reduce includes
2015-01-10 01:00:52 +01:00
scrawl
2ac23008f5
Remove an old workaround ( Fixes #2263 )
...
The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.
2015-01-10 00:07:55 +01:00
scrawl
dfdf26e95e
Add assertion to Store
2015-01-09 20:58:53 +01:00
scrawl
ce2cbab402
Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow)
2015-01-09 20:08:52 +01:00
Marc Zinnschlag
4e7f7baf8b
Merge remote-tracking branch 'dteviot/Bug2076'
2015-01-09 13:57:21 +01:00
dteviot
64cd1396ac
Fixed minor issues.
...
1. Renamed "hightRatio" to "heightRatio".
2. Replaced magic numbers with named constants.
2015-01-09 22:17:53 +13:00
dteviot
7fe2f86d06
Slaughter fish attacks when player only knee deep in water ( Fixes #2076 )
2015-01-09 21:40:53 +13:00
scrawl
65ab31eae6
Remove now redundant Store::setUp implementation
2015-01-09 04:31:02 +01:00
scrawl
ddd6e682bc
Dialogue: add conflict resolution for overlapping keywords ( Fixes #2245 )
2015-01-09 04:19:38 +01:00
scrawl
c77660ba20
Remove some nonsense code
2015-01-09 01:59:38 +01:00
scrawl
2ddbe22da3
Fix for NPC store clearDynamic bug
...
It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.
2015-01-09 01:59:32 +01:00
Marc Zinnschlag
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
2015-01-08 20:57:49 +01:00
scrawl
d31ae2b345
Fix mIds mapping for dynamic records being lost on save/reload
2015-01-08 16:27:13 +01:00
scrawl
928b9ee41b
Fix missing GUI mode update when showing soulgem dialog
2015-01-08 16:27:13 +01:00
scrawl
ef7e0070a6
Don't right-shift signed integers which is implementation-defined
2015-01-08 16:27:13 +01:00
Marc Zinnschlag
38a413a483
Merge remote-tracking branch 'scrawl/master'
2015-01-07 20:22:15 +01:00
scrawl
4684014a83
Use .omwsave extension for save game files
2015-01-07 15:06:39 +01:00
scrawl
13c5bd5cc2
Enchanting: fix skill-based cast cost bonus being applied twice
2015-01-07 04:41:12 +01:00
scrawl
ef1b0a191b
Revert "Enchanting: fix inverted self-enchant success chance"
...
It wasn't inverted to begin with. The author of this commit is an idiot.
2015-01-07 03:48:16 +01:00
scrawl
4e92f6ab48
Add commandline option to load a save game on startup
2015-01-07 03:27:24 +01:00
scrawl
157438460b
Fix being able to activate objects when paralyzed
2015-01-07 02:34:29 +01:00
scrawl
dc5ed5b861
Remove weather particles underwater ( Fixes #2010 )
2015-01-07 02:34:29 +01:00
scrawl
d02e075bab
Add setting for exterior cell grid size ( Fixes #1537 )
2015-01-07 02:34:29 +01:00
scrawl
a17252eab3
Remove unused checkWaypoint function
...
It was an almost exact copy of the checkPathCompleted function anyway.
2015-01-07 02:34:28 +01:00
scrawl
4d9100091d
Reduce default pathing arrival tolerance to 32 units ( Fixes #1605 )
2015-01-07 02:34:28 +01:00
scrawl
e19ab77d00
Store camera first person state in savegame ( Fixes #2255 )
2015-01-07 02:34:24 +01:00
scrawl
992b87ea44
Reset existing summons when the spell is re-casted ( Fixes #2135 )
2015-01-06 16:11:10 +01:00
scrawl
f267497c03
Allow separate summoned creature instances for each spell ID ( Fixes #2194 )
2015-01-06 16:11:05 +01:00
Marc Zinnschlag
31f6ccdf4d
Merge remote-tracking branch 'internecine/bug2031'
2015-01-06 09:43:59 +01:00
Internecine
e1fdcb608e
Fixed incorrect index
2015-01-06 15:00:24 +13:00
scrawl
464f8abb3f
List exterior cell names in tab completion ( Fixes #2252 )
2015-01-06 01:10:09 +01:00
scrawl
708dbc2518
Crime fix
2015-01-05 20:31:50 +01:00
scrawl
c343a5c803
stopCombat fix
2015-01-05 20:31:50 +01:00
scrawl
c1955ef7fa
Fix enchanting dialog effect labels showing a duration for constant effects
2015-01-05 18:57:08 +01:00
scrawl
5e7e40aac9
Fix being able to switch weapons while knocked out
2015-01-04 19:54:49 +01:00
scrawl
de12c96a46
Fix crash on exit if the window wasn't created ( Fixes #2249 )
2015-01-04 19:23:31 +01:00
scrawl
bc686c93b5
Potential fix for thrown weapons being regarded as broken
2015-01-04 19:20:30 +01:00
scrawl
398fe6e780
Thrown weapon fix ( Fixes #2248 )
2015-01-04 19:20:24 +01:00
scrawl
d56906acf7
Fix the creature position glitch
2015-01-03 19:10:15 +01:00
scrawl
6f747df713
Remove an unused constructor
2015-01-03 19:10:15 +01:00
scrawl
593ca6bd48
Fix for framerate-dependent maximum stepping distance (Bug #1638 )
2015-01-03 19:10:15 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Marc Zinnschlag
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230
defaults are set to 1.0; remove contrast setting
...
(can be changed in config though); disable gamma control for not Windows
OSs
2015-01-02 16:49:22 +03:00
Thoronador
526fb1b37b
fix uninitialized value in BillboardObject
2015-01-02 00:45:50 +01:00
scrawl
326d0d3ebf
Add default values for fNPCHealthBarTime and fNPCHealthBarFade ( Fixes #2243 )
...
These GMSTs are missing in unpatched versions of the game.
2015-01-01 22:55:43 +01:00
scrawl
92e4a0669c
Fix for AiWander state loading
2015-01-01 18:58:17 +01:00
scrawl
559ddbb480
Quick fix for Ai fast-forward crash in exteriors ( Fixes #2241 )
2015-01-01 18:18:46 +01:00
Internecine
a7a3ab0c78
Fixed instant negative dynamic stat changes being applied as positive
2015-01-01 21:26:09 +13:00
scrawl
dc1c52bda7
Add some todo comments
2015-01-01 03:38:54 +01:00
scrawl
e0d083f702
Add hand-to-hand combat mechanics for bipedal creatures
...
You can now have a fistfight with vivec, if you so desire.
2015-01-01 03:38:54 +01:00
scrawl
70d3bfc6ed
Fix idle animation not restarting immediately for creatures
2015-01-01 03:38:54 +01:00
scrawl
01652bbcc5
Store original actor position in AiWander package ( Fixes #2200 )
2015-01-01 03:38:49 +01:00
scrawl
5d7eb11596
Fix lights being rendered on the map (broken by d55fe43fc9)
2014-12-31 21:04:13 +01:00
scrawl
99ae0f901b
Implement AiTravel fast-forward ( Fixes #1125 )
2014-12-31 20:42:29 +01:00
scrawl
a8ae0dec52
Implement AiWander fast-forward (Feature #1125 )
2014-12-31 18:41:57 +01:00
scrawl
d26d5f6c26
Fix outdated bone locations when camera view is changed while paralyzed
2014-12-31 17:25:06 +01:00
scrawl
d1a29300f0
Handle bipedal creatures not using weapons ( Fixes #2238 )
2014-12-31 16:59:21 +01:00
mrcheko
60a74d5eb8
increase robustness for gamma to persist in the system;
...
use GMST strings for gamma interface
2014-12-31 18:40:01 +03:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1
gamma/contrast system reworked
2014-12-30 18:33:11 +03:00
scrawl
9c693d078b
Fix equipment update removing ammunition ( Fixes #2144 )
2014-12-30 16:22:06 +01:00
scrawl
18fb3f831a
Make the maximum horizontal stepping distance independent of movement speed ( Fixes #1638 )
2014-12-30 15:46:33 +01:00
scrawl
e2346d7c37
Store permanent magic effects in savegame ( Fixes #1648 )
2014-12-30 01:36:31 +01:00
scrawl
6c9875969a
Stop idle animations for non-biped creatures when attacking/moving
...
The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.
2014-12-28 15:34:47 +01:00
scrawl
a58bc9f2f7
Remove sneaking effect on combat AI ( Fixes #2237 )
2014-12-28 14:45:20 +01:00
scrawl
1bd3ab8a2d
Fix torch animation playing when torch is hidden ( Fixes #2236 )
2014-12-28 14:17:53 +01:00
scrawl
377b79d5ba
Use SoundGen fallback for type Land only ( Fixes #2228 )
2014-12-28 02:39:54 +01:00
scrawl
de9d347018
Fix on touch area effect spells ( Fixes #2233 )
2014-12-28 01:51:12 +01:00
scrawl
25954a80f5
Fix recharging of items in player inventory
2014-12-28 01:06:49 +01:00
scrawl
0a2dd4c6cb
Fix unsafe use of BaseNode in Move script instruction
2014-12-27 17:20:37 +01:00
scrawl
a62fe38a1b
Fix unsafe use of BaseNode
2014-12-27 15:02:05 +01:00
scrawl
50e31877ab
Fix crash when northmarker has been disabled (Bug #2230 )
2014-12-27 14:52:33 +01:00
Internecine
5f9540318a
Fixed incorrect indexes
2014-12-27 19:49:14 +13:00
Internecine
a87fe71ddf
Added a helper function to handle dynamic stat changes
2014-12-27 19:46:54 +13:00
scrawl
2f0793390f
Fix cut off text for some widgets in the stats window
2014-12-27 01:25:26 +01:00
Marc Zinnschlag
2fa0764c89
Merge remote-tracking branch 'swick/master'
2014-12-26 16:08:07 +01:00
Marc Zinnschlag
5f8b8b127c
Merge remote-tracking branch 'psi29a/clang_lintian'
2014-12-26 16:07:07 +01:00
Marc Zinnschlag
da722a5cf1
Merge remote-tracking branch 'miroslavr/master'
2014-12-26 16:05:20 +01:00
Sebastian Wick
764cd9ca16
disable "window border" setting in the ingame settings UI if fullscreen is enabled
2014-12-24 16:31:23 +01:00
scrawl
6f72989cb1
SpellModel, SortFilterItemModel: case insensitive sorting
2014-12-24 15:45:15 +01:00
scrawl
2e5e7370ba
Adjust default angle, FOV and viewport of character preview ( Fixes #2220 )
2014-12-24 15:45:15 +01:00
scrawl
9a1bde684f
Sort class list in select class dialog
2014-12-24 15:45:14 +01:00
scrawl
768c4a5757
Update crime response to pickpocket attempts (thanks Hrnchamd)
2014-12-24 15:45:14 +01:00
scrawl
b8fa73dfa9
Preserve record ordering in Store
...
This fixes the default head/hair used for some races in the chargen UI.
2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53
Make local map widget size configurable
2014-12-24 15:45:14 +01:00
scrawl
a47de06492
Make local map resolution configurable and use lower default value
...
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
2014-12-24 15:45:14 +01:00
scrawl
7f0d71f8f4
Swap use of iDispAttackMod/fDispAttacking (thanks Hrnchamd)
2014-12-24 15:45:14 +01:00
scrawl
59f21c6105
Use "hair" as filter for PRT_Hair parts ( Fixes #2218 )
2014-12-24 15:45:14 +01:00
scrawl
d55fe43fc9
Support animation groups for Light and Door objects ( Fixes #2039 )
2014-12-24 15:45:14 +01:00
scrawl
019cd96719
Stop AiPursue when target has invisibility or chameleon>=75
2014-12-24 15:45:14 +01:00
scrawl
e5de253169
Use maximum step size of 62 units for stepping down ( Fixes #1809 )
2014-12-24 15:45:14 +01:00
scrawl
edc128572d
Add MWMechanics::Actor class for temporary actor state, move AiState there
2014-12-24 15:45:14 +01:00
scrawl
42d63a4eb2
Fix position flicker after an animation ends
2014-12-24 15:45:14 +01:00
scrawl
8bc7eb5530
PlayGroup: Don't loop animations with no loop keys ( Fixes #2223 )
2014-12-24 15:45:13 +01:00
scrawl
9e5dfb6e98
Update crime system according to research wiki for more accurate attack responses
2014-12-24 15:45:13 +01:00
scrawl
2410d79410
Fix iFightAttack and iFightAttacking being swapped
...
Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.
2014-12-24 15:45:13 +01:00
scrawl
e73e975291
Fix player being able to activate objects when knocked out
2014-12-24 15:45:13 +01:00
scrawl
3912ee2b1d
Fix faction rank not being set on items in faction-owned containers
2014-12-24 15:45:13 +01:00
scrawl
0081a68376
Use fMagicStartIconBlink for spell effect indicator fading
2014-12-24 15:45:13 +01:00
scrawl
877e07823d
Fix incorrect sound for spell creation success
2014-12-24 15:45:13 +01:00
scrawl
fb542a64ec
Merchant items should be restocked instantly
2014-12-24 15:45:13 +01:00
scrawl
1bcc4430e0
Fix owner not getting set on restocked items
2014-12-24 15:45:13 +01:00
scrawl
9ed71765a9
Fix deleted containers showing in merchant inventories
2014-12-24 15:45:13 +01:00
scrawl
f3738e9a98
Say an "intruder" voice dialogue for trespassing crimes ( Fixes #1082 )
...
Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.
2014-12-24 15:45:13 +01:00
scrawl
37e11b7272
Adjust loading box size for large captions
2014-12-24 15:45:12 +01:00
scrawl
866fdfe8bd
Crime system improvements
...
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
2014-12-24 15:45:12 +01:00
scrawl
307b84e9f6
Add enemy health bar fading and use relevant GMSTs
2014-12-24 15:45:12 +01:00
scrawl
1910327469
Implement disposition changes due to crimes
2014-12-24 15:45:12 +01:00
scrawl
cc9af9562b
Function_CreatureTargetted should return '2' for werewolfs
...
This makes NPCs say the correct attack voice files when fighting a werewolf.
2014-12-24 15:45:12 +01:00
scrawl
efa9ff3a76
Fix incorrect implementation of iWerewolfBounty
2014-12-24 15:45:12 +01:00
scrawl
35d2bfabca
Adjust NPC response to pickpocket attempts ( Fixes #2219 )
2014-12-24 15:45:12 +01:00
scrawl
4aed5158cc
Support region names in cell dialogue filter ( Fixes #2113 )
2014-12-24 15:45:12 +01:00
scrawl
105f0f8716
Head tracking: don't look at dead actors
2014-12-24 15:45:12 +01:00
scrawl
8a210c49e9
Improve AI prioritising health potions
2014-12-24 15:45:12 +01:00
scrawl
a29abb85f1
Fix ItemView sizing bug
2014-12-24 15:45:12 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
scrawl
1b9209df4a
Allow blocking of hand-to-hand attacks
2014-12-24 15:45:11 +01:00
Sebastian Wick
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
2014-12-24 15:09:50 +01:00
Bret Curtis
45299abe99
make it C98 compat
2014-12-23 17:13:11 +01:00
Bret Curtis
dcfadeb51a
fix typo and annoying gcc/clang unused return values in crash catcher
2014-12-22 10:45:34 +01:00
Sebastian Wick
639fbfad0b
make borderless setting available to the UI
2014-12-22 02:44:20 +01:00
MiroslavR
c796589420
Allow adding multiple Attribute/Skill effects in spell making ( Fixes #2224 )
2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
2014-12-19 11:26:54 +01:00
Alexander "Ace" Olofsson
0af5c7b379
Starting to clean up some heavy includes
2014-12-19 09:23:16 +01:00
Marc Zinnschlag
057d0913d6
Merge branch 'scriptfixes'
2014-12-18 10:22:07 +01:00
Marc Zinnschlag
a6d30bc2e3
consider --script-warn when running with --script-all-dialogue
2014-12-18 10:20:15 +01:00
Marc Zinnschlag
899ae763e6
fixing a travis build problem
2014-12-17 09:33:40 +01:00
scrawl
c2771bc8ab
Head tracking fix
2014-12-17 02:15:40 +01:00
scrawl
31d28e727f
Implement leveled list script functions ( Fixes #1546 )
2014-12-17 01:24:22 +01:00
scrawl
d642512f71
Error message fix
2014-12-17 00:57:04 +01:00
scrawl
88c5e1991c
Fix being able to stand on top of actors ( Fixes #1192 )
2014-12-16 23:18:41 +01:00
scrawl
d962f0918d
Implement NPC head tracking ( Fixes #1720 )
2014-12-16 20:47:45 +01:00
scrawl
b9e5aa9db6
Movement controller: Don't allow stepping up other actors
...
This seems to fix issues with NPCs inadvertently being placed on top of a small creature while fighting it.
Note that jumping on top of actors is still possible (Bug #1192 )
2014-12-16 20:44:42 +01:00
scrawl
0dc9401269
Fix GUI crash due to outdated spells list
2014-12-15 20:20:17 +01:00
scrawl
ec00c830e5
Fix missing armor rating label update
2014-12-15 19:19:08 +01:00
scrawl
e4127aa491
Use space in ItemView more efficiently
2014-12-15 19:04:53 +01:00
scrawl
c7e1c0b595
Fix weapon cycle getting stuck for same item IDs
2014-12-15 17:49:08 +01:00
scrawl
935cccf974
Implement weapon/spell cycling hotkeys ( Fixes #1024 )
2014-12-15 16:23:08 +01:00
scrawl
4d5adfb5dd
Fix being able to use enchantments of items that failed to equip ( Fixes #2215 )
2014-12-15 13:47:34 +01:00
scrawl
4e0d16da8c
Take Scale field in creature record into account ( Fixes #2214 )
2014-12-15 13:34:04 +01:00
scrawl
79237d16a7
Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
...
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
2014-12-15 13:28:03 +01:00
scrawl
7abbca8be9
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-12-14 20:27:12 +01:00
scrawl
2b78e9795d
Implement Calm effect removing combat packages ( Fixes #1985 )
2014-12-14 19:35:34 +01:00
scrawl
4f3995a4d8
Fix werewolf AI being able to use items
2014-12-14 19:15:43 +01:00
scrawl
4acc25f59c
Use SoundGen with no creature field as fallback
...
This fixes the adorable "thump" sounds in the Scrib's idle animation not playing.
2014-12-14 17:52:06 +01:00
scrawl
192626c6f5
SoundGen fix: use Original Creature field only if non-empty
2014-12-14 17:44:03 +01:00
MiroslavR
c5a604453e
Fix several book formatting issues ( Fixes #2204 )
2014-12-14 16:25:27 +01:00
scrawl
88a2e4c043
Graceful error handling for missing spells/factions ( Fixes #1825 , Bug #2176 , Bug #2203 )
2014-12-14 02:38:27 +01:00
Nik Dyonin
80c92789c2
Fix issue when killed NPC cannot be looted if it was in combat mode before killing.
2014-12-14 02:58:42 +03:00
Marc Zinnschlag
1f74d8cca5
Merge remote-tracking branch 'scrawl/scripttest'
2014-12-13 12:49:33 +01:00
scrawl
ba65c6cc7f
Add --script-all-dialogue switch to compile all dialogue scripts ( Fixes #1659 )
2014-12-13 02:51:18 +01:00
scrawl
2ebf328dec
Always print the failing dialogue script
...
These aren't usually very long, so printing them shouldn't spam the console by too much.
2014-12-13 00:39:24 +01:00
scrawl
ed6face4aa
Disable activation scripts for actors in combat
2014-12-12 22:21:57 +01:00
scrawl
60aa209144
Implement drowning when knocked out underwater ( Fixes #1228 )
2014-12-12 17:42:56 +01:00
scrawl
d034a079e6
Allow equipping twohanded weapon and shield at the same time ( Fixes #1785 )
...
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
2014-12-12 16:49:22 +01:00
scrawl
bc85bb32c2
Fix vampirism magic effect not applying immediately ( Fixes #1984 )
2014-12-12 02:39:59 +01:00
scrawl
03da21f088
Remove redundant GUI element showing during loading screens
2014-12-12 02:13:50 +01:00
scrawl
e69cf11029
Hide tooltips during loading screens
2014-12-12 02:09:15 +01:00
scrawl
cf5fc60e86
Make ToggleMenus affect tooltips ( Fixes #1989 )
2014-12-12 01:42:13 +01:00
scrawl
f42420bc19
Use the Original Creature field for SoundGen lookups
2014-12-12 01:24:35 +01:00
scrawl
2601b26217
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-12-11 22:44:58 +01:00
scrawl
7892ed35f3
PlaceItem, PlaceItemCell: Make sure references are placed above terrain (Bug #2078 )
2014-12-11 22:25:53 +01:00
scrawl
886903d70e
Implement HitAttemptOnMe function (Bug #2078 )
2014-12-11 22:25:41 +01:00
scrawl
5f00a3d5c3
Reset lastHitObject when it is retrieved rather than every frame
...
This seems to be how vanilla MW does it.
2014-12-11 22:00:31 +01:00
scrawl
a355550cab
Add support for NPCs with missing head/hair models ( Fixes #2078 )
2014-12-11 21:43:31 +01:00
scrawl
be16f1d0a5
Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078 )
2014-12-11 21:00:02 +01:00
scrawl
d955017079
Don't report script operation status via messageBox (Bug #1942 )
2014-12-11 20:51:02 +01:00
Marc Zinnschlag
912dcdc418
Merge remote-tracking branch 'scrawl/ptrupdate'
2014-12-11 20:41:53 +01:00
Marc Zinnschlag
19bd07648b
Merge remote-tracking branch 'scrawl/pathgrid'
2014-12-11 20:32:32 +01:00
scrawl
ed2aa5a233
Fix crash caused by dangling baseNode pointer
2014-12-11 20:32:05 +01:00
scrawl
7e8ca3fff1
Fix object movement between cells producing a stale Ptr within the script execution (Bug #1942 )
2014-12-11 19:29:06 +01:00
scrawl
3270f0e932
Change pathgrid workaround to check for interior cell name
2014-12-11 15:19:48 +01:00
scrawl
623783cd6a
Enchanting: fix cast cost for "on use" enchantments being set incorrectly
2014-12-10 18:05:11 +01:00
scrawl
619ea846b4
Enchanting: fixed case where no range types at all are allowed (e.g. a Constant Effect item with an effect that does not allow the Self range-type)
2014-12-10 17:55:48 +01:00
scrawl
74c345f790
Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense)
2014-12-10 17:40:59 +01:00
scrawl
ead6bf1601
Enchanting: cast the enchant points for the item to int ( Fixes #2202 )
2014-12-10 17:34:05 +01:00
scrawl
3c747195ae
Add fall damage for creatures ( Fixes #2201 )
2014-12-10 17:21:34 +01:00
scrawl
e0c6f84546
AiFollow: target has to be seen in order to start following ( Fixes #1637 )
2014-12-09 22:25:28 +01:00
Digmaster
95219a7936
Show currently selected input type for settings window
2014-12-09 14:48:34 -06:00
Digmaster
bb6ed06a4e
read gamecontrollerdb file location from settings file
2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a
Fixed binding controls to A on joystick
2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593
Inital value for joysticks is 0.5
2014-12-09 11:16:17 -06:00
scrawl
109a3f78a1
Adjust AiFollow distance for groups of multiple followers ( Fixes #1637 )
2014-12-09 16:06:04 +01:00
scrawl
3ad0189982
Take sound listener y rotation (roll) into account, though currently unused for actors
2014-12-09 12:07:22 +01:00
Digmaster
073a2f0674
Fixed issue with walking
2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1
Joystick Support
2014-12-08 21:57:32 -06:00
scrawl
0fe7500f74
Work around pathgrid record limitation ( Fixes #2195 )
2014-12-09 00:13:56 +01:00
scrawl
855fe33c59
Add vanilla-compatible range limiting for playloopsound ( Fixes #244 , Fixes #1342 )
2014-12-08 23:58:20 +01:00
scrawl
f6960debcb
Attach sound listener to the player head instead of camera
2014-12-08 23:26:09 +01:00
scrawl
cf85cbbc8e
Switch sound distance model to AL_INVERSE_DISTANCE
2014-12-08 17:43:56 +01:00
scrawl
fbed429b25
Use GMSTs for sound fading distance
2014-12-08 17:25:17 +01:00
scrawl
9f90a1e44b
Remove script access to deleted references that have no content file
...
In original MW these objects are permanently deleted and can not be accessed anymore.
2014-12-07 22:37:50 +01:00
scrawl
f49fde3d5d
Add support for undeleting references ( Fixes #2193 )
...
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
2014-12-06 21:08:18 +01:00
scrawl
2952a0e2aa
Make Resurrect function reset most of the runtime state ( Fixes #2181 )
2014-12-06 19:53:24 +01:00
scrawl
41542dedf7
Fix map insert return value mixup ( Fixes #2192 )
2014-12-06 17:24:05 +01:00
scrawl
9a1b7cbe52
Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row ( Fixes #1986 )
2014-12-06 16:50:09 +01:00
scrawl
416d549568
Fix animation glitch caused by knockdown
...
If the player was knocked down while having no weapon, spell nor fists ready, the animation state would incorrectly shift to "weapon equipped" even though no weapon is equipped.
2014-12-05 22:02:18 +01:00
scrawl
e313ed3cef
Support animated container models
2014-12-05 20:58:33 +01:00
scrawl
65536f0857
Load initial particle system state from NIF files ( Fixes #2178 )
2014-12-05 18:00:30 +01:00
scrawl
a67e7c64ea
Optimize pathgrid store
2014-12-05 15:58:22 +01:00
scrawl
83dcf9ce4b
Overwrite existing records in IndexedStore ( Fixes #2182 )
2014-12-05 15:58:05 +01:00
Marc Zinnschlag
eb6e1576be
Merge remote-tracking branch 'scrawl/master'
2014-12-03 20:17:34 +01:00
scrawl
fee08f97ed
Fix crash in character preview for non-existing meshes ( Fixes #2128 )
2014-12-03 18:28:35 +01:00
scrawl
75b0da5dce
Don't updateBoneTree for non-skinned parts ( Fixes #2124 )
2014-12-03 18:28:35 +01:00
scrawl
14ae6d28b0
Fix being able to jump when overencumbered
2014-12-03 18:28:35 +01:00
scrawl
3519d23518
Race dialog: remove incorrect assumption about numeric index in head/hair record IDs
2014-12-03 18:28:35 +01:00
scrawl
7faa849cef
Fix fatigue recalculation using older value (oops)
2014-12-03 18:28:34 +01:00
scrawl
dd0cea21b0
Implement overwriting pathgrid records ( Fixes #2175 )
2014-12-03 18:28:34 +01:00
Paulo Viadanna
bfa048e687
Fix #1734 : AI will stop combat if target disappear
2014-12-02 17:38:25 -02:00
scrawl
fadbb5ad21
Add particle and sound fading for weather transitions ( Fixes #2130 )
2014-12-01 23:09:47 +01:00
scrawl
b9d0552166
Fix positionCell rotation argument when used on the player
...
This fixes the player's initial orientation on the starting boat, to properly face Jiub.
2014-12-01 23:09:47 +01:00
scrawl
46d93f1b08
Crime update: NPCs can report crimes if they didn't see the crime, but were alerted by someone who saw it and did not report it themselves.
2014-12-01 23:09:46 +01:00
scrawl
507cbcfae3
Remove incorrect implementation of the iAlarm* GMSTs, not used by vanilla MW ( Fixes #2064 )
...
According to Hrnchamd, these are unused. The real mechanics are not fully documented, but from a quick test only NPCs with an alarm value of 100 will report crimes.
2014-12-01 23:09:46 +01:00
scrawl
ed686ddd2f
Don't update nodes with an empty name from the skeleton source ( Fixes #2125 )
2014-12-01 23:09:46 +01:00
scrawl
a1226501fa
AiWander: move idle animation handling to non-delayed section ( Fixes #2073 )
2014-12-01 23:09:46 +01:00
scrawl
f9ae0d9d66
Fix dialogue goodbye link conflicting with choice links
2014-12-01 23:09:46 +01:00
scrawl
8103d25b09
Make ToggleMenus close open windows ( Fixes #2045 )
2014-12-01 23:09:46 +01:00
scrawl
c684c99a95
Combat AI: Don't attempt to cast spells when impossible to succeed ( Fixes #2059 )
2014-12-01 23:09:46 +01:00
scrawl
6960cac5eb
Disable third person zoom feature by default due to usability issues ( Fixes #2129 )
2014-12-01 23:09:46 +01:00
scrawl
61d1aa78ce
Move AiWander path finder to temporary storage ( Fixes #2082 )
2014-12-01 23:09:46 +01:00
Marc Zinnschlag
b7cf114d5d
Merge remote-tracking branch 'scrawl/delete'
2014-12-01 22:57:41 +01:00
scrawl
48d5789aeb
Use a separate flag for references deleted by a content file ( Fixes #2018 )
...
The flag must be separate so as to not contaminate the user's savegame.
Fixes the following use cases that were broken before:
- Content file edits a reference that was already deleted by a previously loaded content file -> reference must stay deleted
- Changed or new content file deletes a reference that is already present in the user's savegame -> reference must be deleted
- Said content file is disabled again - reference must be undeleted
2014-12-01 22:16:45 +01:00
MiroslavR
6e1a11f322
Queue screen fade operations invoked by scripts
2014-12-01 19:13:04 +01:00
Marc Zinnschlag
003675318d
Merge remote-tracking branch 'scrawl/master'
2014-11-29 20:54:04 +01:00
scrawl
5f5fcc2fef
Make PlayGroup use an indefinite number of loops ( Fixes #2156 )
2014-11-28 17:15:31 +01:00
scrawl
4fd3a994e9
Add model and script information to BetaComment
2014-11-28 16:27:18 +01:00
scrawl
ea8f617508
Add missing player control enabled checks ( Fixes #2152 )
2014-11-28 15:54:38 +01:00
scrawl
d7220cdc2f
Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth ( Fixes #2158 )
2014-11-28 15:16:53 +01:00
scrawl
0a466ad643
Make recalculation of magicka less aggressive ( Fixes #2155 )
2014-11-28 14:45:35 +01:00
MiroslavR
cb74c1c36e
Set health to 0 if it drops below 1 ( Fixes #2163 )
2014-11-27 20:44:41 +01:00
MiroslavR
238325455d
Erase effects that have expired ( Fixes #2134 )
2014-11-25 10:33:03 +01:00
scrawl
d36dfbe779
Apply the frame time cap to Ogre's ControllerManager ( Fixes #2154 )
...
This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.
2014-11-25 02:44:11 +01:00
scrawl
ada4e37556
Fix race preview texture not being destroyed properly ( Fixes #2098 )
2014-11-24 01:02:18 +01:00
scrawl
c1e6b8608b
Always create a skeleton if there's an "ArrowBone" node ( Fixes #2117 )
2014-11-23 16:37:31 +01:00
scrawl
414f7ea02c
Ignore mouse movements during video playback ( Fixes #2139 )
2014-11-22 12:59:31 +01:00
scrawl
273a80e2c0
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-11-11 15:43:46 +01:00
Evgenii Babinets
fe385214e4
Added proper slow fall effect mechanics.
2014-11-10 02:42:44 -05:00
Marc Zinnschlag
de3a26e21b
Merge remote-tracking branch 'miroslavr/master'
2014-11-08 11:00:19 +01:00
MiroslavR
b8d5a9486a
Make Restore/Damage Attribute/Skill effects continuous
2014-11-08 00:57:03 +01:00
scrawl
d5768af952
Fix INT_MIN trade exploit ( Fixes #2096 )
2014-11-06 03:51:18 +01:00
cc9cii
f051fb65ff
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
2014-11-06 08:35:24 +11:00
Internecine
edc51ab768
Removed debug output
2014-11-05 15:26:13 +13:00
Internecine
6741fbe7a9
Fixes bug #2031
2014-11-05 15:22:44 +13:00
Internecine
9c5f156793
Fixes tooltip displaying 0 durations
2014-11-05 00:46:33 +13:00
MiroslavR
140013820b
Fix invalidated iterator
2014-11-02 15:40:08 +01:00
MiroslavR
a4d0068e29
Make forcegreeting no-op for disabled references ( Fixes #2093 )
2014-11-02 15:36:13 +01:00
Marc Zinnschlag
29c9b6bd01
Merge remote-tracking branch 'scrawl/master'
2014-11-02 10:38:42 +01:00
scrawl
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
2014-11-01 19:37:54 +01:00
scrawl
efa4d09c48
Fix crash when avcodec_decode_audio4 doesn't return a full frame ( Fixes #2088 )
2014-11-01 19:32:07 +01:00
Marc Zinnschlag
8b3d876534
Merge remote-tracking branch 'lgro/ffmpeg_decoder'
2014-11-01 10:57:21 +01:00
Marc Zinnschlag
7785e3a0bc
fixed for potential crash during saved game loading
2014-10-31 17:59:55 +01:00
Marc Zinnschlag
ac58dd735b
do not crash on exceptions while adding startup scripts
2014-10-31 11:02:42 +01:00
scrawl
45f14f0704
Fix stolen faction-owned items not being confiscated
2014-10-31 00:25:37 +01:00
scrawl
f7ba1dbfc8
Add error handling for getPcRank and similar defines ( Fixes #2071 )
2014-10-28 16:07:37 +01:00
scrawl
e48dc45ede
Fix creatures not being able to move with 0/0 encumbrance
2014-10-27 21:53:00 +01:00
scrawl
c194226d08
Increase maximum height for finding spawn points to 500 ( Fixes #2056 )
2014-10-27 21:52:59 +01:00
scrawl
aa02974d3b
Fix Journal instruction for non-existing journal indices ( Fixes #2063 )
2014-10-27 21:52:59 +01:00
scrawl
dab05471be
Reset crime when bounty is reset to 0 by a script ( Fixes #2057 )
2014-10-25 21:09:37 +02:00
scrawl
ac067564ea
Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware.
2014-10-25 20:50:41 +02:00
scrawl
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-25 19:59:23 +02:00
scrawl
55c9c0a266
Audio resampling fixes
...
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
2014-10-25 17:17:57 +02:00
Marc Zinnschlag
a87092d11b
Merge remote-tracking branch 'miroslavr/master'
2014-10-25 12:09:36 +02:00
Marc Zinnschlag
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
2014-10-25 12:08:16 +02:00
cc9cii
e01795556f
Suppress some warnings for MSVC.
2014-10-25 10:37:57 +11:00
scrawl
dbe30e31b9
Make creature's model take priority over base_anim.nif ( Fixes #2055 )
2014-10-25 00:56:43 +02:00
scrawl
b39d69e98c
Videoplayer fixes, play/pause & seeking
...
- Fix rindex overflow
- Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
- Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
- Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)
The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
2014-10-24 21:31:11 +02:00
MiroslavR
ed3a3f717f
Handle getdistance on objects inside a container ( Fixes #2046 )
2014-10-24 19:05:43 +02:00
MiroslavR
fa746b8e54
Do not display weight or value in tooltip for zero-weight items ( Fixes #2047 )
2014-10-24 19:05:43 +02:00
MiroslavR
925fa8d193
Reset ownership of items dropped via 'drop' instruction ( Fixes #2053 )
2014-10-24 19:04:47 +02:00
scrawl
e2bad395e5
Leak fix
2014-10-24 18:07:17 +02:00
Marc Zinnschlag
19b380d0b4
Merge remote-tracking branch 'scrawl/master'
2014-10-23 20:07:40 +02:00
scrawl
eb1c24ffe6
Refactor video player engine to get rid of MWSound dependencies
...
- Split video player to separate source files.
- Move video player engine sources to extern/ (repository will be set up on github soon).
- Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
- Handle conversion of unsupported channel layouts via ffmpeg's swresample.
2014-10-22 22:33:32 +02:00
Marc Zinnschlag
c1d867a213
Merge remote-tracking branch 'origin/master'
2014-10-22 09:48:30 +02:00
Marc Zinnschlag
8f0add75f5
Merge remote-tracking branch 'scrawl/master'
2014-10-22 09:42:28 +02:00
Marc Zinnschlag
94d5151273
Merge remote-tracking branch 'miroslavr/master'
2014-10-22 09:39:54 +02:00
scrawl
bcb2d714c0
Add TODO comments for future videoplayer enhancements
2014-10-21 23:46:04 +02:00
scrawl
41df4289c6
Merge remote-tracking branch 'upstream/openmw-33' into HEAD
...
Conflicts:
apps/openmw/mwworld/store.hpp
2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson
b5a57920b6
Fix compile error on Windows
2014-10-21 19:35:17 +02:00
scrawl
5711103322
Remove leftover comment
2014-10-21 17:51:59 +02:00
scrawl
202cfa879f
Implement frame drop support in the videoplayer ( Fixes #1343 )
2014-10-21 17:01:53 +02:00
scrawl
290aacd2a6
Fix videoplayer crash on quit
...
The sound stream thread was trying to update the stream during/after destruction of the video state.
2014-10-21 17:01:53 +02:00
scrawl
8472695f89
Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
...
This reverts commit d77546b7dc
2014-10-21 17:01:53 +02:00
scrawl
de0e0fedff
Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
...
This reverts commit f5589b42ea
2014-10-21 17:01:53 +02:00
scrawl
681f3fa530
Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder."
...
This reverts commit b40c1ff26c
2014-10-21 17:01:52 +02:00
scrawl
8b3755a770
Compile fix
2014-10-20 17:45:24 +02:00
scrawl
f2877c69d7
Fix old alchemy apparatus still showing in alchemy window after removal
2014-10-20 17:45:18 +02:00
scrawl
192069a181
Add automatic potion naming
2014-10-20 17:45:11 +02:00
scrawl
fd7c181e06
Fix alchemy producing potion IDs from content files
2014-10-20 17:45:06 +02:00
scrawl
9bb51fd9c2
Compile fix
2014-10-20 17:42:51 +02:00
scrawl
ace8e0175b
Fix old alchemy apparatus still showing in alchemy window after removal
2014-10-20 17:28:51 +02:00
scrawl
29ac97be7a
Add automatic potion naming
2014-10-20 17:28:51 +02:00
scrawl
7f06e3e7e3
Fix alchemy producing potion IDs from content files
2014-10-20 17:07:54 +02:00
MiroslavR
5a7dbb19f7
Code clarity
2014-10-20 01:10:08 +02:00
scrawl
4047e3c928
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:46:28 +02:00
scrawl
b0f98687e6
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:45:18 +02:00
MiroslavR
ed6bdc0bde
Use all topics to search for keywords in dialogues ( Fixes #2013 )
...
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
2014-10-18 20:07:40 +02:00
scrawl
deabc52c16
Treat "Root Bone" as the animation root if existing ( Fixes #2019 )
2014-10-17 23:29:59 +02:00
scrawl
415f67f859
Treat "Root Bone" as the animation root if existing ( Fixes #2019 )
2014-10-17 23:29:13 +02:00
scrawl
5892fd9e65
Fix NpcAnimation non-existing skeleton crash ( Fixes #2028 )
2014-10-17 23:07:01 +02:00
scrawl
8233f5894a
Fix NpcAnimation non-existing skeleton crash ( Fixes #2028 )
2014-10-17 23:04:36 +02:00
scrawl
f117a75747
Force walk animation when flying ( Fixes #2015 )
2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:02:31 +02:00
scrawl
2be65a89a7
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:01:28 +02:00
Marc Zinnschlag
c97845d35d
better script compiler diagnostics
2014-10-17 10:59:25 +02:00
scrawl
c3ef39eb6f
Fix ItemWidget text cleanup ( Fixes #2022 )
2014-10-17 02:41:43 +02:00
scrawl
c4e81adb83
Fix settings window being too small for all tabs on some localizations
2014-10-16 15:49:01 +02:00
scrawl
244db5cbfe
Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33
2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1
fix for implicit references
2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b
dagoth fix
2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09
setDynamic workaround for broken endgame scripts ( Fixes #2016 )
2014-10-15 15:00:45 +02:00
Alexander "Ace" Olofsson
dc788512e2
Fix LNK2019 link error on Visual Studio 2010 builds
...
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
2014-10-14 16:10:19 +02:00
Marc Zinnschlag
6beee95151
Merge remote-tracking branch 'terrorfisch/aistate'
2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d
Merge remote-tracking branch 'internecine/master'
2014-10-13 19:11:14 +02:00
Marc Zinnschlag
eb45793eab
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277
Merge remote-tracking branch 'miroslavr/master'
2014-10-13 10:57:04 +02:00
Thoronador
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
2014-10-12 23:28:16 +02:00
MiroslavR
8456741eaa
Fix blindness and create a separate fader for it
2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec
Don't remove player's sounds when unloading a cell
2014-10-12 18:35:15 +02:00
scrawl
d51daf5875
Fix AI not using F_Always spells, for example "vampire touch"
2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed
Make spells cast by scripts always succeed ( Fixes #1993 )
2014-10-12 17:18:27 +02:00
Marc Zinnschlag
aefe8cd4ae
Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
...
Conflicts:
apps/openmw/mwworld/class.cpp
2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930
Fixes #1887 : Equipped items do not emit sounds
...
Corrected wrong return type of Class::getSound() method.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 13:38:41 +02:00
Lukasz Gromanowski
e1663de7cf
Fixes #1887 : Equipped items do not emit sounds
...
Added getSound() method to MWClass class and implementation
into Light class.
Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 11:40:14 +02:00
MiroslavR
ad253059b1
Hit indicator for absorb/damage health effect
2014-10-12 01:15:40 +02:00
MiroslavR
8dd95fd77e
Construct hit fader with correct texture right away to prevent mygui warning
2014-10-12 00:40:31 +02:00
MiroslavR
a5e972aeb5
Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode
2014-10-12 00:13:24 +02:00
Lukasz Gromanowski
b44ba84a80
Issue #1887 : Equipped items do not emit sounds
...
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 23:20:40 +02:00
MiroslavR
2162a9e1b9
Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available
2014-10-11 23:09:20 +02:00
Lukasz Gromanowski
1a0c3dc6cf
Issue #1887 : Equipped items do not emit sounds
...
Removed unused mUnequipping and mFirstEquip member variables.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c
Issue #1887 : Equipped items do not emit sounds
...
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:21:59 +02:00
MiroslavR
0ae604990e
Implement continuous damage indication ( Fixes #1970 )
2014-10-11 22:21:48 +02:00
MiroslavR
4dc613a04b
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a
Issue #1887 : Equipped items do not emit sounds
...
Played sound items are based on parts not inserted items.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 21:05:12 +02:00
Marc Zinnschlag
3fd10d2a82
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2014-10-11 14:51:55 +02:00
Marc Zinnschlag
82b4148a62
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498
remove unused var. mSoftwareCursor in WindowManager
2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce
Fix: initialize boolean field with boolean value, not NULL
2014-10-11 10:07:01 +04:00
Thoronador
8361019456
fix uninitialized (pointer) vars in more classes
2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c
fix uninitialized member variables in OcclusionQuery class
2014-10-11 01:35:12 +02:00
Thoronador
db38108801
fix uninitialized pointer variables in some classes
2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13
remove unused dummy variable
2014-10-11 00:56:57 +02:00
terrorfisch
c4badcea6e
removed warning
2014-10-10 23:51:29 +02:00
terrorfisch
c28dfc2fa4
Travis CI fix?
2014-10-10 23:34:58 +02:00
terrorfisch
4eb1668467
references now initialized when they are needed
2014-10-10 23:32:15 +02:00
terrorfisch
bbca942601
-improved trigonometric precision
...
-cleanup
2014-10-10 23:31:01 +02:00
terrorfisch
5248917a6c
- changed namespace
2014-10-10 23:28:49 +02:00
Internecine
470d375177
Removed duplicate functions and moved pause check in weather.cpp
2014-10-10 23:29:51 +13:00
terrorfisch
db1b93498d
Added comment.
2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841
Moved all variables in temporary storage for AiCombat and some more for AiWander.
...
+Buxfix for previous AiWander changes
2014-10-10 00:16:17 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
Internecine
782e851eb1
Better fix, now allows for teleporting to change weather while still paused.
2014-10-09 19:41:51 +13:00
terrorfisch
cae948df96
removed unecessary PathFinders
2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8
Updated AiCombat:
...
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00
Addded the parts of AiWander that I fully understand to the temporary storage.
...
The rest should be done by someone who has a clearer overview over the class.
2014-10-08 22:11:45 +02:00
terrorfisch
0871d45790
Draft how to move temporary package state to CharacterController.
...
Example for a few values shown in AiWander.
2014-10-08 10:58:52 +02:00
sylar
70fd531722
None texturing filtering enable for android by default
2014-10-08 00:15:22 +04:00
sylar
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
2014-10-07 23:30:31 +04:00
Marc Zinnschlag
744c56943a
Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'
2014-10-07 18:03:25 +02:00
Jordan Ayers
56db525a93
Document the return value of getEffectMultiplier.
2014-10-06 21:56:41 -05:00
MiroslavR
d1dc9951d4
Do not display werewolf overlay in third person
2014-10-06 20:24:53 +02:00
MiroslavR
0e19c3fdeb
Silence werewolves' footstep sounds when they are running with their claws sheathed
2014-10-06 18:48:22 +02:00
MiroslavR
4086bc4848
Do not spawn blood vfx on player if hit fader is enabled
2014-10-06 18:33:41 +02:00
MiroslavR
b6abfb0145
Do not display hit fader if the player wasn't damaged
2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-06 18:24:41 +02:00
scrawl
9ab8d0a8e6
Hotfix for crash when deleting an actor
2014-10-06 14:56:49 +02:00
scrawl
8097d9801d
Fix HasSoulgem function to return number of soulgems
2014-10-06 14:56:49 +02:00
Internecine
3dee4c2b0e
Fixes #1706
2014-10-06 16:10:58 +13:00
Jordan Ayers
aac2de270e
Cleanup: Don't call <environment obj>.get().
...
mEnvironment.get() is redundant. Switch the call to resemble the
surrounding environment get() calls, instead.
2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61
Fix typo in comments.
2014-10-05 18:12:33 -05:00
scrawl
9cce3bc31b
Implement fDispositionMod according to research wiki
2014-10-05 23:03:30 +02:00
scrawl
39bc11681e
Fix broken onGround status when levitating
2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b
Fix being able to rest while water-walking ( Fixes #1712 )
2014-10-05 22:35:53 +02:00
scrawl
d9165593d9
Fix footstep sounds played during water-walking
2014-10-05 22:27:25 +02:00
scrawl
064f1964ba
More efficient water walking
2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4
Fix a typo in condition
2014-10-05 19:53:36 +02:00
scrawl
04614651fa
Fix recharging items not being updated for actor's initial inventory
2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
2014-10-05 17:53:50 +02:00
scrawl
d790506525
Fix projectiles colliding with dead actors ( Fixes #1971 )
2014-10-05 17:41:56 +02:00
scrawl
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb
Fix not being able to move with 0/0 encumbrance ( Fixes #1979 )
2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b
Fix divisions by zero in normalizedEncumbrance
2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96
Teleport indirect followers as well when using a door ( Fixes #1974 )
2014-10-05 15:18:32 +02:00
scrawl
ff11745429
Fix magic projectile sound disappearing after multiple save/load cycles
2014-10-05 14:47:23 +02:00
Jordan Ayers
663647bee8
Simplify getEffectMultiplier.
...
Both return cases were same, except for some overflow conditions.
2014-10-04 15:28:58 -05:00
Lukasz Gromanowski
bcb38c3eba
Issue #1887 : Equipped items do not emit sounds
...
Added handling of autoEquip and unequipAll cases.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 22:27:23 +02:00
scrawl
20777c1b2e
Optimize physics shape scaling on cell load
2014-10-04 20:37:35 +02:00
scrawl
db6b04d127
Use the footstep volume slider for jump landing sounds ( Fixes #1968 )
2014-10-04 19:50:38 +02:00
scrawl
95378aa6ac
Fix crash when a magic projectile has no sound defined ( Fixes #1967 )
2014-10-04 18:37:35 +02:00
Lukasz Gromanowski
e566e4abf2
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 16:47:29 +02:00
Lukasz Gromanowski
6a89b67cb1
Revert "Issue #1887 : Equipped items do not emit sounds"
...
This reverts commit 566211e753
2014-10-04 13:34:36 +02:00
Marc Zinnschlag
cd7cc4bec9
Merge remote-tracking branch 'miroslavr/master'
2014-10-04 09:46:29 +02:00
Lukasz Gromanowski
566211e753
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-03 22:39:05 +02:00
MiroslavR
95be7ea738
Revert spelling change to preserve consistency, fix a typo
2014-10-03 22:38:06 +02:00
MiroslavR
4829b1f9cc
Support "right" alignment in books
2014-10-03 22:30:46 +02:00
MiroslavR
a13039ad1f
Allow alignment for images in books
2014-10-03 21:36:45 +02:00
MiroslavR
3287d0b6ef
Fix line breaks around IMG tags.
2014-10-03 21:08:52 +02:00
MiroslavR
c5e85ebddc
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-03 21:02:15 +02:00
scrawl
cecc64752e
Increase maximum height for finding spawn points ( Fixes #1633 , Fixes #1881 )
2014-10-03 18:51:18 +02:00
scrawl
d4ac5c0b57
Use a raycast to find spawn point if convexSweepTest doesn't find one ( Fixes #1623 , Fixes #1679 )
2014-10-03 18:49:41 +02:00
scrawl
6fc53e73ad
Don't run AI for knocked-out actors ( Fixes #1854 )
2014-10-03 15:58:14 +02:00
scrawl
81a9dc0655
Hotfix for not being able to scroll the world map
2014-10-02 22:44:06 +02:00
scrawl
083bcaf483
Fix journal quest logs not being marked finished when there are multiple quest IDs in the log
2014-10-02 19:26:37 +02:00
scrawl
8dc20712de
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5
Fix for crash in main menu when reflections are enabled
2014-10-02 18:12:49 +02:00
Marc Zinnschlag
a166034e12
Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup'
2014-10-02 17:19:32 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
2014-10-02 16:50:05 +02:00
scrawl
cc63f7f051
Fix broken idle camera
2014-10-02 14:23:13 +02:00
scrawl
afbd2de511
Fix broken alchemy magnitude/duration
2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf
Fix uninitialized flags for custom-made spells
2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67
Remove comment for old MyGUI version
2014-10-02 13:55:42 +02:00
Jordan Ayers
3bc91c66e6
Disease Check: Shorten the resistance calculations.
2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85
Disease check: Reuse corprus check from spells.hpp.
2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9
Don't update physics and animation for actors outside the AI processing distance
2014-10-02 00:27:04 +02:00
scrawl
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6
Apply third person camera distance to the camera node instead of only the camera itself ( Fixes #1705 )
2014-10-02 00:26:57 +02:00
scrawl
f9b6cc468d
Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action ( Fixes #1960 )
2014-10-01 17:54:18 +02:00
scrawl
46adf6344a
Adjust third person camera height and default distance to match vanilla MW
2014-10-01 17:45:20 +02:00
