mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:49:55 +00:00
Code Issues Releases Wiki Activity
17995 commits 38 branches 54 tags 122 MiB
Commit graph

13400 commits

Author SHA1 Message Date
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
5fb854036d Use a forward declaration to avoid having to workaround Qt MOC 
Don't think that guard was still needed, but a forward declaration is better anyways.
 2017-03-14 19:27:55 +01:00
scrawl
80a0398f9d Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads 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
Marc Zinnschlag
765401531d Merge remote-tracking branch 'origin/master' 2017-02-23 09:03:31 +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
FedeWar
e9076088ca Another tab fix 2017-02-21 11:51:11 +01:00
FedeWar
4e7f7cf84f Fixed tabs 2017-02-21 11:49:04 +01:00
FedeWar
370c12e78a Verification results are ordered by Type in alphabetical order. 2017-02-21 11:15:53 +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
scrawl
e4741db069 Merge pull request #1213 from Allofich/equip 
Change AI equip logic
 2017-02-19 10:47:19 +01:00
MAtahualpa
fb8a2093cd Replace "Female" check box with a combo box, part 2/2 (fixes #3757) 
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.

Related issue:
- Fixes #3757: Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
 2017-02-18 15:40:07 +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
Marc Zinnschlag
bef0b1f1d6 Merge remote-tracking branch 'matahualpa/openmw-cs_gender' 2017-02-18 09:57:09 +01: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
scrawl
cb142f01e4 Merge pull request #1215 from MiroslavR/armor_rating 
Fix incorrect calculation of armor rating
 2017-02-17 18:52:07 +01:00
Allofich
3897c49e30 Fix loading 0-duration Follow and Escort packages 
(Fixes #3755)
 2017-02-18 01:55:50 +09:00
MAtahualpa
520e82ed4f Fix for commit "affc0eb..." in PR 1216 (fixes #3756) 
Fixed use of tab character.
 2017-02-17 17:54:38 +01:00
MAtahualpa
affc0eb37f Replace "Female" check box with a combo box, part 1/2 (fixes #3756) 
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.

Related issue:
- Fixes #3756: Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
 2017-02-17 17:05:46 +01:00
Marc Zinnschlag
79956e4b49 Merge remote-tracking branch 'origin/master' 2017-02-17 08:54:19 +01: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
MAtahualpa
dab8b328c4 Replace light emitter check boxes with a combo box (fixes #3752) 
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.

Related issue:
- Fixes #3752: Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
 2017-02-16 12:48:47 +01:00
MAtahualpa
7be46eb1f0 Fix for commit "d4972ab..." in PR 1208 (fixes #3751) 
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
 2017-02-16 00:08:38 +01:00
MAtahualpa
d4972ab166 Replace "Xyz blood" check boxes with a combo box (fixes #3751) 
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Related issue:
- Fixes #3751: OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
 2017-02-15 23:06:36 +01: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
Marc Zinnschlag
e46fb1770c Merge remote-tracking branch 'matahualpa/openmw-cs_booktype' 2017-02-15 19:47:39 +01:00
MAtahualpa
2c34a8706b Replace "Scroll" check box with a combo box (fixes #3748) 
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
 2017-02-15 18:59:55 +01:00
MAtahualpa
607bd8b853 Replace "Scroll" check box with a combo box (fixes #3748) 
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
 2017-02-14 11:48:37 +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
MAtahualpa
2d1af3ee4a Update record.cpp 
This should be the last instance of "mSkillID". Let's see what Travis says about it...
 2017-02-12 20:55:50 +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
MAtahualpa
347fb1ff4b Update converter.hpp 
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
 2017-02-12 13:51:36 +01:00
MAtahualpa
c5dcfe0794 Update refidadapterimp.cpp 
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
 2017-02-12 13:50:58 +01:00
MAtahualpa
6587880171 Update refidcollection.cpp 
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746: OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
 2017-02-12 13:03:37 +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
Allofich
25c64dbb0f Make combat engagement logic more like vanilla 
(Fixes #2678, Fixes #3705)
 2017-02-07 01:25:12 +09:00
scrawl
5a939418fc Add missing avcodec_close (Fixes #3741) 2017-02-06 15:49:13 +01:00
scrawl
91939c4687 Switch actors to capsule shapes now that the jumping bug is gone (Fixes #2116, Fixes #2909) 
The culprit was - surprise, surprise - d39d4f2619
 2017-02-06 05:40:49 +01:00
scrawl
03aa270551 Construct PhysicActor as on ground by default to avoid a jumping animation from playing in the first frame after a savegame load 2017-02-06 05:23:00 +01:00
scrawl
bc29a99a53 Fix broken timer 2017-02-06 05:10:40 +01:00
scrawl
d39d4f2619 Revert a problematic and performance costly workaround that should never have been applied and is no longer required as of the last commit. 2017-02-06 04:52:41 +01:00
scrawl
541fbb4792 Movement solver: add usage of 'on slope' flag to improve handling of steep slopes 
Previously we were handling 'on slope' synonymously with 'in air' which caused some odd effects.

Practical changes:
 - Sliding down a slope no longer applies fall damage.
 - Fixed a climbing exploit that would allow climbing steep slopes with repeated use of the Jump function.
 2017-02-06 04:50:58 +01:00
scrawl
cce42b6e9d Don't create a CharacterController for objects with no animations 2017-02-06 03:43:08 +01:00
scrawl
fe0cf5be05 StatsWindow: don't rebuild all skill widgets when one skill changes 2017-02-06 02:40:35 +01:00
scrawl
e7b6ea4e3f Add cycle weapon/spell actions to the list of controller actions (Fixes #3613) 2017-02-05 20:23:49 +01:00
scrawl
3065600a86 Skip expensive visitEffectSources call if no summoned creatures or summon effects are active 2017-02-05 02:26:28 +01:00
scrawl
ee4073541c Animation: cache getVelocity() 2017-02-05 02:26:28 +01:00
scrawl
a2cede8f34 Add timer for updateEquippedLight 2017-02-05 02:26:28 +01:00
scrawl
1eb3384043 Avoid rotating by zero in CharacterController 2017-02-05 02:26:28 +01:00
scrawl
7201cf5fe2 ItemWidget: skip setImageTexture if the icon has not changed 2017-02-05 02:26:27 +01:00
scrawl
1447bfa215 Improve scene loading performance by creating collision objects with the correct rotation right away instead of adjusting it later 2017-02-04 15:12:01 +01:00
scrawl
884d306bf3 Throw exception when told to use 0 threads 2017-02-04 05:58:12 +01:00
scrawl
2db7292bcb Add new setting for the number of preloading worker threads 
If you have CPU cores to spare, consider setting 2 or 3. Up to about 3 threads, preloading performance seems to increase in a linear fashion, but with 4 or more threads I/O bottlenecks and synchronization overhead starts to show.
 2017-02-04 02:59:28 +01:00
scrawl
eaeba4138b Move the deletion of PreloadItem to the worker thread 2017-02-04 02:36:44 +01:00
scrawl
33e654f94d Add explicit handling of most commonly used nodes to NodeVisitors to avoid excessive virtual function calls 2017-02-04 02:16:26 +01:00
scrawl
83a9435167 Fix unnecessary use of CopyFramebufferToTextureCallback when loading is too fast for a loading screen to be displayed 2017-02-03 23:39:39 +01:00
scrawl
767eba941f Speed up finding of attachment node by using the cached nodeMap 2017-02-03 23:15:37 +01:00
scrawl
a76d693627 Speed up ControllerVisitor by skipping sub graphs that have no ChildrenRequiringUpdateTraversal() 2017-02-03 23:10:14 +01:00
scrawl
c58fc6d276 Improve performance of loading screen by not recomputing the bounding sphere of the entire scene after each loading step 2017-02-03 22:29:38 +01:00
scrawl
0be811c519 Update the resource cache every second instead of every frame 
A dry run takes about ~1.5ms. Even though it's all done in the worker thread, the locks used can stall loading operations that are about to happen in other threads, and just in general this CPU load is unnecessary.
 2017-02-03 03:44:30 +01:00
scrawl
6d8c414071 Set osgViewer ReleaseContextAtEndOfFrameHint to false for better performance when in SingleThreaded mode 
The flag is normally set to off by default when using Viewer::run() - however since we're using our own frame loop, we have to unset the flag ourselves
 2017-02-02 22:16:59 +01:00
scrawl
c5f8ff6e0e Add names to several nodes for debugging purposes 2017-02-02 21:49:52 +01:00
scrawl
625c5040ce Fix build 2017-02-01 15:49:20 +01:00
scrawl
1808b8567e Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera] 2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee Add 'small feature culling pixel size' setting 2017-02-01 06:00:14 +01:00
scrawl
960d4a96c3 Reduce the number of osg::Material state by setting the default state on the graph root 2017-02-01 06:00:14 +01:00
scrawl
34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 2017-02-01 06:00:14 +01:00
MiroslavR
d97e9cfe7e Fix InterpreterContext::updatePtr updating mLocals to the implicit ref's locals when interpreting a targeted global script (Fixes #3738) 
The interpreter context of a targeted global script would point to the target's locals instead of the global script instance's locals when the target changed cell during script execution. Credit to scrawl for the solution.
 2017-01-29 13:29:53 +01:00
MiroslavR
c64351b3e8 ESS-import: player is no longer disabled (Bug #3246) 2017-01-21 03:39:51 +01:00
scrawl
cc19b4bd8a Fix door rotation order in collision case (Bug #3707) 2017-01-19 02:19:44 +01:00
scrawl
45fb4f04b1 Update reference of the interpreter context when an Activate results in a take action (Fixes #3727) 2017-01-18 21:57:50 +01:00
scrawl
70c5f64caa Fix mLocals not being updated in InterpreterContext::updatePtr 2017-01-18 21:55:58 +01:00
scrawl
c6822b9eb6 Merge pull request #1192 from damiel/water_refactor 
Added refactoring of shader handling from visvalda's fog shader
 2017-01-16 18:26:28 +01:00
Martin-Kevin Neumann
5a8efa1649 added refactoring of shader handling from visvalda's fog shader 2017-01-15 14:17:22 +01:00
NeveHanter
e82d542d89 Merge remote-tracking branch 'upstream/master' into bugfix-3617 2017-01-15 09:49:45 +01:00
NeveHanter
811e9ad9f3 Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater. 
Also allowed projectiles to fly through the dead bodies as in vanilla.
 2017-01-15 09:49:25 +01:00
Allofich
f2240dde9c Allow command spells to work when cast by AI on AI 
(Fixes #3723)
 2017-01-15 01:56:22 +09:00
Allofich
e825010107 Apply command spell effects on impact 
Command spells should apply their effects, including taking an actor out
of combat, every time a spell successfully hits, even if a previous
command effect is still active.
 2017-01-15 01:53:22 +09:00
Allofich
a46c4de918 Stop combat when adding an AI package to an actor 
(Fixes #3722)
 2017-01-15 01:53:22 +09:00
scrawl
b87abb0456 Reset activation flags when an object is copied (Fixes #3671, Fixes #3719) 2017-01-14 15:29:36 +01:00
scrawl
69ce9f32bc Activate/OnActivate fix (Bug #3712) 2017-01-14 00:10:43 +01:00
scrawl
73aa07b81b Merge pull request #1189 from Allofich/attack 
Match best attack selection to vanilla behavior
 2017-01-11 18:36:10 +01:00
Allofich
2322ab3125 Don't make Command spells cancel AI packages 
(Fixes #3649)
 2017-01-12 00:07:22 +09:00
Allofich
c10585fb07 Match best attack selection to original MW 
(Fixes #3721)
 2017-01-11 22:22:46 +09:00
MiroslavR
f1f9209814 Creatures now auto-equip shields (Fixes #3704) 2017-01-08 20:52:04 +01:00
Allofich
5e992a0342 Fix attempting to access NPC stats on creatures 2017-01-06 02:58:24 +09:00
Assumeru
1a073ca642 Fix teleportation being unreachable 2017-01-03 22:02:23 +01:00
Allofich
eee49b7ea7 Make dispel an instant effect again (Fixes #3695) 2017-01-02 17:35:50 +09:00
scrawl
80c008906b Fix texture coordinates 2017-01-02 04:50:33 +01:00
scrawl
48a23d61b2 Mask out water in global map overlay 2017-01-02 04:01:04 +01:00
scrawl
7b5f3e3cdc Fix crash in ProjectileManager when a sound id fails to play or is not found 2017-01-01 21:34:31 +01:00
scrawl
708009eac4 Merge pull request #1158 from logzero/move3 
[RFC] Movement solver experiments
 2017-01-01 20:44:41 +01:00
scrawl
212e85e810 Merge pull request #1174 from Allofich/combat 
Adjustments to AI combat engaging and disengaging
 2017-01-01 19:36:09 +01:00
scrawl
da3815f5a6 Merge pull request #1179 from Armada651/fix-audio-cutoff 
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
 2017-01-01 19:13:32 +01:00
logzero
dbf0fa6766 Skip stepping if movement tracer hits actor. 2016-12-31 10:57:06 +01:00
Marc Zinnschlag
dedd95f52a Merge remote-tracking branch 'miroslavr/save-cleanup' 2016-12-29 08:37:59 +01:00
Jules Blok
e9d8ff532f OpenAL_Output: When a source is finished, rewind it instead of stopping it. 
This works around a bug in the MacOS OpenAL implementation.
 2016-12-29 01:03:13 +01:00
MiroslavR
c9dd63af8d Merge pull request #1171 from NeveHanter/travel-followers-cost 
Implemented "paying" for travelling followers
 2016-12-26 22:34:39 +01:00
NeveHanter
8568cd049f Removed "less" character from the documentation by the requested opportunity. 2016-12-26 21:46:43 +01:00
Allofich
54fa921dad Change some AI combat engagements to not need LOS 2016-12-26 22:42:46 +09:00
Allofich
6fa0354a17 Make AI attack player also if it attacks follower 2016-12-26 22:42:45 +09:00
Allofich
5a6ea4e84e Cleanup 2016-12-26 22:42:44 +09:00
Allofich
e10c4d8814 Stop combat between AI when canFight is false 2016-12-26 22:42:42 +09:00
Allofich
e8c7ad2f4b Change environment check to canFight check 
Instead of just checking that combatants are in compatible environments,
allow combat if in attack range using canFight. Together with previous
commit, fixes #3690.
 2016-12-26 02:14:01 +09:00
Allofich
588442b6cc Make enemies start combat with player followers 
Recreates vanilla behavior of enemies starting combat with player
followers and escorters. (Fixes #3691)
 2016-12-26 02:13:54 +09:00
logzero
a5360483bb Back off slightly when we are touching something. 
This can reduce the amount of movement solver failures significantly.
I've observed a drop of 8 iteration cases by almost factor of ten.
 2016-12-25 15:34:43 +01:00
logzero
00f3bfba27 Use tracer hit height to skip stepping up in movement solver. 2016-12-24 23:07:44 +01:00
MiroslavR
c2b491cd70 ESSImporter: Convert last known exterior cell (Fixes #3693) 
+ some research
 2016-12-24 18:30:39 +01:00
logzero
ab1724d3db Compare new velocity to the original velocity. 
Using old velocity seems awkward,
probably a copypaste/refactoring bug.
 2016-12-24 12:38:23 +01:00
logzero
e58de5e410 Remove superfluous velocity reflection in movement solver. 
The slide projection negates the reflection effect.
Just to be sure I've compared the resulting vectors
with and without reflection at runtime.
 2016-12-24 12:29:09 +01:00
NeveHanter
ff4aba2a6e Moved duplicated code to common ActionTeleport static method and reordered travel price calculations 2016-12-23 21:27:29 +01:00
MiroslavR
5f234f8952 Dialogue: "PC Rank" condition now uses speaker's faction if "PC Faction" is not given (Fixes #3689) 2016-12-23 19:03:59 +01:00
MiroslavR
87fd011a28 Clean-up saves by dropping references with invalid RefNums (Fixes #1956) 2016-12-22 20:48:58 +01:00
scrawl
cf496287f7 Silence static analysis warnings 2016-12-22 14:43:54 +01:00
logzero
50fd913058 Refactor stepMove function into a Stepper object 
to be able to reuse up stepper results
for successive movement solver iterations.
This can reduce the number of convex casts
almost by half in some cases.
 2016-12-21 19:02:42 +01:00
logzero
4f6e65e481 Apply sliding upward check to new velocity. 
This helps to capture the case where new velocity
only differs in the z component (normal pointing up).
TODO: Find a better way to handle the normal pointing up case.
 2016-12-21 19:02:42 +01:00
logzero
0b08802910 Integrate MinStep move attempt into stepMove. 
This can save 1 to 3 convex casts per iteration.
 2016-12-21 19:02:41 +01:00
logzero
25a0219e4d Use cosine of max slope angle for walkable slope checks in movement solver. 2016-12-21 19:02:41 +01:00
logzero
561e0cbbf9 Use squared length for distance checks in movement solver. 2016-12-21 19:02:40 +01:00
scrawl
dc1f788cff Use osg::PI over M_PI 2016-12-21 16:49:37 +01:00
NeveHanter
15cd3c178b Clamp price multiplication to 1, as it resulted in player alone traveling at no fee. 2016-12-20 21:23:55 +01:00
NeveHanter
8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 2016-12-20 12:38:51 +01:00
MiroslavR
cd13570230 ESSImporter: Import mark location 2016-12-18 04:37:59 +01:00
scrawl
6140768783 Enable waterCollision after moving the player above water (Fixes #3672) 2016-12-17 23:21:33 +01:00
Aussiemon
2f66b91ac5 Added check to prevent attempted wandering of empty paths 2016-12-16 15:18:28 -07:00
scrawl
913a8fe1bd Merge pull request #1160 from Aussiemon/actorupdatecollision 
[Do not merge yet] Added check before attempting to remove actor's collision object
 2016-12-16 20:46:00 +01:00
Aussiemon
b794aa7c2f Helper methods for updateCollisionMask(), prevent water collision being removed twice, remove Bullet 2.8.5 methods 2016-12-16 12:22:07 -07:00
scrawl
f8690dcd20 Set the drag-and-drop state after initiating the drag, not before (Fixes #3134) 2016-12-16 20:16:59 +01:00