scrawl
97dbd07ed2
Merge pull request #1236 from akortunov/guifixes
...
Minor GUI fixes
2017-03-25 13:36:58 +01:00
Andrei Kortunov
7bd0c74aa8
Fixes mWatchedTimeToStartDrowning initialization (fixes bug #3801 )
2017-03-25 14:15:16 +04:00
Andrei Kortunov
e383e4d023
Disabled hit overlay for damage/absorb mana/fatigue spells
2017-03-25 14:10:19 +04:00
scrawl
373bd78cf3
Merge pull request #1233 from akortunov/guifixes
...
Vanilla style drowning widget
2017-03-24 18:10:11 +01:00
Andrei Kortunov
b89fdcfd27
Vanilla style drowning widget (partially fixes bug #3801 ).
2017-03-24 09:41:18 +04:00
scrawl
338592b99b
Don't clear the animation queue when turning (Bug #3581 )
...
Otherwise, the turnAnimationThreshold would make it difficult to estimate when we can start playing the animation.
2017-03-23 20:05:06 +01:00
scrawl
a5d7b36c28
Don't clear idle animation when movement ends (Bug #3581 )
...
This caused problems when AiWander tried to start an idle animation in the frame after movement stops.
2017-03-23 20:05:05 +01:00
scrawl
c611ddba8d
Remove stray term
2017-03-23 20:05:05 +01:00
scrawl
f230df3d1c
Merge pull request #1232 from akortunov/tooltipfix
...
Tooltip maximum width cap
2017-03-23 17:12:36 +01:00
Andrei Kortunov
1a47b9727b
Changed tooltip maximum width (bug #3800 )
2017-03-23 14:31:01 +04:00
scrawl
02c6c1897e
Merge pull request #1230 from Allofich/stats
...
Change bounds behavior of stat script commands
2017-03-22 20:22:45 +01:00
Allofich
5282556ae0
Show names on combat actors when RMB GUI is active
...
Fixes (#3797 )
2017-03-22 20:04:29 +09:00
Allofich
57aeec59d5
Change bounds behavior of stat script commands
...
Fixes (#3776 )
2017-03-22 15:17:44 +09:00
Andrei Kortunov
1286754fb3
Add a new option to show arrow damage (feature #2923 )
2017-03-18 08:07:36 +04:00
Andrei Kortunov
eb81ab5b24
Disables weapon and spells cycling in GUI mode (bugs #2409 , #2483 , #2645 )
2017-03-15 17:07:25 +04:00
scrawl
e987fe85d0
Add abort flag to TerrainPreloadItem
2017-03-14 21:28:57 +01:00
scrawl
42e9891504
Fix issues caused by loading multiple views into the same terrain View
2017-03-14 20:27:55 +01:00
scrawl
97ed999097
Fix cleanup issue
2017-03-14 20:02:22 +01:00
scrawl
c22fde2bcd
Preload terrain while reading savegame
2017-03-14 19:27:56 +01:00
scrawl
9371100fde
Reuse the intersection visitor and set a traversal number to allow the terrain component to manage its view more efficiently
2017-03-14 19:27:56 +01:00
scrawl
59bf100907
Fill exteriorPositions in preloadFastTravel
2017-03-14 19:27:56 +01:00
scrawl
03c07d3bd5
Remove old code
2017-03-14 19:27:56 +01:00
scrawl
86e75f0987
Preload terrain even when cell preloading is disabled
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
2017-03-14 19:27:56 +01:00
scrawl
3c29e2dbeb
Refactor ownership of terrain views
2017-03-14 19:27:56 +01:00
scrawl
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
ec0b743123
Revert "Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer."
...
This reverts commit 7d72c70c93ee3c0cc3d00d37b22c339d0103cd19.
2017-03-14 19:27:56 +01:00
scrawl
4549196b31
Use the new way of terrain preloading in CellPreloader/Scene
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
19d516cbda
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
c684860e3b
Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer.
2017-03-14 19:27:55 +01:00
scrawl
2d549d088e
Get the world size from the ESM::Land store
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
2017-03-14 19:27:55 +01:00
scrawl
e323b2fa7b
Use the SceneManager's ShaderManager
2017-03-14 19:27:55 +01:00
scrawl
0fc465da59
Store the min/max height in LandData
2017-03-14 19:27:55 +01:00
scrawl
051c17a184
Make reportStats const
2017-03-14 19:27:55 +01:00
scrawl
2c68ed4fb4
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
2017-03-14 19:27:55 +01:00
scrawl
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
2017-03-14 19:27:55 +01:00
scrawl
b898315962
cellpreloader: abort all tasks first before waiting
2017-03-14 19:27:55 +01:00
scrawl
5f76317807
Wait for completion of CreateMapItem on exit to avoid potential threading issue
2017-03-14 19:27:55 +01:00
scrawl
804f873649
terrain: factor out texture caching into a separate class
2017-03-14 19:27:55 +01:00
scrawl
ccfebdd2c3
Set the underwater fog relative to default view distance
2017-03-14 19:27:44 +01:00
scrawl
fe439e7bbf
Add missing default material state for character preview
2017-03-14 05:02:31 +01:00
scrawl
37c71c15f2
Remove redundant state
2017-03-14 04:57:36 +01:00
scrawl
4c9bbce1e2
Fix node mask being reset
2017-03-14 01:01:50 +01:00
MiroslavR
a8517c34eb
Code style
2017-03-13 13:57:05 +01:00
scrawl
a556475fae
Explicitely set the user data type to avoid const/non-const mismatch
2017-03-13 02:48:23 +01:00
scrawl
5de5be77f3
Fix Ptr/ConstPtr userdata mismatch (Bug #3784 )
2017-03-13 02:48:23 +01:00
Mitchell Schwitzer
421b92ae05
fix styling & add missing lines regarding max proficency
2017-03-12 17:24:43 -07:00
Mitchell Schwitzer
f31e5ba85e
fix display maximum proficency reached
2017-03-12 17:02:07 -07:00
Mitchell Schwitzer
7960d5a9a7
fix skill progress bar v2
...
both widgets display their own progess indicator. it was being set for
value (when you hovered over the level of your skill, eg the "5" in
"Acrobatics 5"), but not for the name.
this fixes that, but the progress information is being stored/displayed
by two different widgets for one skill
2017-03-12 16:52:29 -07:00
Mitchell Schwitzer
465b7361e1
fix skill window update
...
invoke winMgr->updateSkillArea() in mechanicsmanagerimp.cpp after looping
over ESM::Skill::SkillEnum if any updates have occurred.
2017-03-12 15:18:02 -07:00
scrawl
809f5cd01b
Fix bad override
2017-03-08 01:28:56 +01:00
MiroslavR
af1fe64408
GetSoundPlaying called on an equipped item now also looks for sounds played by the equipping actor ( Fixes #3781 )
2017-03-07 19:00:09 +01:00
scrawl
4123398cbc
Change no-grab setting to respect the value given
2017-03-04 21:48:31 +01:00
scrawl
7eb48ea83b
Don't wrap mouse to window bounds when the gamepad axis did not move and fix off-by-one error
2017-03-04 21:48:31 +01:00
scrawl
42a04de37c
Fix a crash that occurred when a carried light fails to be attached.
2017-03-04 21:48:31 +01:00
scrawl
2776727794
Allow gamepad and mouse/keyboard to be used at the same time ( Fixes #3093 )
2017-03-04 21:48:31 +01:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
scrawl
2873c10284
Clean the object root of StateSets and hidden nodes
2017-03-01 03:09:32 +01:00
scrawl
4e0011bfc8
Improve NPC loading performance by caching the cleaned objectRoot
2017-03-01 03:00:49 +01:00
Rafael Moura
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
2017-02-28 19:11:00 +00:00
Rafael Moura
7fa2703715
Porting more ContainerStoreIterator usage to const version #3
2017-02-28 14:31:51 +00:00
Rafael Moura
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
2017-02-27 21:50:10 +00:00
scrawl
0772a03e98
Print the object ID that animateCollisionShapes did not find the node for
2017-02-27 00:41:27 +01:00
scrawl
d4781d419f
Merge pull request #1220 from MiroslavR/tcl_collision
...
Fix actors colliding with noclipping player
2017-02-26 23:27:40 +01:00
Rafael Moura
05cc69f6f1
Porting more ContainerStoreIterator usage to const version
2017-02-26 21:24:51 +00:00
scrawl
6f4c03aa32
Avoid retrieving setting every frame
2017-02-26 17:34:24 +01:00
MiroslavR
498a3d450b
Fix actors colliding with noclipping player
2017-02-26 04:28:28 +01:00
scrawl
75677f03e7
Remove SceneManager::notifyAttached
2017-02-24 02:58:41 +01:00
scrawl
afa39d121f
Fix 'part has no parent' warning caused by destructing in the wrong order
2017-02-24 02:58:41 +01:00
scrawl
a55604c549
Avoid unnecessary AABB update when actor position has not changed
2017-02-24 02:58:41 +01:00
scrawl
fb073e5c14
Avoid unnecessary AABB update for rotationally invariant collision shapes
2017-02-24 02:58:41 +01:00
scrawl
5198fc897d
Fix collision glitch caused by Bullet AABB not being updated when an actor moves without turning
2017-02-24 02:58:41 +01:00
scrawl
25ca89b560
Avoid redundant allocations in Store::search
2017-02-23 23:28:50 +01:00
scrawl
732212070d
crashcatcher: complain when launching gdb fails
2017-02-23 23:28:49 +01:00
scrawl
d163228199
Fix updatePtr
2017-02-22 21:02:34 +01:00
scrawl
00d4fea91c
Derive Animation from osg::Referenced to allow the UnrefQueue to delete it
2017-02-22 15:27:20 +01:00
scrawl
a5247394dc
(Re)set the inventory listener outside of the Animation class
2017-02-22 15:08:22 +01:00
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
2017-02-22 14:28:45 +01:00
scrawl
b40ca9b60a
Set the window rectangle on the Viewer's EventQueue
2017-02-22 01:49:54 +01:00
scrawl
0fbd29ccb8
Use additive alpha blending on the character preview
2017-02-21 18:29:18 +01:00
scrawl
e38221edc9
Set character preview's simulationTime to 0 to avoid flickering lights
2017-02-21 18:25:25 +01:00
scrawl
a45335ffc3
Do not reduce magicka in god mode
2017-02-21 16:33:18 +01:00
scrawl
eefe1ed1a8
Fix being affected by Silence in god mode
2017-02-21 15:48:45 +01:00
scrawl
b9740fd2a1
Fix btHeightFieldTerrainShape triangle layout to match rendering
2017-02-21 04:47:11 +01:00
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
2017-02-21 04:32:59 +01:00
scrawl
9728a6967e
Reset fall height when teleporting ( Fixes #2629 )
2017-02-20 20:27:05 +01:00
scrawl
05ad0dca34
Use ActionTeleport in COE/COC commands
2017-02-20 20:26:45 +01:00
scrawl
7e02bb7348
Preload summoned creature models before the spell is cast
2017-02-20 19:58:00 +01:00
scrawl
22482b7eec
Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes
2017-02-20 19:04:02 +01:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
scrawl
481c440698
Print OSG version on startup
2017-02-19 13:26:45 +01:00
Rafael Moura
ecbde7b11e
Added ConstContainerStoreIterator
...
using base template for ContainerStoreIterators
less template arguments for ContainerStoreIteratorBase
2017-02-18 13:47:18 +00:00
Allofich
bc60421615
Change NPC equip logic to be more like original
...
(Bug #3754 )
2017-02-18 21:59:09 +09:00
scrawl
f2174ee9f4
Merge pull request #1217 from Allofich/follow
...
Fix loading 0-duration Follow and Escort packages
2017-02-17 21:10:15 +01:00
Allofich
3897c49e30
Fix loading 0-duration Follow and Escort packages
...
(Fixes #3755 )
2017-02-18 01:55:50 +09:00
MiroslavR
f883951d75
Fix incorrect calculation of armor rating (Bug #3754 )
2017-02-17 03:11:37 +01:00
Allofich
621d3e56cf
Fix Clang and OS X Travis CI warnings
2017-02-17 02:08:39 +09:00
scrawl
f10edb71cc
Add environment variable for disabling IncrementalCompileOperation
2017-02-15 21:01:25 +01:00
scrawl
c4a89065a2
Preload VFX of spells selected by AI actors
2017-02-15 21:01:25 +01:00
scrawl
57b585570a
Preload magic effect visuals of the player's selected weapon/spell
2017-02-15 21:01:25 +01:00
scrawl
183c46b0ef
Fix summoning effects
2017-02-14 07:58:16 +01:00
scrawl
a495b9b884
Fix wasteful allocations in Store<Land>::search
2017-02-14 07:58:16 +01:00
scrawl
72c6b11cf8
Move global map render to the worker thread
2017-02-14 07:58:16 +01:00
scrawl
026a05718f
Construct the WorkQueue in Engine
2017-02-14 07:58:16 +01:00
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
2017-02-14 07:58:16 +01:00
scrawl
325bf66653
Return const Land in ESMStore
2017-02-14 07:58:16 +01:00
Marc Zinnschlag
93c5630e02
Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents'
2017-02-13 10:06:08 +01:00
scrawl
051b4038d9
Merge pull request #1203 from Allofich/magic
...
Make AI not go hostile when absorbing/reflecting
2017-02-12 17:18:10 +01:00
MAtahualpa
c46eadae90
Update actionread.cpp
...
*grrr* Forgot to change the latter "mSkillID" in line 47...
2017-02-12 17:17:33 +01:00
scrawl
cdf65ef681
Merge pull request #1201 from Allofich/hit
...
Prevent AI actors from hitting unintended targets
2017-02-12 16:25:52 +01:00
scrawl
342c25dffa
Fix weather sounds playing at full volume before fading in
2017-02-12 15:44:33 +01:00
Allofich
72c3ee0a3d
Make AI not go hostile when absorbing/reflecting
2017-02-12 23:14:09 +09:00
MAtahualpa
7bc65ce05b
Update actionread.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:52:11 +01:00
Allofich
6b53541571
Prevent AI actors from hitting unintended targets
...
(Fixes #3254 )
2017-02-12 19:51:19 +09:00
scrawl
9fa8e88366
Revert "Don't create a CharacterController for objects with no animations"
...
This reverts commit cce42b6e9d
2017-02-12 10:22:11 +01:00
scrawl
03a10f217a
Catch exceptions in AiSequence::execute
2017-02-11 17:53:11 +01:00
scrawl
5a12407436
Revert "Rearranged check for better performance"
...
This reverts commit 332ceb51a2
2017-02-11 17:53:11 +01:00
scrawl
f2d4f290cc
traceDown fix
2017-02-11 17:53:11 +01:00
Allofich
e047679595
Fix trying to access stats on non-actors
2017-02-11 19:59:42 +09:00
scrawl
332ceb51a2
Rearranged check for better performance
2017-02-10 06:48:03 +01:00
scrawl
8752ae9c6a
Fix include
2017-02-10 06:28:23 +01:00
scrawl
bbcba57495
Disable hitAttemptActorId saving code for now
2017-02-10 06:26:32 +01:00
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +01:00
scrawl
dd54887783
Fix node mask of CharacterPreview being reset
2017-02-10 03:31:37 +01:00
scrawl
6ecc008813
Fix an issue uncovered by the last commit related to changing actor position without properly moving the actor
2017-02-10 02:43:49 +01:00
scrawl
cf7b0098ed
Slightly increase backoff value
2017-02-10 02:05:12 +01:00
scrawl
b3d5c2bd7f
Use the actor's collision shape in findGround()
...
The cylinder base is no longer appropriate as of the change to capsules.
This also works around a bug when tracing a small cylinder/box shape apparently introduced with bullet 2.86.
2017-02-10 02:00:52 +01:00
scrawl
67e4a7e37b
Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead
2017-02-09 04:51:20 +01:00
scrawl
3f3d00ffc9
Add CellPreloader::clear to avoid potential dangling CellStore pointer and to more aggressively clear preload state from a previous game
2017-02-09 04:03:38 +01:00
scrawl
0be86f69bc
Write the player object first to increase the chance of preloading the player cells in time
2017-02-09 03:55:10 +01:00
scrawl
1d8a9ff622
Preload player cell as soon as the player is read from the savegame
...
Giving the worker thread something to do while the rest of the savegame is parsed.
2017-02-09 03:47:36 +01:00
scrawl
d141b98f0c
Add base animations to preloadCommonAssets
2017-02-09 03:32:40 +01:00
scrawl
066aa2e60e
Always run preloadCommonAssets even when the menu is skipped
...
Move to before the content files are loaded so we can do preloading in parallel with content file loading
2017-02-09 03:16:36 +01:00
scrawl
c68f662c9a
Predict player movement when preloading cells to better handle moving at high speed
2017-02-09 01:34:42 +01:00
scrawl
a46593fa74
Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread
2017-02-09 01:08:07 +01:00
scrawl
d62c4259bd
CellPreloader: load the terrain first to match the order in the main thread
2017-02-09 01:07:27 +01:00
scrawl
d1e86d22ca
Check which local map textures actually need to be updated
...
On a typical exterior cell transition, we'll save 3 of 9 map renders. When moving back and forth between 2 cells, we can even reuse 6 of 9.
2017-02-08 22:20:57 +01:00
scrawl
43d9f3d5c7
Update bullet debug drawer even when the game is paused so the collision mesh will show instantly even when the console is up
2017-02-08 18:53:24 +01:00
scrawl
249fe9077b
Handle 'tcb' command as an alias for 'tcg'
2017-02-08 18:51:07 +01:00
scrawl
206e2bf975
Fix camera rotation not being set after save game load (regressed with 1eb3384043)
2017-02-08 04:42:15 +01:00
scrawl
35bb467c7a
Fix inverted setting of variable
2017-02-07 05:28:06 +01:00
Allofich
5d2090684a
Store mHitAttemptActorId in save files
2017-02-07 01:26:26 +09:00
