Bret Curtis
b7c27e5e96
remove boost/tuple
2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b
remove more unused imports, including boost headers
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Bret Curtis
c8b67221d7
use nullptr instead of NULL
2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
Andrei Kortunov
3190f28710
Spell priority: make AI do not cast target spells under water
2017-06-09 10:23:46 +04:00
Andrei Kortunov
4bb9622c21
Handle greetings differently from responses
2017-06-08 22:40:31 +04:00
scrawl
59eb0aba7d
Merge pull request #1310 from akortunov/guifixes
...
Removed empty space before dialogue entry (bug #3892 )
2017-06-07 21:55:45 +02:00
Andrei Kortunov
c2962ced90
Removed empty space before dialogue entry (bug #3892 )
2017-06-04 23:20:43 +04:00
scrawl
172cc65be9
Merge pull request #1308 from akortunov/spellpriority
...
Spell priority: dispel usage improvements
2017-06-04 12:49:53 +02:00
Andrei Kortunov
00402b7154
Removed unused variable
2017-06-04 14:09:23 +04:00
scrawl
70e02f4c28
Merge pull request #1306 from Nialsy/master
...
Fixed quickload with menus open
2017-06-04 11:18:49 +02:00
Andrei Kortunov
f4a187a9c2
Move a setting to show enchanting success chance from GUI to Game section
2017-06-03 23:03:24 +04:00
Andrei Kortunov
9a1ba1e559
Show success chance when self-enchanting (Feature #3492 )
2017-06-03 14:39:15 +04:00
Andrei Kortunov
42f3c73c75
Spell priority: dispel usage improvements
2017-06-03 13:16:44 +04:00
Nicholas
f6f07f5497
clear mGoToJail flag on load
2017-06-02 13:33:47 -05:00
scrawl
9fd0d54a35
Merge pull request #1289 from akortunov/newrepair
...
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
f6c3d4935e
Spell priority: feather and burden
2017-05-31 19:23:44 +04:00
Andrei Kortunov
10d4cb15ad
Improved repair widget
2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e
Improved recharge widget
2017-05-31 19:11:49 +04:00
Andrei Kortunov
6c21e4ed31
Spell priority: ignore some effects useless in battle
2017-05-31 18:41:41 +04:00
scrawl
2638327593
Merge pull request #1303 from akortunov/guifixes
...
Character generation layout fixes
2017-05-31 15:25:41 +02:00
scrawl
a1661af864
Merge pull request #1301 from akortunov/tooltips
...
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
Andrei Kortunov
46c8842808
Fixed enchant points calculations formula
2017-05-26 23:42:11 +04:00
Andrei Kortunov
f17badb3cd
Makes cells cache size configurable
2017-05-25 13:09:40 +04:00
scrawl
f9cdc2da94
Merge pull request #1293 from akortunov/spellpriority
...
aicombataction.cpp: implement some spell priority TODO's
2017-05-21 21:18:10 +02:00
MiroslavR
98daf4f043
Merge pull request #1296 from akortunov/jumpfatiguefix
...
Fixed jump fatigue loss formula (bug #3843 )
2017-05-21 11:47:58 +02:00
scrawl
8cd8eab9dd
Merge pull request #1294 from akortunov/constenchantfix
...
Swap enchant type when purge selected soulgem (bug #3878 )
2017-05-20 23:44:14 +02:00
Andrei Kortunov
4f41c44cd6
Swap enchant type when clean selected soulgem widget ( fixes #3878 )
2017-05-20 18:30:11 +04:00
Allofich
315ad54b29
Don't make NPCs or player speak while underwater
...
(Fixes #3851 )
2017-05-08 19:55:54 +09:00
scrawl
109bc3cb59
Merge pull request #1281 from akortunov/purgefix
...
Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first
2017-05-07 21:08:30 +02:00
Andrei Kortunov
4d927439ca
Spell priority: item wearing check when disintegrate weapon/armor
2017-05-03 11:13:35 +04:00
Andrei Kortunov
d598809ac6
Spell priority: check spell resistance, check if actor is already has a non-magnitude effect
2017-05-03 10:35:56 +04:00
Andrei Kortunov
1520a4d7db
Levelup menu layout fixes
2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0
Tooltips: faction, magic effects layout fixes
2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75
Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes
2017-04-30 22:39:05 +04:00
MiroslavR
d24bcbac15
Do not apply underwater effects to player's voice ( Fixes #3850 )
2017-04-30 18:51:49 +02:00
Andrei Kortunov
6331cc6ab9
Tooltips: level, race, class, specialization layout fixes
2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da
Merge pull request #1272 from akortunov/guifixes
...
Service menus layout fixes
2017-04-30 12:27:21 +02:00
Andrei Kortunov
f484ef8ffb
Fixed jump fatigue loss formula ( fixes #3843 )
2017-04-26 18:28:59 +04:00
Andrei Kortunov
bba822c014
Purge all effects with same ID instead only first ( fixes #3839 )
2017-04-26 17:18:06 +04:00
MiroslavR
eada8c6822
Fix wrong incrementation in InventoryStore::visitEffectSources ( Fixes #3838 )
2017-04-23 18:05:41 +02:00
Andrei Kortunov
c2706ac3e7
Merchant repair and travel window scroll fix
2017-04-23 09:15:25 +04:00
scrawl
0e37e71ea2
Merge pull request #1266 from akortunov/handsfallbackfix
...
Improved hands bodyparts selection fallback
2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3
Improved bodypart select fallback ( fixes #2594 )
2017-04-22 22:23:10 +04:00
MiroslavR
0737d6cb72
Merge pull request #1270 from Allofich/scriptfix
...
Check for NULL before running voice dialogue scripts
2017-04-22 01:58:20 +02:00
Allofich
f34e35eb19
Check for NULL before running voice scripts
...
(Fixes #3834 )
2017-04-22 07:51:31 +09:00
scrawl
8fbf9dc597
Merge pull request #1253 from akortunov/pinned
...
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f
Move updatePinnedWindows() function to private section
2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa
Remove unused code
2017-04-21 18:39:01 +04:00
Allofich
143ee387cc
Add enabled check to animation script commands
...
(Fixes #3793 )
2017-04-21 23:27:24 +09:00
scrawl
fc56fc0b81
Merge pull request #1265 from akortunov/develop
...
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
scrawl
2c879ddbbf
Merge pull request #1264 from Allofich/script
...
Run scripts for voiced dialogue
2017-04-21 15:26:09 +02:00
Andrei Kortunov
e717d046f2
Escaped class name string
2017-04-21 17:21:57 +04:00
scrawl
1956602aa2
Merge pull request #1262 from Allofich/warnings
...
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce
Use sLevel GMST instead of hardcoded text in load game menu
2017-04-21 09:40:25 +04:00
Andrei Kortunov
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f
Fix shadowing warnings
2017-04-21 11:06:18 +09:00
Allofich
60c67bc327
Run scripts for voiced dialogue
...
(Fixes #3787 )
2017-04-21 10:39:11 +09:00
scrawl
c2240e3af1
Call the WindowManager::updatePlayer after the startup script is run
2017-04-21 00:51:13 +02:00
scrawl
1ffb9e1bf3
Remove renderWorldMap()
2017-04-21 00:50:22 +02:00
scrawl
bfdde0262f
Merge pull request #1260 from akortunov/levitationfix
...
Purge existing levitation effects when levitation is disabled (fixes #3766 )
2017-04-21 00:25:09 +02:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
Andrei Kortunov
90d90b6d81
Fixed dynamic stats tooltips in review menu
2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
2017-04-20 17:20:20 +04:00
Allofich
2e5fd74db0
Fix invalid iterator warning
2017-04-20 19:30:35 +09:00
scrawl
df3b4fe6a5
Merge pull request #1259 from Allofich/warnings
...
Fix a few Cppcheck warnings
2017-04-19 20:32:40 +02:00
Andrei Kortunov
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
Allofich
e87d2aa1af
Remove unused function
2017-04-20 01:47:30 +09:00
Allofich
60a2625b89
Add parentheses to clarify calculations
2017-04-20 01:38:21 +09:00
scrawl
30081393a6
Add InventoryWindow::clear() as part of world cleanup
2017-04-19 18:28:49 +02:00
Allofich
f299f26720
Remove unused variable
2017-04-20 01:22:33 +09:00
Allofich
5a00b239ac
Reduce scope of variables
2017-04-20 01:22:30 +09:00
Allofich
c655875584
Change mWaterEnabled from float to bool
2017-04-20 01:09:52 +09:00
Andrei Kortunov
04eb4ea6b6
Check for disabled levitation ( fixes #3766 )
2017-04-19 18:38:25 +04:00
scrawl
50f3794d12
Merge pull request #1258 from akortunov/drownfix
...
Fixed drowning widget initialization with non-default "fHoldBreathTime" GMST value
2017-04-19 16:08:55 +02:00
Andrei Kortunov
3c4c47d1e6
Reduced scope of fHoldBreathTime variable
2017-04-19 15:52:15 +04:00
Andrei Kortunov
c3fd327bb2
Fixed drowning widget initialization
2017-04-19 08:48:16 +04:00
scrawl
f90e5081f9
Merge pull request #1257 from akortunov/chargen
...
Chargen menus fixes
2017-04-18 22:23:30 +02:00
Andrei Kortunov
aac78d29a4
Service menus layout fixes
2017-04-16 20:30:20 +04:00
Andrei Kortunov
c93cf822c7
Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628 )
2017-04-14 23:21:20 +04:00
Andrei Kortunov
fb0c4700a4
Save a proto gender in racemenu
2017-04-14 23:19:48 +04:00
scrawl
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
scrawl
17125e6c4d
Merge pull request #1256 from Allofich/equip
...
Adjustments to RemoveItem behavior
2017-04-14 01:08:29 +02:00
Andrei Kortunov
dc036e96d4
fixed magicka calculation on chargen (bug #3694 )
2017-04-13 18:30:36 +04:00
Allofich
6e405aed8c
Adjustments to RemoveItem behavior
...
(Fixes #3796 )
2017-04-13 22:33:13 +09:00
scrawl
8d8f293a65
Merge pull request #1246 from akortunov/develop
...
Menu improvements
2017-04-12 23:57:00 +02:00
scrawl
d8943d911c
Merge pull request #1254 from Allofich/warning
...
Remove unnecessary line
2017-04-12 23:49:29 +02:00
Allofich
470988f9ef
Minor changes to getActorsSidingWith
2017-04-13 04:45:44 +09:00
Andrei Kortunov
c3d49d5ca5
Fixed inventory crash and skipmenu launch
2017-04-12 22:57:32 +04:00
Allofich
6272e1c674
Cache allies found while iterating engageCombat
...
(Fixes #3814 )
2017-04-13 02:02:38 +09:00
Allofich
5020d03c78
Remove unnecessary line
2017-04-12 22:59:28 +09:00
Andrei Kortunov
72a16dc78b
Merge branch 'master' into pinned since added PR #1250
2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d
Add option to show reach and attack speed for melee weapons
2017-04-12 09:12:25 +04:00
scrawl
993860a4b1
Merge pull request #1250 from resilar/mapbutton
...
Hide WorldButton when in game mode
2017-04-11 21:34:53 +02:00
scrawl
8f335b3484
Merge pull request #1245 from akortunov/tgm
...
Vanilla-like tgm
2017-04-11 21:34:44 +02:00
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04:00
def
785b3c3d01
Hide WorldButton when in game mode
2017-04-03 09:40:12 +03:00
Andrei Kortunov
31bd70f334
Added missed recharge and repair sounds
2017-04-02 23:19:43 +04:00
Andrei Kortunov
df5a43363a
Confirmation dialogs size fix
2017-03-30 17:05:56 +04:00
scrawl
3c9f3a0f7f
Merge pull request #1242 from Allofich/warnings
...
Fix AppVeyor warnings
2017-03-29 07:28:00 +02:00
Andrei Kortunov
edadcb338c
Savegame dialog improvements
2017-03-27 23:10:57 +04:00
scrawl
9e7ade4ba4
Merge pull request #1244 from akortunov/develop
...
MyGUI vertical alignment
2017-03-27 20:14:09 +02:00
Allofich
db2f97f308
Fix shadowing warning
2017-03-27 20:22:20 +09:00
Andrei Kortunov
7d09a5d644
Progress bars vertical alignment
2017-03-27 13:33:28 +04:00
scrawl
a036a98fd0
Merge pull request #1243 from akortunov/develop
...
Journal improvements
2017-03-27 02:56:35 +02:00
scrawl
b064dd29cc
Fix reset of blend function (Bug #3811 )
2017-03-27 02:51:23 +02:00
Andrei Kortunov
658ab5e941
Minor journal improvements
2017-03-26 22:56:36 +04:00
scrawl
2a74f79bf1
Merge pull request #1240 from Allofich/follow
...
Adjust AI follow distances
2017-03-26 20:35:11 +02:00
Allofich
6253a5218e
Adjust AI follow distances
...
(Fixes #3225 )
2017-03-27 03:31:25 +09:00
scrawl
0a061d45b7
Merge pull request #1239 from akortunov/projectilefix
...
Disable explosion effect for 0-range projectiles (bug #3730 )
2017-03-26 20:30:43 +02:00
Andrei Kortunov
14b59e0e4b
Vanilla-like tgm ( fixes #3798 )
2017-03-25 22:40:11 +04:00
Andrei Kortunov
860b556713
Disables explosion effect for 0-range projectiles ( fixes #3730 )
2017-03-25 19:53:24 +04:00
MiroslavR
da6b28eb40
Fix selling success chance ( Fixes #3802 )
2017-03-25 15:21:16 +01:00
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
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
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
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
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
scrawl
cca75499ee
Clear the Skeleton's bone cache when a node is added/removed ( Fixes #3663 )
2016-12-16 20:09:20 +01:00
Leon Krieg
12c8c3276a
Disable NPC collision only when death animation has finished ( #3666 )
2016-12-15 19:33:14 +01:00
Leon Krieg
739cd5ba45
Fixed more spelling mistakes
2016-12-15 13:09:40 +01:00
Aussiemon
7c2a088b34
Added check before removing water collision object from world
2016-12-14 20:13:23 -07:00
Aussiemon
e30dfb13d3
Added check before attempting to remove actor's collision object from world
2016-12-14 19:05:30 -07:00
Leon Krieg
c7b4b2cdd7
Fixed multiple spelling mistakes
2016-12-14 16:39:33 +01:00
scrawl
8bdd5d1131
Merge pull request #1151 from Aussiemon/projectilelightsfix
...
Update to implementation of projectile lights
2016-12-14 14:33:09 +01:00
mrohrlach
71e74f5a93
Moved projectile light calculation to separate method
2016-12-13 18:04:20 -07:00
MiroslavR
76ee5845ac
Fix swish sound ID and play swish sound effects for all creatures ( Fixes #3653 )
2016-12-11 19:35:53 +01:00
MiroslavR
8c97ac269d
Remove item shadows properly ( Fixes #3652 )
2016-12-10 22:22:41 +01:00
mrohrlach
f0f78c9d64
Slight adjustments to disintegration fix
2016-12-09 19:55:26 -07:00
mrohrlach
9624d8aade
Added new method and variable to track float remainders of disintegration effections
2016-12-09 19:48:56 -07:00
mrohrlach
f5da179a90
Removed two more bad casts
2016-12-09 18:15:40 -07:00
mrohrlach
3b0c791892
Removed bad casts and unnecessary comments
2016-12-09 18:10:06 -07:00
scrawl
876d9c6a84
Merge pull request #1148 from Allofich/aicombat
...
Require line of sight for AI attacks
2016-12-06 20:02:39 +01:00
Allofich
a6dae51d87
Require line of sight for AI attacks ( Fixes #3646 )
2016-12-07 01:35:30 +09:00
Allofich
6816e935f1
Fix fortify maximum magicka expiration ( Fixes #3648 )
2016-12-06 21:00:03 +09:00
mrohrlach
c2e5f24e98
Tidying up
2016-12-04 16:31:11 -07:00
mrohrlach
ef5cf76ad8
Implemented retrieval of effect colors for lights, made recommended changes
2016-12-04 16:11:21 -07:00
mrohrlach
e1deb8b1d4
Merge branch 'master' of https://github.com/openmw/openmw
2016-12-04 16:09:22 -07:00
mrohrlach
3816d0f6dc
Changed light values to better match vanilla. Still need to pull diffusion properties from spells
2016-12-03 19:44:52 -07:00
mrohrlach
099e79edbe
Changed a line that did not need to be changed apparently
2016-12-03 19:12:25 -07:00
mrohrlach
61097d93b9
Replaced tabs with spaces (oops)
2016-12-03 19:09:03 -07:00
mrohrlach
49ce80346c
Changed methods slightly to ensure non-magic projectiles do not receive lights
2016-12-03 15:42:24 -07:00
mrohrlach
83945cf280
Added reasonable approximation of magic bolt lights
2016-12-03 15:24:21 -07:00
Kurnevsky Evgeny
28639c3b2f
Crash fix when item is disabled before it casts spell.
2016-12-03 17:13:31 +03:00
scrawl
908cc699ce
Merge pull request #1141 from MiroslavR/water-sounds
...
Implement water sounds
2016-12-02 14:40:22 +01:00
scrawl
e0afd6d0f7
Movement solver: performance improvement for the minimum stepping distance check, no need to waste time doing a second stepMove if we did not hit a slope or the step was already large enough to begin with.
2016-12-02 02:25:05 +01:00
MiroslavR
c34d85ffc2
Implement water sounds ( Closes #451 )
2016-11-28 21:34:58 +01:00
ShadowRadiance
354a89e3bc
Slowfall now reduces momentum based on magnitude when jumping
...
(Allows Constant Effect Slowfall to work as in MW)
2016-11-26 06:27:11 -05:00
scrawl
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
ea888519c7
[macOS] Set OpenMW working dir to <bundle>/Contents/MacOS
2016-11-23 22:32:54 +01:00
Nikolay Kasyanov
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-23 22:32:54 +01:00
scrawl
762460f042
Use negative count when restocking item to ensure that its properly tracked ( Fixes #3635 )
2016-11-22 22:42:04 +01:00
MiroslavR
46a3244107
Fix thrown weapon sources being used to apply on strike enchantments ( Fixes #3634 )
2016-11-22 18:18:20 +01:00
scrawl
b6d02d9b14
Fix order of operations when undoing werewolf transformation of an NPC
2016-11-22 16:37:49 +01:00
scrawl
c326564e20
Merge pull request #1136 from Allofich/deletespell
...
Allow deleting spells that have the "always succeeds" flag
2016-11-20 19:23:25 +01:00
scrawl
16a913c549
Add emission of water ripple particles for water-walking actors ( Fixes #3608 )
2016-11-20 18:47:12 +01:00
Allofich
c82df2553c
Allow deleting spells that have the "always succeeds" flag ( Fixes #3627 )
2016-11-21 02:26:02 +09:00
scrawl
385db50f2d
Merge pull request #1131 from Allofich/waterwalking
...
Make water walking mechanics closer to original MW
2016-11-20 17:19:15 +01:00
MiroslavR
c1e52bbcf7
Fix -Wmismatched-tags clang warning
2016-11-20 15:10:37 +01:00
Allofich
0e429ae41d
Make water walking mechanics closer to original MW
2016-11-20 22:21:33 +09:00
scrawl
f51e06bc47
Recreate shaders if necessary when the NpcAnimation is rebuilt
...
This fixes certain equipment losing the 'invisibility' effect after a view-mode switch with shaders enabled. Because the initial build of shaders done by the resource manager is not aware of the override state in the NpcAnimation's object root, we have to build new shaders here.
2016-11-19 23:53:22 +01:00
scrawl
e823cbf018
Fix incorrect priority of animation sources (Bug #3626 )
2016-11-19 23:53:22 +01:00
