scrawl
5f440a29bd
Remember key focus per GUI mode
...
Among other things, this will remember the focused button in the container window, allowing quick looting of multiple containers.
2017-09-24 19:08:14 +02:00
scrawl
35110fb2f8
Remove unused and slightly broken custom button titles in ConfirmationDialog
2017-09-24 19:08:14 +02:00
scrawl
ad4b91131f
toggleGui renamed to toggleHud, remove unused variable
2017-09-24 19:08:14 +02:00
scrawl
be19f51013
Adjust some more windows to be keyboard friendlier
2017-09-24 19:08:14 +02:00
scrawl
4fff2e2e34
Refactor exitCurrentGuiMode
2017-09-24 19:08:13 +02:00
scrawl
20766fb508
Associate open/close sounds with the GUI mode
2017-09-24 19:08:13 +02:00
scrawl
531e7ac586
Allow drag-and-drop to be cancelled (Esc or Inventory key)
2017-09-24 19:08:13 +02:00
scrawl
269094ba8d
Restore the previous key focus widget when exiting modal dialog
2017-09-24 19:08:13 +02:00
scrawl
bbafe1e456
Remove redundant player cell variable
2017-09-24 19:08:13 +02:00
scrawl
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
2017-09-24 19:08:12 +02:00
scrawl
3820416277
Refactor the unholy mess that is WindowManager::updateVisible
...
GUI modes are now defined in a general and extensible way. The next commits are going to take advantage of this.
2017-09-24 19:08:12 +02:00
scrawl
01391b7eed
Rename WindowBase's open/close to onOpen/onClose
2017-09-24 19:08:12 +02:00
scrawl
5482ad0482
Fix tab completion in console to not cycle key focus
2017-09-24 19:08:11 +02:00
scrawl
c203a0774a
Adjust some layouts to take better advantage of keyboard navigation
2017-09-24 19:08:11 +02:00
scrawl
c11fe6788f
Add basic keyboard navigation for the GUI
...
(Shift)Tab cycles, arrow keys move to the next button in that direction, Enter/Space accepts.
Note: Unless MyGUI is hacked to bits, clicking on an empty space will annoyingly reset the key focus. Not sure how to deal with that yet.
The visual highlight for selected buttons requires MyGUI commit 632d007429d0bf0c7d7f6c5db4a08353a63dd839 or later to appear (to be released in 3.2.3).
2017-09-24 19:08:11 +02:00
scrawl
e7ad012977
Pass repeat key events to the GUI
...
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
2017-09-24 19:08:11 +02:00
scrawl
b22fedf4ae
Check 'sYes' in addition to 'sOk' for message box's default keyfocus
2017-09-24 19:08:11 +02:00
Andrei Kortunov
7d703a13a3
Fix a crash in the World::isUnderwater() if the cell is empty
2017-09-24 16:28:05 +04:00
Andrei Kortunov
9b04a7c1e6
Fix idle animations playing
2017-09-24 16:26:41 +04:00
scrawl
2a14af2e27
Merge pull request #1474 from akortunov/swimanimations
...
Implement missing swim animations
2017-09-23 23:33:37 +00:00
scrawl
22222f07ae
Merge pull request #1475 from akortunov/wanderfix
...
AiWander: reset spawn position, if an actor was moved to another cell
2017-09-23 23:10:35 +00:00
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
2017-09-23 22:55:56 +00:00
Andrei Kortunov
91adfc9fc0
AiWander: reset spawn position, if an actor was moved to another cell (bug #4010 )
2017-09-23 20:59:06 +04:00
MiroslavR
b5f5268ff3
Clean up faraway projectiles
2017-09-23 18:54:17 +02:00
Andrei Kortunov
a57f6ac2af
Fix a typo in attack animation name
2017-09-23 08:25:58 +04:00
Andrei Kortunov
bcad431cc5
Implement SwimTurnLeft/Right animations
2017-09-22 16:07:00 +04:00
Andrei Kortunov
1c6cfad3cc
Implement SwimHit animation
2017-09-22 15:49:42 +04:00
Andrei Kortunov
3eb1308c0d
Implement SwimKnockdown/out animations
2017-09-22 15:26:35 +04:00
Andrei Kortunov
6260bb1366
Implement SwimAttack1-3 and SwimDeathKnockDown/Out animations
2017-09-22 14:51:06 +04:00
scrawl
0e648222b8
Merge pull request #1446 from akortunov/takeallfix
...
Do not allow to equip a replacement, when take all items from a dead corpse
2017-09-22 09:14:21 +00:00
Miloslav Číž
8df79625e8
fix water shader
2017-09-22 10:53:02 +02:00
Andrei Kortunov
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
2017-09-22 12:32:47 +04:00
Miloslav Číž
16d9773c6c
fix water shader artifacts at shores
2017-09-21 22:25:36 +02:00
scrawl
75c047a6e0
Merge pull request #1472 from akortunov/equipfix
...
Do not play draw weapon animation when equip a new weapon
2017-09-21 13:05:14 +00:00
Andrei Kortunov
5da532a36c
Do not play draw weapon animation when equip a new weapon (bug #4056 )
2017-09-21 10:48:52 +04:00
scrawl
f004622530
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 22:24:20 +00:00
scrawl
fa364726b8
Merge pull request #1468 from akortunov/itemsorting
...
Improve item sorting in inventory and containers
2017-09-20 22:22:56 +00:00
scrawl
7dec773ea9
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 23:03:14 +02:00
MiroslavR
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
2017-09-20 18:58:56 +02:00
Andrei Kortunov
771f58ce58
Remove unwanted warnings
2017-09-20 19:47:14 +04:00
Miloslav Číž
566fa6c118
Merge branch 'master' of git://github.com/OpenMW/openmw
2017-09-20 16:39:31 +02:00
Miloslav Číž
2346c5338e
increase water fudge to get rid of artifacts
2017-09-20 16:34:27 +02:00
scrawl
5ebb43a422
Merge pull request #1467 from akortunov/guifixes
...
Restack soulgems when use SoulTrap
2017-09-20 14:15:49 +00:00
Andrei Kortunov
9d826b2deb
Improve item sorting in inventory and containers
2017-09-20 11:57:00 +04:00
Andrei Kortunov
9342a0254f
Restack soulgems when use SoulTrap
2017-09-20 10:44:24 +04:00
AnyOldName3
99f6a1b8e1
Switch to LispSM
2017-09-19 23:44:37 +01:00
scrawl
26e3de1025
Merge pull request #1464 from akortunov/guifixes
...
Fixed padding of MessageBox buttons
2017-09-19 20:16:09 +00:00
scrawl
5688257837
Merge pull request #1462 from kcat/master
...
Minor animation fixes
2017-09-19 20:15:47 +00:00
scrawl
ed5b6320f3
Merge pull request #1463 from akortunov/getdetected
...
Allow to use GetDetected without a reference
2017-09-19 20:15:16 +00:00
Andrei Kortunov
2806a35a61
Fixed padding of MessageBox buttons
2017-09-18 23:09:38 +04:00
Andrei Kortunov
65d8e2ff5d
Allow to use GetDetected without a reference (bug #3110 )
2017-09-18 21:46:57 +04:00
Chris Robinson
917a3b5dff
Avoid creating temp strings when looking for an animation stop key
2017-09-18 01:41:05 -07:00
Chris Robinson
b770c1493f
Don't spam about missing animations
2017-09-18 01:28:40 -07:00
Chris Robinson
074be7d7c6
Remove a function from the sound manager interface
2017-09-18 01:28:39 -07:00
scrawl
d294d7e284
Fix possible fall damage when switching from falling to flying
2017-09-17 23:16:49 +00:00
scrawl
00034192dc
Fix player Ptr in RenderingManager not being updated on cell changes
...
Noticed that 'setpos' wasn't working in the console with the player selected.
2017-09-17 23:07:17 +00:00
scrawl
fcb815f2c7
Move fall height reset into PhysicsSystem ( Fixes #4049 )
...
To avoid using onGround before it's actually set.
2017-09-17 23:06:51 +00:00
scrawl
a560841705
Merge pull request #1460 from AnyOldName3/invalid-death-count-cleaning
...
Check death counts are for valid actors before loading them
2017-09-17 14:42:56 +00:00
scrawl
242d085da0
Merge pull request #1455 from kcat/master
...
Print sound init info and preload sound buffer info
2017-09-17 13:24:15 +00:00
scrawl
c39c29722b
Merge pull request #1459 from akortunov/cyclingfix
...
Cycle only through weapons which player can equip
2017-09-17 13:17:41 +00:00
AnyOldName3
0be7e2a5a5
Fix really obvious flaw with ignored records not being skipped that I missed
2017-09-17 14:16:17 +01:00
Andrei Kortunov
10a0136b4a
Cycle only through weapons which can be equipped by player (bug #4104 )
2017-09-17 17:14:50 +04:00
AnyOldName3
5a5cb1a160
Check death counts are for valid actors before loading them
2017-09-17 14:09:29 +01:00
Andrei Kortunov
3fb3c4c20f
Add scrollbar to a birth effect lists (bug #4105 )
2017-09-17 14:06:01 +04:00
Chris Robinson
41bb35655b
Avoid an extra call to get the buffer size
2017-09-16 16:25:32 -07:00
Chris Robinson
5c53ee42a1
Prepare all Sound_Buffers when retrieving the first one
2017-09-16 16:25:32 -07:00
Chris Robinson
4b448c74d2
Use range-for loops instead of for_each
2017-09-16 16:25:32 -07:00
Chris Robinson
1e729e8da9
Avoid more explicit loops
2017-09-16 16:25:32 -07:00
Chris Robinson
9dbb713b7c
Print a bit more information for sound initialization
2017-09-16 16:25:32 -07:00
Chris Robinson
acd6d9cd72
Try opening the default device fallback in OpenAL_Output
2017-09-16 16:25:32 -07:00
scrawl
f594eda574
Reset attackStrength when starting a new attack ( Fixes #3935 )
2017-09-16 23:04:54 +00:00
scrawl
5dd2e871c8
Merge pull request #1450 from kcat/master
...
Sound improvements
2017-09-16 15:59:13 +00:00
scrawl
a8c287b692
Merge pull request #1447 from akortunov/stancechangefixes
...
Clear player fields upon reload (bug #2639 )
2017-09-15 20:48:28 +00:00
Andrei Kortunov
44738e1141
Clear player fields upon reload (bug #2639 )
2017-09-15 22:39:56 +04:00
Chris Robinson
d68e1581ee
Use an std::array for the OpenAL stream buffers
2017-09-15 05:40:20 -07:00
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
2017-09-15 02:36:59 -07:00
Chris Robinson
0c1ad7c74e
Replace a few more explicit loops
2017-09-15 02:36:46 -07:00
Chris Robinson
1e123a22e1
Avoid some explicit loops
2017-09-14 16:56:46 -07:00
Chris Robinson
3757571d46
Set HRTF when initializing the device
2017-09-14 16:00:43 -07:00
Chris Robinson
c17edfd547
Don't be so throw-happy in the sound manager
2017-09-14 16:00:43 -07:00
Chris Robinson
abe80f5868
Move the soundlist when updating a Ptr instead of copying
2017-09-14 16:00:43 -07:00
Chris Robinson
605c937572
Ensure 3D sources are spatialized
...
Standard OpenAL does not spatialize non-mono sounds, although the game has some
stereo sounds meant to play in 3D. The desired behavior can be achieved with
the AL_SOFT_source_spatialize extension.
2017-09-14 16:00:43 -07:00
Chris Robinson
6f57233ba1
Avoid copying the same Ptr with each iteration
2017-09-14 16:00:42 -07:00
Chris Robinson
edfba68eb5
Apply reverb and a low-pass filter when underwater
...
This replaces the pitch-shift effect when available.
2017-09-14 16:00:42 -07:00
Chris Robinson
27eeaf90d0
Use unordered_map for the music playlist and sound buffer caches
2017-09-14 16:00:42 -07:00
Chris Robinson
033303b911
Properly update the near water sound volume
2017-09-14 16:00:42 -07:00
Chris Robinson
0b720cd90c
Set the appropriate meter/unit scale for sound
2017-09-14 16:00:41 -07:00
Chris Robinson
c790fedd3f
Load an effect and filter for underwater
2017-09-14 16:00:41 -07:00
Chris Robinson
3d37cb3cf6
Load EFX functions when available
2017-09-14 16:00:41 -07:00
Chris Robinson
c5a3fb7ccd
Simplify checking for near water sfx change
...
Rather than checking every frame you're near the water, only check when the
current cell changed (the sfx will only change when moving between interior and
exterior). It also doesn't need to look through all playing sounds, as it's a
local one not attached to a Ptr.
2017-09-14 16:00:41 -07:00
Chris Robinson
617c05f557
Make Sound and Stream sibling types
...
To avoid being able to accidentally cast a Stream* to a Sound*, or vice-versa.
2017-09-14 16:00:40 -07:00
Chris Robinson
9e45f6d05f
Make a note that stopTrack needs to be called for a stopping track
2017-09-14 16:00:40 -07:00
Chris Robinson
9e7a49f66e
Include alext.h to get OpenAL extension definitions
2017-09-14 16:00:40 -07:00
Chris Robinson
1fe60dd8e2
Replace some shared_ptrs with pointers to deque entries
2017-09-14 16:00:30 -07:00
Bret Curtis
e517ad3f7b
add ktx support for splashscreens
2017-09-14 10:06:36 +02:00
Bret Curtis
dff0a766a8
adding 3 more extensions
2017-09-13 15:30:22 +02:00
Bret Curtis
b26887ef9b
add support for png and dds splashscreens to begin with.
2017-09-13 13:52:05 +02:00
AnyOldName3
a5397e5f2d
Merge master
2017-09-11 22:26:46 +01:00
scrawl
bd667c3847
Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir
...
If CMake supports it, sets the debugger working directory for Visual …
2017-09-11 10:30:50 +00:00
scrawl
00ae9a01a1
Merge pull request #1445 from akortunov/guifixes
...
Allow to add levelup a description for levels > 20
2017-09-11 10:28:09 +00:00
scrawl
407640322d
Merge pull request #1439 from akortunov/resistfix
...
Take in account elemental shields for GetResist and SetResist script commands
2017-09-11 10:27:47 +00:00
Andrei Kortunov
7760e4514c
Allow to add levelup a description for levels > 20
2017-09-10 22:47:34 +04:00
scrawl
7688696765
Merge pull request #1437 from Capostrophic/nodemapfix
...
Use constant nodeMap during part updating in creature animation
2017-09-10 18:15:20 +00:00
Andrei Kortunov
c6fd75bf42
Take in account elemental shields for GetResist and SetResist script commands (bug #4093 )
2017-09-10 22:05:58 +04:00
scrawl
618ec6dcdd
Merge pull request #1440 from akortunov/guardfix
...
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 17:06:14 +00:00
Andrei Kortunov
661232222f
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 15:26:48 +04:00
Capostrophic
9503d61866
Use const nodeMap in creature animation
2017-09-09 23:22:16 +03:00
AnyOldName3
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
2017-09-08 22:17:42 +01:00
MiroslavR
1e585ac71a
Log a warning in case of missing bookart instead of showing a pink rectangle ( Fixes #3826 )
2017-09-08 22:50:07 +02:00
AnyOldName3
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
2017-09-08 17:26:46 +01:00
Andrei Kortunov
ac2f20f983
Update a disposition bar when a dialogue widget is disabled, but visible
2017-09-08 19:42:06 +04:00
scrawl
8f1c8759e4
Merge pull request #1432 from akortunov/alchemyfix
...
Update alchemy effects after every created potion (#4079 )
2017-09-07 20:51:42 +00:00
Andrei Kortunov
dc0313a36f
Use base skill value when calculating rank requirements
2017-09-07 21:06:10 +04:00
Andrei Kortunov
7559d25317
Update alchemy effects after every created potion ( #4079 )
2017-09-06 15:11:47 +04:00
scrawl
4c5992a0d5
Warn if removing a node fails
2017-09-01 21:42:35 +00:00
scrawl
132ac6001b
Fix bug of Animation::mSkeleton not being assigned
...
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713
Merge pull request #1428 from akortunov/stancechangefixes
...
[Feedback needed] Stance switching changes, part II
2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4
Reset player attack animation when unequip weapon or tool
2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec
Allow to interrupt an attack, if attack button is held
2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a
Fixes a regression with bound weapons equipping (bug #4050 )
2017-09-01 08:59:05 +04:00
scrawl
a8005c33d9
Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51
2017-08-31 21:58:12 +00:00
Andrei Kortunov
1aaa8a76c5
Allow to play only one copy of given sound at time (bug #3647 )
2017-08-31 16:14:48 +04:00
Andrei Kortunov
91dcd5bc6e
Do not allow to unequip weapon from inventory during attack
2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5
Do not allow to switch weapon to probe or lockpick during attack
2017-08-31 12:36:54 +04:00
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
scrawl
43fda6cf07
Merge pull request #1423 from akortunov/spellpriority
...
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 22:38:36 +00:00
Andrei Kortunov
73d5efabee
Display negative values on fatigue progress bar
2017-08-29 18:53:21 +04:00
Andrei Kortunov
8003dbee12
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 16:40:55 +04:00
Andrei Kortunov
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
2017-08-29 15:53:23 +04:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Harry
86ae2ae395
Improved shuffle ( #1412 )
2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7
Escape content file names before sending them to the GUI
2017-08-25 10:05:56 +00:00
AnyOldName3
e2623d21ab
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-08-23 13:33:22 +01:00
scrawl
30665b743d
Merge pull request #1416 from akortunov/guifixes
...
Display large journal entries correctly
2017-08-22 20:37:46 +00:00
Andrei Kortunov
0177fe6602
Display large entries in journal correctly
2017-08-22 23:26:06 +04:00
Andrei Kortunov
e799cbdb51
Combat AI: allow only one summoned creature at time
2017-08-22 09:18:49 +04:00
scrawl
f0dea8b8e6
Revert "Implement a Fisher-Yates shuffle on background music"
2017-08-20 20:20:27 +00:00
scrawl
dbb8a5c959
Merge pull request #1401 from h313/master
...
Implement a Fisher-Yates shuffle on background music
2017-08-19 22:48:24 +00:00
Harry
2a85c5f011
Implement a Fisher-Yates shuffle on background music
...
This fixes sometimes getting repetitive background music
2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd
Get only text from clipboard (bug #4025 )
2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b
Revert commit 67d59bead5 (a better
...
implementation found)
2017-08-19 15:24:06 +04:00
scrawl
2611377081
Merge pull request #1350 from akortunov/deathanimationfix
...
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-18 22:04:12 +00:00
scrawl
f277007b49
Merge pull request #1404 from akortunov/ownedcrosshair
...
Owned crosshair feature improvements [discussion]
2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de
Owned crosshair improvements (bug #2789 )
2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842
Added a delay before summoned creature corpse despawning
2017-08-18 11:58:28 +04:00
Capostrophic
6c8c883dc0
Making knownEffect aware that there can be more than 4 potion effects
2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac
Merge pull request #1391 from akortunov/aifollow
...
AiFollow: add a threshold when turning to target
2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b
AiFollow: add a threshold when turning to target
2017-08-17 22:52:34 +04:00
scrawl
c231d20413
Merge pull request #1362 from akortunov/spellpriority
...
Combat AI: use WhenUsed enchantments [Feedback needed]
2017-08-16 21:23:57 +00:00
scrawl
306b58349e
Merge pull request #1387 from akortunov/movementfix
...
Check actual movement for GetPCRunning and GetPCSneaking [Feedback needed]
2017-08-16 20:50:49 +00:00
scrawl
d1161819bf
Merge pull request #1396 from akortunov/dispelfix
...
Dispel only effects from spells
2017-08-16 20:49:40 +00:00
Andrei Kortunov
bc7353f100
Check animation state for GetPCRunning and GetPCSneaking
2017-08-16 20:30:47 +04:00
Andrei Kortunov
67d59bead5
Get only text from input fields (bug #4025 )
2017-08-16 15:03:04 +04:00
Andrei Kortunov
1e983604db
Dispel only effects from spells (bug #3995 )
2017-08-15 09:35:29 +04:00
scrawl
8acf0ba633
Merge pull request #1394 from akortunov/followerattackfix
...
Prevent followers from attacking player if crime was reported
2017-08-14 22:19:46 +00:00
Andrei Kortunov
ec64034160
Confiscate stolen item/gem when enchanting
2017-08-14 19:29:34 +04:00
Andrei Kortunov
7a5645b35d
Prevent followers from attacking player if crime was reported
2017-08-14 18:42:19 +04:00
Andrei Kortunov
f84eb68b3d
Confiscate an item when you try to sell it to its owner (bug #3944 )
2017-08-14 11:31:17 +04:00
scrawl
1bdcecc32e
Merge pull request #1390 from akortunov/referencecheck
...
Do not make target reference unavailable on cell change
2017-08-12 18:48:52 +00:00
Andrei Kortunov
3f159960b7
Restored pickpocket and werewolf check
2017-08-12 21:18:05 +04:00
scrawl
b6aaa2f2be
Merge pull request #1389 from akortunov/autosave
...
Create autosave when waiting
2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f
Do not make target reference unavailable on cell change (bug #3898 )
2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875
Create autosave when waiting (bug #1452 )
2017-08-12 09:06:31 +04:00
scrawl
0f983144a4
Merge pull request #1383 from akortunov/guifixes
...
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Andrei Kortunov
56f5a5dee3
Added transparency to 'owned' tooltip
2017-08-08 22:57:39 +04:00
scrawl
af9db74010
Merge pull request #1377 from LennyPenny/master
...
Fade out music before change occurs
2017-08-08 17:34:50 +00:00
Andrei Kortunov
4cc8afd25d
Add transparency for tooltips in game mode
2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248
Add transparency for interactive messageboxes in game mode
2017-08-08 20:36:50 +04:00
Lennart Bernhardt
546352dbe3
avoid starting sound updates more than necessary
2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45
remove redundant mMusicFader variable
2017-08-08 03:17:40 +02:00
scrawl
cd4525cf25
Merge pull request #1372 from akortunov/guifixes
...
Journalbook layout fixes
2017-08-07 18:49:13 +00:00
Andrei Kortunov
ab391f17db
Fixes regression in spell school detection (bug #4007 )
2017-08-07 12:12:57 +04:00
Andrei Kortunov
dd919b9f2c
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-07 09:55:50 +04:00
scrawl
ba72eb77f4
Merge pull request #1374 from akortunov/guardfix
...
Disable AiPursue package for player's followers
2017-08-06 21:11:08 +00:00
scrawl
7f5b615295
Merge pull request #1375 from MiroslavR/missing-import
...
Add missing include for isatty function
2017-08-06 21:10:11 +00:00
spycrab
632d39ca76
Allow starting at an (unnamed) exterior cell using --start (Feature #3941 )
2017-08-06 22:31:07 +02:00
Lennart Bernhardt
60a7d3d6e0
Fade out music before change occurs
2017-08-06 20:10:56 +02:00
MiroslavR
393f4ab758
Add missing include for isatty function ( Fixes #4002 )
2017-08-06 13:02:22 +02:00
Andrei Kortunov
72ce118d02
Disable AiPursue package for player's followers
2017-08-05 12:38:26 +04:00
Andrei Kortunov
cf7a6232d0
Combat AI: use WhenUsed enchantments
2017-08-05 12:18:38 +04:00
scrawl
fe8437ae10
Merge pull request #1371 from akortunov/journalfix
...
Do not allow to use journal in a main menu
2017-08-04 21:45:44 +00:00
Jake Westrip
63343b6241
Ensure jail does not decrease a skill past zero
2017-08-05 06:15:15 +10:00
Andrei Kortunov
23bda7613b
Do not allow to use journal in a main menu (bug #3991 )
2017-08-04 07:31:41 +04:00
scrawl
a78f254883
Merge pull request #1368 from akortunov/tradefix
...
Trade window improvements
2017-08-03 21:09:57 +00:00
scrawl
a63b9e33fd
Merge pull request #1369 from akortunov/tauntfix
...
Take in account a temporary disposition in isAggressive check (bug #3…
2017-08-03 21:01:03 +00:00
Andrei Kortunov
56a30d7aec
Journalbook layout fixes
2017-08-03 20:27:14 +04:00
Andrei Kortunov
d1489f5b42
Take in account a temporary disposition in isAggressive check (bug #3987 )
2017-08-03 19:18:31 +04:00
Andrei Kortunov
35beede065
Restock items after trade deal instead of trade window opening
2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23
Play Up sounds instead of Down ones in trade window (bug #3982 )
2017-08-03 18:39:59 +04:00
elsid
748f5225a9
Copy PathFinder::mPath back value when pass to MWMechanics::AiPackage::pathTo as dest
...
May become dangling reference because method may remove all elements from mPath.
2017-08-02 11:35:53 +03:00
scrawl
0d58a77f86
Merge pull request #1291 from MiroslavR/respawn_crash
...
Prevent respawned references from being added to the scene twice
2017-08-01 14:38:46 +00:00
Andrei Kortunov
604f9ee323
Split weapons and spells rating code from combat actions
2017-08-01 09:05:35 +04:00
MiroslavR
d24286273b
Prevent respawned references from being added to the scene twice in certain cases ( Fixes #3864 )
2017-08-01 00:11:14 +02:00
Andrei Kortunov
b7cfb1aaf4
Fixed DamageHealth and AbsorbHealth effects applying
2017-07-31 23:05:19 +04:00
scrawl
eac2e52841
Merge pull request #1329 from akortunov/priorityfix
...
Combat AI: make default spell priority calculation formula close to vanilla
2017-07-31 18:21:47 +00:00
scrawl
fde6e29628
Merge pull request #1326 from akortunov/spellpriority
...
Combat AI improvements [feedback needed]
2017-07-31 17:51:51 +00:00
scrawl
333648c975
Merge pull request #1324 from akortunov/doorfix
...
Improved doors detection
2017-07-31 17:42:53 +00:00
Andrei Kortunov
10eb6ec75f
AI: Check angle between actor and door
2017-07-31 19:28:02 +04:00
scrawl
9ac409e61c
Merge pull request #1287 from akortunov/spellsorting
...
Spellbuying menu improvements
2017-07-31 09:43:47 +00:00
scrawl
43279c49b5
Go back to index when selecting 'cancel' on topics list
2017-07-30 23:51:44 +02:00
scrawl
4b51fd23e0
Merge pull request #1356 from akortunov/guifixes
...
Add missing journal sounds (bug #3974 )
2017-07-30 21:36:04 +00:00
Andrei Kortunov
99b5f21a46
Add missing journal sounds (bug #3974 )
2017-07-29 19:41:46 +04:00
Allofich
dae19412f2
Fix problem with animations not looping
...
Fixes #3804
2017-07-29 20:54:11 +09:00
scrawl
631d79f1c8
Merge pull request #1346 from akortunov/aibreathe
...
AiBreathe AI package (feature #1374 )
2017-07-28 20:50:04 +00:00
scrawl
4c2487d55f
Merge pull request #1353 from akortunov/restfix
...
Update effects during rest (bug #3679 )
2017-07-28 20:46:14 +00:00
Andrei Kortunov
920021c61b
Update effects during rest (bug #3679 )
2017-07-28 16:50:52 +04:00
Andrei Kortunov
6ab36c0539
Spellbuying menu improvements
2017-07-27 13:20:18 +04:00
scrawl
1792886f1e
Merge pull request #1344 from julianko/dialogue_performance
...
Fix dialogue window performance
2017-07-26 22:05:45 +00:00
Julian
d7aa2a882d
improve dialogue window performance
2017-07-26 18:58:27 +02:00
scrawl
d3be4769ea
Merge pull request #1347 from akortunov/encumberancefix
...
Fixed encumberance check (bug #3963 )
2017-07-26 16:20:16 +00:00
Andrei Kortunov
548814bfbc
Added AiBreathe package (feature #1374 )
2017-07-25 10:58:04 +04:00
Andrei Kortunov
325ea10594
Fixed encumberance check (bug #3963 )
2017-07-25 10:28:33 +04:00
Andrei Kortunov
3ba0a336b7
Move spell magicka cost calculation to standalone function
2017-07-24 21:11:59 +04:00
Andrei Kortunov
337f0f876d
Fade screen in on a new game start
2017-07-23 11:04:58 +04:00
scrawl
9bc24ab629
Fix character preview zNear/zFar not being autocomputed as intended (Bug #3955 )
2017-07-22 00:38:27 +02:00
scrawl
5c11266a46
Fix character preview item selection
2017-07-22 00:06:43 +02:00
scrawl
c9f8a220dc
Update the tooltip when the focusObject is set
2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8
Remove tooltip object as part of WindowManager::clear
2017-07-20 20:59:09 +02:00
scrawl
7f634514a8
Fix the viewport of the character preview being set a frame ahead due to a threading issue
2017-07-19 17:43:15 +02:00
scrawl
20606a2aff
Add 'prediction time' setting for cell/terrain pre-loading
2017-07-19 16:44:37 +02:00
scrawl
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
scrawl
a629d48df6
Update the facedObject after the camera is updated
2017-07-19 13:05:51 +02:00
scrawl
2c7ce26fb7
Merge pull request #1336 from akortunov/evadefix
...
Combat AI: avoid enemy hits when casting Self-ranged spells
2017-07-16 20:05:21 +00:00
Andrei Kortunov
98f161c7fd
Combat AI: avoid enemy hits when casting Self-ranged spells ( fixes #3922 )
2017-07-16 22:38:23 +04:00
scrawl
2c95f40640
Merge pull request #1333 from akortunov/guidistortionfix
...
Disable sound distortion for GUI actions and PlaySound command [discussion]
2017-07-16 18:28:03 +00:00
Andrei Kortunov
2b22d10ebc
Spellview fixes
2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df
Quick keys menu fixes
2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913
Fixed Close button handler in EditEffectDialog ( fixes #3956 )
2017-07-15 14:03:36 +04:00
Andrei Kortunov
dca8317083
Disable sound distortion for player actions in GUI mode
2017-07-15 10:59:08 +04:00
Andrei Kortunov
3b163ce6ce
Disable sound distortion for PlaySound script command
2017-07-15 10:58:19 +04:00
scrawl
ada85aa1ee
Merge pull request #1331 from akortunov/guidistortionfix
...
Prevent GUI sounds distortion
2017-07-14 19:55:33 +02:00
Andrei Kortunov
54b4d93f79
Added a special function for GUI sounds playing
2017-07-10 15:48:00 +04:00
Andrei Kortunov
37952c9a79
Added door detection based by ray casting
2017-07-03 22:08:29 +04:00
scrawl
951c4e12e0
Fix crash introduced by commit 1d8a9ff622 ( Fixes #3940 )
2017-06-30 00:52:02 +02:00
Andrei Kortunov
143fdae6fe
Make spell priority calculation close to vanilla (bug #3937 ).
2017-06-28 14:02:51 +04:00
Andrei Kortunov
7fcb22b867
Do not show empty journal entries ( fixes #3891 )
2017-06-27 15:54:16 +04:00
scrawl
8d17565efd
Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900 )
2017-06-25 14:44:17 +02:00
scrawl
903e59f495
Don't reset idle time when there is no camera movement ( Fixes #3902 )
2017-06-25 13:08:55 +02:00
scrawl
44e2089098
Don't play 'menu click' sound for right clicks ( Fixes #3919 )
2017-06-25 12:52:59 +02:00
scrawl
534c81976c
Add missing cell update for physics system ( Fixes #3917 )
2017-06-25 12:47:57 +02:00
scrawl
62f0ba6045
Merge pull request #1279 from Allofich/position
...
Fix actors not returning to their wander locations
2017-06-20 00:57:44 +02:00
Andrei Kortunov
1a8f2bfc11
Combat AI: select target by priority
2017-06-16 16:11:12 +04:00
Andrei Kortunov
a2be73295b
Combat AI: take in account enemy weapon resistance
2017-06-16 13:33:42 +04:00
Andrei Kortunov
62b24eb078
Combat AI: do not use range weapons under water
2017-06-16 12:20:31 +04:00
Jordan Ayers
b277bd782e
Adjust restock calculations to ignore filled soul gems.
...
Bug #3684
2017-06-15 21:59:13 -05:00
Allofich
4f08084e79
Make stationary actors return to position on load
...
Also makes wandering actors resume their previous destination when an interrupting combat or pursuit ends.
(Fixes #3656 )
2017-06-15 18:33:50 +09:00
Allofich
028762a7dc
Make guards that are attacked try to arrest player
...
(Fixes #3706 )
2017-06-15 01:47:10 +09:00
scrawl
53264f34b3
Merge pull request #1321 from akortunov/spellpriority
...
Use mRange to check spell range instead of mArea.
2017-06-13 17:06:47 +02:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
Andrei Kortunov
87939bf3b1
Use mRange to check spell range instead of mArea.
2017-06-13 11:02:40 +04:00
scrawl
dd3f612e88
Merge pull request #1316 from akortunov/doorfix
...
Doors usage improvements
2017-06-12 23:34:40 +02:00
scrawl
80eb2ea35d
Merge pull request #1313 from akortunov/spellpriority
...
Make combat AI to do not cast target spells under water
2017-06-12 23:32:35 +02:00
scrawl
6d90f5a9a5
Merge pull request #1312 from akortunov/guifixes
...
Split greeting from topic response
2017-06-12 23:19:45 +02:00
Andrei Kortunov
e9d0bf7c12
Added missed return statement
2017-06-11 15:06:44 +04:00
Andrei Kortunov
9fdfb2a83f
Spell priority: make AI do not cast target spells when enemy is under water
2017-06-11 10:13:00 +04:00
Andrei Kortunov
cab51d26cc
Doors: small key search optimizations
2017-06-10 22:33:14 +04:00
Andrei Kortunov
188424d5d3
Allow AI to use keys to open doors
2017-06-10 22:31:17 +04:00
Bret Curtis
dbf149f9b2
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
2017-06-10 00:51:19 +02:00
Andrei Kortunov
4600f24e27
Playing sound when AI is opening a door
2017-06-09 22:52:40 +04:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0
replace and purge boost::math::gcd and other non-used headers
2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702
replace boost::bind
2017-06-09 19:08:53 +02:00
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
532b26bf3c
osgShadow experiment
2017-04-14 15:35:41 +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
MiroslavR
8f91732b09
Show starting abilities, powers and spells in stat-review window ( Fixes #2410 )
2016-11-19 21:51:19 +01:00
MiroslavR
7e5ba4d435
Fix default values of some GMSTs
2016-11-17 19:43:02 +01:00
scrawl
9d125bcaa2
Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
...
Fix various build issues with Visual Studio environment
2016-11-17 18:25:23 +01:00
scrawl
2368382ea5
Fix upside down rain particle texture
2016-11-17 17:52:20 +01:00
MiroslavR
5e46121046
Implement fleeing AI ( Closes #1118 )
2016-11-16 20:15:25 +01:00
Phillip Andrews
c18fc113e5
Changed missing library dependencies to simple fix
2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
2016-11-13 16:59:36 -06:00
Phillip Andrews
1861302dbd
Include various libraries for Visual Studio environment
2016-11-13 14:27:59 -06:00
MiroslavR
175cfd4dff
Fix overloaded virtual function warning
2016-11-13 17:22:50 +01:00
Allofich
fee39afe38
Don't allow resting on water with water walking
2016-11-13 19:50:33 +09:00
scrawl
f0d5cf7afb
Merge pull request #1112 from Assumeru/waterwalking
...
Move actors out of the water if there's room for them. Fixes #1138
2016-11-10 19:02:51 +01:00
Assumeru
05cc258ed3
Start trace from collision object origin
2016-11-10 15:38:14 +01:00
Assumeru
99bc4f733f
Trace up to waterlevel + halfextent
2016-11-09 18:03:10 +01:00
MiroslavR
e80636f0ca
Improve performance of repairing/recharging ( Fixes #2493 )
2016-11-06 11:01:46 +01:00
Nikolay Kasyanov
3adf4cb97f
Link OpenMW with libz on macOS
2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874
Revert "Link OpenMW with libz on macOS"
...
This reverts commit 0c4dd05118
2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118
Link OpenMW with libz on macOS
2016-11-05 12:09:47 +01:00
MiroslavR
5cd04af3fa
Fix horrible performance when resizing/moving the settings window
...
Resize widgets instead of reconstructing them.
2016-11-01 16:37:00 +01:00
scrawl
e0f613661e
Fix char -> int, fix shadowing warning
2016-10-30 20:10:33 +01:00
scrawl
cac8de0b29
Merge pull request #1116 from Allofich/paused
...
Don't update ripple simulation when paused
2016-10-30 19:26:56 +01:00
Allofich
19db070fca
Don't update ripple simulation when paused
2016-10-31 01:19:38 +09:00
Allofich
125e94ef0e
Fix shadowing warnings
2016-10-31 00:39:31 +09:00
Assumeru
25d64989b3
Check if the actor still exists /first/
2016-10-26 11:04:54 +02:00
Assumeru
a72cd896ca
Move actors out of the water if there's room for them. Fixes #1138
2016-10-25 19:26:17 +02:00
MiroslavR
301dd77efb
Save controls state ( Fixes #3598 )
2016-10-20 02:12:01 +02:00
MiroslavR
407abc605f
Fix auto-equipping of blunt weapons
2016-10-19 22:37:45 +02:00
scrawl
9c549a85ce
Merge pull request #1108 from MiroslavR/autoequip-weap
...
Auto-equip weapons
2016-10-19 20:45:47 +02:00
MiroslavR
76ddd9bebb
Add a setting for merchant auto-equipping prevention
2016-10-19 02:22:49 +02:00
scrawl
a7d4928593
Properly handle moved references in respawning code ( Fixes #3600 )
2016-10-18 23:51:45 +02:00
MiroslavR
1d3008594d
Autoequip weapons ( Fixes #3562 )
2016-10-18 13:57:35 +02:00
MiroslavR
14240cf7a2
Fix autoEquip to better match vanilla ( Fixes #3590 )
2016-10-16 17:27:17 +02:00
MiroslavR
7b59eda13a
Import base weather states before loading region modifiers ( Fixes #3594 )
2016-10-15 17:34:03 +02:00
scrawl
9e63c3ce63
Merge pull request #1103 from Allofich/warnings
...
Fix shadowing warnings
2016-10-14 21:18:12 +02:00
scrawl
5ccbabc27d
Fix build against bullet with profiler disabled ( Fixes #3592 )
2016-10-14 21:00:35 +02:00
Allofich
1c54f54ab8
Fix shadowing warnings
2016-10-15 00:12:46 +09:00
scrawl
2ed0277839
Merge pull request #1102 from Allofich/spells
...
Change several spell effects from instant to non-instant
2016-10-13 21:36:14 +02:00
scrawl
9d2e0124dc
Revert "Fix the cell changed flag no longer being reset after the player dies"
...
This reverts commit d7acec74fd
2016-10-13 17:44:03 +02:00
Allofich
610f36f47b
Set magic effects that don't support variable durations to use duration of 1
2016-10-14 00:13:08 +09:00
Allofich
1c2e04747d
Remove stray line
2016-10-13 23:38:21 +09:00
Allofich
675bd09462
Change several instant effects to be non-instant ( Fixes #2054 )
2016-10-13 23:38:21 +09:00
scrawl
db09858f59
Don't allow the player to activate objects when dead
2016-10-13 14:42:10 +02:00
scrawl
454d1ffaef
Make the cell change check during actor update more robust
2016-10-13 14:39:58 +02:00
scrawl
d7acec74fd
Fix the cell changed flag no longer being reset after the player dies
2016-10-13 14:38:35 +02:00
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
2016-10-13 01:42:50 +02:00
MiroslavR
611d02ad43
Remove unused code
2016-10-11 22:16:17 +02:00
MiroslavR
1906d96064
Non-player actors emitting light from a non-portable light item should be illuminated ( Fixes #3588 )
2016-10-11 22:15:51 +02:00
scrawl
3dce155d96
Fix uninitialized variable
2016-10-11 14:50:13 +02:00
MiroslavR
14468262a7
Fix "Not Local" dialog test to also test variable value instead of just its existence ( Fixes #3577 )
2016-10-11 02:53:43 +02:00
scrawl
530fb61ad0
Use OpenThreads instead of boost thread
...
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.
With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.
So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread
This patch opts for 3.)
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
2016-10-10 18:23:06 +02:00
scrawl
ae2036fa85
Merge pull request #1097 from Allofich/persuasion
...
Don't let intimidate bring disposition below 0 (Fixes #3584 )
2016-10-09 20:20:43 +02:00
Allofich
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
2016-10-10 02:20:24 +09:00
scrawl
1893617ec9
Improvements to ignored light list setting
...
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.
Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966
Make actors with non-portable lights in inventory glow ( Closes #2042 , #3338 )
2016-10-08 23:17:12 +02:00
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
2016-10-08 19:20:24 +02:00
scrawl
6615330430
Fix use of UnrefQueue in removeObject
2016-10-08 16:41:17 +02:00
scrawl
3019d70986
Use 'default icon' for items with no icon specified
2016-10-08 16:05:20 +02:00
scrawl
37bfa88b2d
Merge pull request #1094 from Allofich/alchemy
...
Fix reversed use of alembics and retorts
2016-10-06 19:02:24 +02:00
Allofich
498976775a
Fix reversed use of alembics and retorts
2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23
Merge pull request #1092 from Allofich/warnings
...
Fix shadowing warnings
2016-10-06 17:50:26 +02:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
Allofich
df03b32205
Coverity fixes
2016-10-05 23:32:26 +09:00
scrawl
721062a4bd
Merge pull request #1089 from Allofich/bound
...
Corrections for bound equipment
2016-10-04 18:34:27 +02:00
Allofich
506d0e8e54
Correction to display of 0-weight tooltips
2016-10-04 23:02:45 +09:00
Allofich
160da0b149
Treat 0-weight armor as light armor in some respects
2016-10-04 23:02:25 +09:00
MiroslavR
a05649e1d5
Use loop fallback for movement animations ( Fixes #3578 )
2016-10-03 22:36:56 +02:00
sandstranger
5230bf6528
disable using shaders for gles1 and Android
2016-10-03 20:31:08 +04:00
scrawl
44dffe55ab
Merge pull request #1083 from Allofich/onhit
...
Make AI response to spell hits more like original MW
2016-10-02 14:06:51 +02:00
scrawl
3d76ba5a7c
Merge pull request #1086 from Allofich/warnings
...
Fix shadowing warnings
2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb
Fix shadowing warnings
2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2
Consider reflected/absorbed hostile spells as assaults
2016-10-02 16:08:24 +09:00
MiroslavR
210c02d98e
Fix interactive ID validity checks in TypesetBookImpl
2016-10-01 21:07:17 +02:00
Allofich
a81a04e6d0
Remove unused line
2016-10-02 01:11:01 +09:00
Allofich
fa17784722
Change breaks to continues
2016-10-02 00:54:01 +09:00
scrawl
140be70a90
Merge pull request #1082 from Gladdy/master
...
Fix for segmentation fault on entering a cell
2016-10-01 16:42:47 +02:00
Allofich
a2e174a40f
Don't let water-only creatures prevent resting
2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc
Make AI response to spell hits more like original MW
2016-10-01 21:38:17 +09:00
Martijn Bakker
45ffdbb284
fixed a segmentation fault when entering a cell which contains someone already attacking you
2016-09-30 00:40:13 +01:00
scrawl
85c7d014d3
Use a shader to render the simple water, ensuring that fog is applied per pixel ( Fixes #2716 )
2016-09-28 21:10:44 +02:00
scrawl
4791fadb9a
Merge pull request #1078 from MiroslavR/hidden-items
...
Do not show uncarriable lights in item views
2016-09-24 23:27:23 +02:00
scrawl
dc07885d25
Merge pull request #1069 from Allofich/combat
...
Add unarmed attack selection to chooseBestAttack()
2016-09-24 18:38:10 +02:00
MiroslavR
52e00f5fef
Do not show uncarriable lights in item views
2016-09-24 18:01:31 +02:00
Allofich
0582f2d918
Adjust touch spell/telekinesis interaction
2016-09-23 21:44:49 +09:00
Allofich
0c603e986d
Don't play touch spell explosions on non-activatable statics
2016-09-23 03:25:24 +09:00
Allofich
eecf412b85
Recreate vanilla-like behavior for telekinesis and touch spells
2016-09-23 01:16:03 +09:00
Allofich
04c13ffab3
Add unarmed attack selection to chooseBestAttack()
2016-09-22 00:45:54 +09:00
scrawl
8379291f70
Merge pull request #1072 from Allofich/range
...
Give "on touch" spells same range as vanilla MW
2016-09-21 17:39:44 +02:00
Allofich
37cc4e9efe
Don't play area vfx for 0-area touch spells that hit non-actors
2016-09-22 00:14:08 +09:00
Allofich
563ae479e8
Give "on touch" spells same range as vanilla MW
2016-09-21 23:34:32 +09:00
scrawl
c6ef26ba4b
Merge pull request #1070 from mrcheko/pathfinding
...
fix using potion as weapon
2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386
remove dynamic_cast to ActionPotion
2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2
fix using potion as weapon
2016-09-19 23:43:26 +03:00
scrawl
718178bfe9
Merge pull request #1066 from MiroslavR/setinvisible
...
Don't use base invisibility magnitude for setting alpha
2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37
Vfx after Divine/Almsivi intervention should be attached to player
2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10
Use correct vfx for teleport spells
2016-09-19 18:12:30 +09:00
MiroslavR
744667e163
Don't use base invisibility magnitude for setting alpha ( Fixes #3555 )
2016-09-19 00:05:50 +02:00
scrawl
cd4b182091
Merge pull request #1051 from Allofich/textures
...
Use spell effect particle textures
2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67
Cleanup
2016-09-19 05:20:04 +09:00
scrawl
30d5c7488d
savegamedialog: don't reset the character selection scrollbar when a character is deleted
2016-09-18 19:26:41 +02:00
scrawl
7bd445fb83
Don't crash if FontManager::getByName returns NULL ( Fixes #3552 )
2016-09-17 17:21:35 +02:00
scrawl
7bbdeb5f85
Merge pull request #1061 from MiroslavR/nameless-actors
...
Allow activating actors without a name
2016-09-15 17:51:14 +02:00
MiroslavR
f323f231db
Allow activating actors without a name ( Fixes #3551 )
2016-09-15 16:47:50 +02:00
Allofich
5aad1d81f4
Remove no longer used parameter
2016-09-15 23:41:20 +09:00
MiroslavR
55e670c5fe
Fix animation state not saving
...
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
2016-09-15 16:11:54 +02:00
Allofich
322a0ba8bb
Initialize speed for magic projectiles
2016-09-14 21:39:44 +02:00
Allofich
7eb62b5d3a
Initialize speed for magic projectiles
2016-09-15 01:44:53 +09:00
Allofich
dc8ff5e49b
Play all sfx and use particle textures for permanent enchantments
2016-09-15 00:27:08 +09:00
Allofich
527bbd5243
Change size_t to int for consistency
2016-09-15 00:09:40 +09:00
Allofich
01774c656c
Fix for blood effect texture overrides
2016-09-14 23:28:57 +09:00
Allofich
a033ba3bd2
Override spell textures by NiTexturingProperty
2016-09-14 23:03:04 +09:00
scrawl
1362264561
Fix warning
2016-09-13 02:49:19 +02:00
scrawl
65dc12cdd6
Remove unused parameter
2016-09-13 02:48:36 +02:00
scrawl
feaf3652a5
Merge pull request #1055 from mrcheko/pathfinding
...
prevent running in circles around path points
2016-09-13 02:47:49 +02:00
scrawl
3cd73d0fc3
Merge pull request #1058 from Allofich/onhit
...
Don't play blood effects for completely resisted hits
2016-09-13 02:47:43 +02:00
Allofich
34851349de
Pass hitPosition by const reference
2016-09-13 00:59:56 +09:00
Allofich
bce0166931
Don't play blood effects for resisted hits
2016-09-12 22:46:32 +09:00
Allofich
3bbde312b9
Remove unneeded code
2016-09-12 19:54:06 +09:00
Allofich
3f6543860a
Make creatures use fHandToHandReach
2016-09-11 00:01:20 +09:00
Allofich
c98d4e0473
Allow dodging for bipedal creatures
2016-09-10 23:56:31 +09:00
Allofich
7bc4535c0d
Make NPCs dodge according to target's weapon reach
2016-09-10 23:30:46 +09:00
mrcheko
72786fef9d
prevent running in circles around path points
...
addresses http://bugs.openmw.org/issues/2229
2016-09-09 23:57:19 +03:00
Allofich
368828b217
Update TODO comments
2016-09-10 01:38:05 +09:00
Allofich
f31342894a
Put simpler condition first
2016-09-09 00:03:38 +09:00
Allofich
bca477ca8a
Apply particle textures like original engine does
2016-09-08 23:59:23 +09:00
Allofich
85349da26c
Add comments
2016-09-08 23:58:00 +09:00
Allofich
502a758eff
Use particle texture for "hit" effects
2016-09-08 23:58:00 +09:00
Allofich
fe3a033642
Use particle textures for spell projectiles
2016-09-08 23:56:54 +09:00
Allofich
02610828c1
Don't play area vfx for non-area spells on actors.
2016-09-08 02:07:01 +09:00
Allofich
88d992a020
Create area effect visual for non-area spells
2016-09-08 00:05:45 +09:00
Marc Zinnschlag
03a35c38df
add missing item when executing the Equip instruction
2016-09-06 16:33:26 +02:00
scrawl
05e4542d33
Merge pull request #1048 from mrcheko/pathfinding
...
Pathfinding unification v2
2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648
AiPackage: fix path recalc on cell change
...
AiTravel: remove unneeded code
2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947
aiwander: reset path on cell change
...
remove redundant mIsWanderDestReady var
2016-09-05 15:18:34 +03:00
scrawl
fbc9b90ebe
Cleanup
2016-09-05 00:04:11 +02:00
scrawl
8677a6f803
Merge pull request #1044 from Allofich/magic
...
Changes to multi-effect spells
2016-09-05 00:03:10 +02:00
Allofich
c617e90755
Fix for loading projectile speed
2016-09-05 05:41:24 +09:00
Allofich
f8270f6bd5
Consolidations and cleanup for multi-effect spells
2016-09-05 05:30:51 +09:00
Allofich
dbd7c038b2
Add loading code for multi-effect projectiles
2016-09-05 03:45:13 +09:00
Allofich
c6cd1f813b
Attach projectiles to nodes of multi-effect bolts
2016-09-05 02:59:33 +09:00
Allofich
5a0d3feb98
Use C++ int-to-string conversion
2016-09-05 02:52:44 +09:00
Allofich
a36f7babc1
Double scaling of spell explosions
2016-09-05 02:18:57 +09:00
Allofich
60384399ee
Fix errors and warnings
2016-09-05 01:39:18 +09:00
Allofich
f49ebee56a
Play sounds for multi-effect projectile
2016-09-04 23:57:06 +09:00
Allofich
37f07f7435
Combine into one multi-effect magic projectile
2016-09-04 22:35:29 +09:00
Allofich
10842462c7
Send lists of models and sounds to launchMagicBolt
2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d
Fix warnings
2016-09-04 17:42:27 +09:00
Allofich
ecec7d8215
Fix spells having explosions for wrong range type
2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b
Casting animation comes from the first effect
2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7
Don't apply projectile effects multiple times
2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403
Use last effect of spell for hand effect color
2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e
Use average speed for multiple spell projectiles
2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2
Shoot projectiles of spells with multiple effects
2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8
Play all of a spell's casting effects
2016-09-04 17:42:27 +09:00
Allofich
b4577fe751
Allow multiple spell hit sounds on single target
2016-09-04 17:42:27 +09:00
scrawl
7859e378df
Merge pull request #1045 from Allofich/attack
...
Fix AI melee attack
2016-09-04 00:22:59 +02:00
Allofich
5c2bc515fe
Remove overridden code in aicombat
2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea
fix zero div in getXAngleToDir
2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0
Remove no longer used parameter
2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f
Remove attacktype movement
2016-09-03 21:16:59 +09:00
Allofich
154dcc942c
Let NPCs use attack type regardless of movement
2016-09-01 22:43:33 +09:00
Allofich
b99c2c54d8
Allow Water Walking on non-submerged creatures
2016-09-01 03:53:53 +09:00
Allofich
22b11c5947
Move Water Walking check into checkEffectTarget()
2016-08-31 23:56:31 +09:00
Allofich
f25c65260c
Limit sMagicinvalidEffect to self-cast spells
2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b
Use castByPlayer bool
2016-08-31 17:18:23 +09:00
Allofich
a6216d883f
Don't allow casting Water Walking in deep water
2016-08-31 04:37:50 +09:00
Allofich
9e1bfde46f
Add comment
2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7
Disable current idle when an action is taken
2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d
Update idle if current idle finishes playing
2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399
Sometimes play 1st-person weapon idle to Stop key
2016-08-25 21:34:45 +09:00
Allofich
7db31ab58a
Correct telekinesis glow length
2016-08-24 01:21:15 +09:00
Allofich
9b0e5d6b59
Loop mid-animation idles when loading a save game
2016-08-23 19:50:56 +09:00
scrawl
0fd810707e
Remove unused stopLooping()
2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18
Run setLoopingEnabled after the anim queue is updated
2016-08-22 23:33:24 +02:00
scrawl
719e884b7c
Remove duplicate code
2016-08-22 23:25:00 +02:00
scrawl
0c9882956a
Add AnimState::shouldLoop()
2016-08-22 23:25:00 +02:00
scrawl
6450c9be27
Simplify condition
2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b
Emulate vanilla animation loops more closely
2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f
Revert "Revert "Merge pull request #993 from mrcheko/pathfinding""
...
This reverts commit 3732979eec
2016-08-19 22:15:26 +03:00
Allofich
b332a13b4e
Don't restart looped animations on repeated calls
2016-08-18 23:23:38 +09:00
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3
LocalMap no longer depends on osgViewer
2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb
Remove unneeded setGraphicsContext() calls
2016-08-16 19:33:09 +02:00
scrawl
0209c70583
Improve performance by skipping update if transform is unchanged
2016-08-16 17:50:59 +02:00
scrawl
4751e0e953
Improve performance of animateCollisionShapes by caching the node path
2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84
Revert "animateCollisionShape checks if the shape is really animated"
...
This reverts commit cbf344663f
2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d
Merge pull request #1025 from Allofich/anim
...
Use loopfallback for idle animation groups
2016-08-16 16:30:55 +02:00
Allofich
c05782581e
Account for all instances of play()
2016-08-16 02:52:55 +09:00
Allofich
6163c7bb03
Use loopfallback for idle animation groups
2016-08-16 01:15:26 +09:00
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
scrawl
71f786ff84
Delete the WorkQueue first
...
Fixes a potential crash on exit.
2016-08-14 18:10:29 +02:00
scrawl
3732979eec
Revert "Merge pull request #993 from mrcheko/pathfinding"
...
This reverts commit 5190275b37d7845012bf
2016-08-14 18:04:33 +02:00
scrawl
c3340ec143
Merge pull request #1022 from Allofich/anim
...
Make loopgroup loop correct number of times
2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5
Merge pull request #1023 from psi29a/small_fixes
...
small fixes
2016-08-14 16:49:26 +02:00
scrawl
30b549124e
Fix use-after-free
2016-08-14 16:42:29 +02:00
scrawl
c65492193c
Use osg::clone
2016-08-14 16:41:44 +02:00
scrawl
0fbc0d0da7
Attempt to silence warning
2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937
clang says that these must be in the MWWorld namespace
2016-08-14 16:17:09 +02:00
scrawl
8c44334409
Merge pull request #1021 from Allofich/weight
...
Corrections to tooltip displays of zero-weight items
2016-08-14 15:14:58 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
Allofich
a381a15b19
Make loopgroup loop correct number of times
2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014
Allow showing value of zero-weight lights
2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff
Use getWeightString() to avoid casting to int
2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e
Allow weight tooltips for gold and keys if not 0
2016-08-14 19:32:43 +09:00
Allofich
caf025f93d
Don't show 0 weight tooltips except for potions
2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae
Don't show weight tooltip for 0-weight equipment
2016-08-14 18:37:41 +09:00
Allofich
ee2702087c
Make zero-weight boots play light boot footsteps
2016-08-14 17:27:47 +09:00
scrawl
f3f02fe154
Merge pull request #1019 from Allofich/bound
...
Don't allow re-casting of bound equipment spells
2016-08-13 21:02:32 +02:00
Allofich
d617651307
Don't allow re-casting of bound equipment spells
2016-08-14 02:05:23 +09:00
MiroslavR
ddbfe0c944
Fix disabled door markers appearing on the map ( Fixes #3348 )
2016-08-12 03:14:36 +02:00
Allofich
cb9bb92b26
Play locked sounds on locked objects instead of actors
2016-08-10 21:31:14 +09:00
Allofich
83b715734f
Move part of addGlow() to addSpellCastGlow()
2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8
Use raw pointer to node in glowupdater
2016-08-10 01:35:22 +09:00
Allofich
67f31d948e
Add removeTexture method
2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03
Glowupdater fix when using shaders
2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c
Cleanups
2016-08-10 00:25:33 +09:00
Allofich
775162ccdf
Rewrite spell glow implementation
2016-08-09 22:56:53 +09:00
Allofich
cad41599cf
Fix travis build error and warnings
2016-08-09 22:56:53 +09:00
Allofich
1910128e9c
Don't remove uniform when spell glow ends
2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb
Minor rewrite, make "open" spells play glow effect
2016-08-09 22:56:53 +09:00
Allofich
e132b52a69
Handle spell glows within updatecallback
2016-08-09 22:56:53 +09:00
Allofich
123c626f2d
Add glow when using telekinesis on doors
2016-08-09 22:56:53 +09:00
Allofich
57138b416e
Fix spell glows to only run one at a time
2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40
Make non-actors glow when they cast spells
2016-08-09 22:56:53 +09:00
Allofich
dca7b4beb7
Make non-actors also play spell casting sounds
2016-08-09 22:56:53 +09:00
scrawl
0bbd715f65
Fix the cloned StateSet not being assigned
2016-08-09 01:13:19 +02:00
scrawl
5190275b37
Merge pull request #993 from mrcheko/pathfinding
...
Pathfinding unification
2016-08-09 00:41:03 +02:00
scrawl
46538b9438
Merge pull request #1011 from devnexen/master
...
Mainly making compilable under OpenBSD.
2016-08-07 20:34:03 +02:00
mrcheko
e2cd87fcc7
fix veritcal aiming
2016-08-07 19:23:08 +03:00
Marc Zinnschlag
aa1ed9b172
Merge remote-tracking branch 'aesylwinn/RenderWater'
2016-08-07 17:03:58 +02:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Aesylwinn
5753f52b47
Move water mesh + simple state generation to components library.
2016-08-05 13:25:05 -04:00
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
2016-08-03 03:52:35 +02:00
Internecine
90735d226d
Replaced Store::find usage with Store::search to remove exception handlers.
2016-08-02 11:43:41 +12:00
Internecine
14165352f6
Added exception handlers when trying to retreive enchantment and magic effect data.
2016-08-01 13:16:42 +12:00
mrcheko
293a0f768c
use real distance to target to determinate 'ready to attack' state
2016-07-27 23:43:32 +03:00
Marc Zinnschlag
63fd1e8df7
Merge remote-tracking branch 'origin/master'
2016-07-27 15:49:11 +02:00
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
2016-07-27 00:58:31 +01:00
MiroslavR
4a3529488b
Fix possible reference duplication when the refID is modified by a plugin (Bug #3471 )
2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220
Fix moved references disappearing when modified by a plugin
2016-07-22 02:12:03 +02:00
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
2016-07-22 01:59:02 +02:00
AnyOldName3
59639e3988
Make it build again (but remove the new functionality).
2016-07-20 15:16:53 +01:00
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
2016-07-20 02:48:57 +01:00
Marc Zinnschlag
c17e1ca24a
Merge remote-tracking branch 'anyoldname3/ignore-hash-test'
2016-07-19 16:19:28 +02:00
MiroslavR
19a8800d4d
Fix camera distance not getting reset to max value ( Fixes #3473 )
2016-07-17 19:52:12 +02:00
mrcheko
203804ff15
fix AiPackage repeating
2016-07-16 19:08:49 +03:00
mrcheko
59a1a6d117
checkWayIsClear: remove PATHFIND_CAUTION_DIST check
2016-07-16 19:07:48 +03:00
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
2016-07-12 17:09:57 +01:00
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
2016-07-12 01:06:57 +01:00
mrcheko
b4e94e2aae
Merge remote-tracking branch 'upstream/master' into pathfinding
...
# Conflicts:
# apps/openmw/mwmechanics/aipackage.cpp
# apps/openmw/mwmechanics/aipackage.hpp
2016-07-12 00:45:01 +03:00
AnyOldName3
1a0642f1db
Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing
2016-07-11 22:33:15 +01:00
mrcheko
8d4f0660ce
fix hardcoded melee attack ranges
2016-07-12 00:17:43 +03:00
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c
Trim unneeded code
2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f
Fix an issue preventing compilation, revealing another that doesn't make much sense.
2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
2016-07-11 01:16:32 +01:00
scrawl
2329812988
Merge pull request #995 from Allofich/traps
...
Trap and lock fixes
2016-07-10 17:19:36 +02:00
scrawl
67d3571fac
Fix activation distance in third person mode
2016-07-10 17:10:19 +02:00
mrcheko
05794505c8
travis build fix
2016-07-10 17:25:50 +03:00
Allofich
599e6708ec
Allow using keys to open trapped objects of lock level 0
2016-07-10 23:08:11 +09:00
Allofich
cabe038a97
Make lockpick and probe sounds 3d positional
2016-07-10 22:08:42 +09:00
Allofich
249918612d
Play trap disarm sound when key used on trapped object
2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf
Play trap activation sound on trapped object, not actor
2016-07-10 21:39:53 +09:00
mrcheko
f57858b750
Merge remote-tracking branch 'upstream/master' into pathfinding
...
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
2016-07-10 14:36:48 +03:00
MiroslavR
b0fcad4cb8
Don't stack effects for scrolls of the same type ( Fixes #3466 )
2016-07-10 03:49:09 +02:00
MiroslavR
75a66ced20
Fix actors lacking turning animations while in first person mode
2016-07-10 01:48:54 +02:00
mrcheko
d2fe6fe857
Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding
...
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/aicombat.hpp
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/aipackage.cpp
# apps/openmw/mwmechanics/aipackage.hpp
# apps/openmw/mwmechanics/aiwander.cpp
# apps/openmw/mwmechanics/aiwander.hpp
2016-07-09 22:59:54 +03:00
MiroslavR
dc0bc5b68c
Implement Face instruction (Feature #1424 )
2016-07-09 02:16:47 +02:00
scrawl
6f376bd499
Merge pull request #983 from Allofich/telekinesis
...
Don't allow telekinesis on actors or teleport doors
2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989
Clean up, remove unnecessary code changes
2016-07-09 02:24:08 +09:00
Allofich
53ceefa46a
Allow some telekinesis on teleport doors
2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0
Implement and use getDistanceToFacedObject()
2016-07-08 23:28:49 +09:00
Allofich
0e5c3f781f
Only allow trap distance check to apply to player
2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d
Cleanups
2016-07-07 21:57:00 +09:00
Allofich
cb621939fd
Streamline trap code
2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49
Implement and use new method allowTelekinesis()
2016-07-07 21:54:31 +09:00
Allofich
8014f37879
Avoid duplicate code
2016-07-07 21:54:30 +09:00
Allofich
538209b0a2
Change variable to mRatio and initialize it
2016-07-07 21:54:29 +09:00
Allofich
e25e698978
Fix telekinesis check for activators
2016-07-07 21:54:29 +09:00
MiroslavR
80f2ae0ca7
Apply magic effects while waiting/sleeping
2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4
Player's death now interrupts waiting/sleeping
2016-07-06 00:15:25 +02:00
MiroslavR
d4e29e3e0c
Clear projectiles on non-incremental time advances
2016-07-06 00:11:58 +02:00
mrcheko
0793e4a80e
refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck
2016-07-05 21:38:41 +03:00
Allofich
c1236f4113
Simplified code
2016-07-04 20:25:25 +09:00
Allofich
c02695e56d
Cleanups and fixes
2016-07-04 16:06:16 +09:00
Allofich
199607423b
Use iMaxActivateDist for AI actors that use Activate packages
2016-07-04 16:06:16 +09:00
Allofich
64d298d2b5
Use raycast distance when player activates trapped object
2016-07-04 16:06:15 +09:00
Allofich
64d53a2314
Avoid double raycasts when using getFacedObject
2016-07-04 16:06:04 +09:00
Allofich
574e40db5e
Don't allow telekinesis on activators
2016-07-04 01:50:47 +09:00
scrawl
343dccdbcc
Merge pull request #980 from scrawl/voice_fix
...
Voice fix
2016-07-02 21:55:46 +02:00
scrawl
d96e49c04a
Do not set change flag when running forEach on an empty cell
2016-07-02 20:44:14 +02:00
scrawl
8f62ea2e80
Fix for "RigGeometry rendering with no skeleton" errors
2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
2016-07-02 19:48:11 +02:00
scrawl
96757a3b7c
Fix non-predefined cells not being saved correctly
2016-07-02 19:43:08 +02:00
MiroslavR
c8b61cb234
Cache magic effects in MWMechanics::Spells
2016-07-02 12:50:00 +02:00
MiroslavR
700dde116e
Show remnant corprus effects in magic window
2016-07-02 05:17:24 +02:00
MiroslavR
54f52f7bae
Implement effect removal for abilities ( Fixes #3455 )
2016-07-01 18:50:28 +02:00
scrawl
252b27f0ef
Remove getEyePos()
2016-07-01 15:04:59 +02:00
Allofich
b29e9e9c77
Don't allow telekinesis on actors or teleport doors
2016-07-01 02:27:20 +09:00
MiroslavR
72d2daae90
Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects
2016-06-29 22:54:11 +02:00
scrawl
528de956da
Merge pull request #981 from Allofich/magicka
...
Fix timing of some magicka calculations
2016-06-29 20:42:18 +02:00
Allofich
2290346296
Fix timing of some magicka calculations
2016-06-30 02:59:09 +09:00
scrawl
5eb6c548d7
Merge pull request #965 from kpp/find_tinyxml
...
Find tinyxml
2016-06-28 02:51:51 +02:00
scrawl
509e5dfe4d
Include cleanup
2016-06-27 22:10:30 +02:00
scrawl
4699a8098b
Include fix
2016-06-27 21:51:18 +02:00
scrawl
1739351b7a
Remove now unused Sound_Decoder::rewind()
2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0
Don't analyze the loudness for sounds that don't need it
2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb
Analyze the loudness data as the stream is decoded for playback
...
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.
The benefit is that we need to decode the audio just once instead of twice.
We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
2016-06-27 21:32:54 +02:00
scrawl
fc293aa048
Merge pull request #978 from Allofich/fatigue
...
Fix update of fatigue display
2016-06-27 17:05:05 +02:00
Allofich
1602eb3de8
Fix so that keepPlayerAlive() will not run twice
2016-06-27 21:43:49 +09:00
Allofich
19a20a6871
Fix update of fatigue display
2016-06-27 21:17:06 +09:00
MiroslavR
7244809c4a
Remove redundant part of condition
2016-06-26 15:17:52 +02:00
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
2016-06-26 03:22:58 +02:00
Allofich
dc468dd139
Fix magicka and fatigue calculations from fortifying attributes
2016-06-25 19:21:49 +09:00
Allofich
5d3aebd04b
Update disposition check between persuasion attempts
2016-06-22 01:47:09 +09:00
terrorfisch
be25e2ba75
Make NPCs use both hands in weaponless combat.
2016-06-20 10:24:51 +02:00
Allofich
b1be3596dc
Cleanup of #include statements
2016-06-18 10:56:28 +09:00
Allofich
4a38fb8650
Use namespace block in aiactivate
2016-06-17 20:59:37 +09:00
scrawl
f549b5fb7a
Add missing include
2016-06-17 04:34:31 +02:00
scrawl
c18de84798
Fix a crash that could occur when two or more plugins move a deleted ref to another cell ( Fixes #3446 )
2016-06-17 02:27:49 +02:00
scrawl
3ce63c3f6e
Merge pull request #967 from Allofich/AIPackageFixes
...
AI package cleanups
2016-06-16 20:22:51 +02:00
Allofich
c2b51112f2
AI package cleanups
2016-06-16 17:17:56 +09:00
scrawl
693d3cea4a
Float to surface fix
2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07
Split refreshCurrentAnims into multiple functions
2016-06-15 03:14:44 +02:00
scrawl
372f2e2f18
Merge pull request #962 from Allofich/AIPackageFixes
...
Duration fixes for Follow and Escort
2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e
Duration fixes for Follow and Escort
2016-06-15 02:11:30 +09:00
scrawl
3ec4ee6290
Make a copy of map key to work around it being invalidated ( Fixes #3329 )
2016-06-13 02:06:44 +02:00
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
2016-06-12 21:40:02 +03:00
scrawl
4acfe1a7e4
Move cleanupSummonedCreature to the mechanics manager (Bug #3439 )
2016-06-12 02:43:33 +02:00
scrawl
910ad76e29
Remove spell effects when a summoned creature expires (Bug #3439 )
2016-06-12 00:41:13 +02:00
scrawl
b7e45b046d
When a summoned creature dies, wait for its death animation to complete before removing it (Bug #3439 )
2016-06-12 00:40:55 +02:00
scrawl
a825882c6b
Process death events at the end of the death animation ( Fixes #1873 )
2016-06-12 00:04:50 +02:00
scrawl
37afe966cf
Update comment
2016-06-11 21:25:40 +02:00
scrawl
b6230bd31f
Reject weather dialogue conditions when in an interior cell ( Fixes #3437 )
2016-06-11 18:26:20 +02:00
scrawl
844cbc5a14
Add isNullAction() method to fix compiler warning
2016-06-11 18:26:20 +02:00
scrawl
7a30ef5cc1
Do not consider actors following the player as hostiles
2016-06-11 18:26:20 +02:00
scrawl
a85932a62b
Ignore the collision box offset when launching projectiles ( Fixes #3201 )
2016-06-10 23:47:01 +02:00
scrawl
c6601ab2ab
Do not use the collision box offset for combat hit tests ( Fixes #3201 )
2016-06-10 23:47:01 +02:00
scrawl
8fcc1911d9
Use fCombatDistance as the creature attack range
2016-06-10 23:47:01 +02:00
Daniel Pettersson
943d9d97dc
Slowfall now stops momentum when jumping
2016-06-10 15:22:12 +02:00
scrawl
a00e4de5c3
Fix another bug related to vanity mode toggle
2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9
Fix queueing of vanity mode toggle (Bug #3421 )
2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9
Do not use/assign the camera distance in first person mode ( Fixes #3421 )
2016-06-10 01:05:43 +02:00
scrawl
166cced22f
Merge pull request #957 from svaante/master
...
Added 1.5 bonus for ranged weapons when weapons are rated
2016-06-10 00:01:05 +02:00
scrawl
a14f1bc222
Merge pull request #954 from Allofich/AIWanderDuration
...
Improve duration calculations in Wander AI
2016-06-09 23:46:37 +02:00
Allofich
55ac1fab68
Change Wander duration to run on a counter
2016-06-10 04:36:18 +09:00
Daniel Pettersson
256439f884
Added 1.5 bonus for ranged weapons when weapons are rated
2016-06-09 21:23:36 +02:00
scrawl
abcd2219e8
Ignore the calling actor in getEnemiesNearby / getActorsFighting
2016-06-08 22:13:21 +02:00
scrawl
165f048792
Do not count dead NPCs as observers ( Fixes #3434 )
2016-06-07 22:01:44 +02:00
scrawl
12eea9ed69
Remove magic number in getMaxActivationDistance
2016-06-07 15:18:36 +02:00
scrawl
8fb8c2bae5
Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order
2016-06-07 02:43:25 +02:00
scrawl
f417d7780a
Fix the enemy nearby check (Bug #3423 )
2016-06-07 01:55:34 +02:00
scrawl
dfc2f3469a
Don't play music if no playlist is set
2016-06-07 01:36:09 +02:00
scrawl
f64bc3c7ef
Pass the victim to commitCrime on pickpocket detection ( Fixes #3424 )
2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728
Fix crash in race dialog when no head or hair are available
2016-06-06 01:04:14 +02:00
scrawl
a45643f150
Merge pull request #949 from Allofich/master
...
Fix return values for AITravel
2016-06-05 21:16:28 +02:00
Allofich
065d6a391d
Don't repeat sequences of only one non-wander AI
2016-06-06 04:12:49 +09:00
scrawl
2ee414abe4
Merge pull request #943 from kpp/find_bullet
...
Find bullet
2016-06-05 16:02:34 +02:00
Ben Shealy
5085afa3d7
Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading
2016-06-04 12:28:47 -04:00
scrawl
3645b3357e
Fix improper assignement of spawn point in placeAt for non-actors (Bug #3417 )
2016-06-02 21:24:19 +02:00
scrawl
ab2089bbf3
Throw an exception if placeAt is passed an invalid direction parameter
2016-06-02 21:19:02 +02:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
Allofich
bce66c629a
Change editor-placed AI packages to cycle
2016-05-29 17:34:40 +09:00
scrawl
496cb85b01
Do not cancel Ai packages when on loading ( Fixes #3409 )
...
This piece of code was an attempt to fix up save games made before commit d3b76b7006
2016-05-28 20:27:05 +02:00
scrawl
d487007167
Remove debug code
2016-05-27 17:43:36 +02:00
scrawl
e396e6f2ea
Adjust the eye level for line of sight checks ( Fixes #3407 )
2016-05-27 17:42:17 +02:00
scrawl
a2153a6213
Remove outdated comment
2016-05-25 21:41:05 +02:00
scrawl
5d4f58c828
Fix being unable to activate objects when scripts are disabled
...
The if statement was a leftover of the previous activate implementation and is no longer needed.
2016-05-25 21:37:56 +02:00
scrawl
3f1df4caa6
Don't auto-equip ammunition ( Fixes #3401 )
2016-05-24 13:21:43 +02:00
scrawl
44dd67ee0f
Fix a potential crash for lights without a model that have "off by default" flag set
2016-05-19 22:35:25 +02:00
scrawl
a9561f738a
Move RemoveParticlesVisitor to animation.cpp
2016-05-19 22:35:17 +02:00
scrawl
0efbdb25ee
Improve const-correctness in Animation
2016-05-19 22:30:14 +02:00
scrawl
3749821809
Choose a random death animation for actors that start the game as dead ( Fixes #3397 )
2016-05-19 21:40:05 +02:00
scrawl
b0180cb6b4
Fix current region check (Bug #3391 )
2016-05-16 02:05:02 +02:00
scrawl
3b31e8f66e
Do not set AiPackageDone flag for non-Aipackages ( Fixes #3392 )
2016-05-14 19:19:37 +02:00
scrawl
fcbcc004a3
Don't use unordered_map
2016-05-11 02:35:17 +02:00
scrawl
78bac93021
Merge pull request #940 from kpp/find_ffmpeg
...
Find ffmpeg
2016-05-10 17:41:30 +02:00
scrawl
59cfcb38e2
Scale the sunlight specular color by weather's GlareView value ( Fixes #3375 )
2016-05-10 17:39:57 +02:00
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
2016-05-10 12:43:54 +03:00
scrawl
3584e59402
Fix incorrect parameter to changeCell ( Fixes #3388 )
2016-05-08 18:59:41 +02:00
scrawl
a7e6219091
Merge pull request #939 from kpp/rewrite_esm_name_t
...
Rewrite ESM::NAME_T
2016-05-08 13:15:05 +02:00
Marc Zinnschlag
b4e341e1e2
Merge remote-tracking branch 'aesylwinn/RenderPathgrid'
2016-05-08 10:15:12 +02:00
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
2016-05-07 23:27:33 +03:00
Roman Proskuryakov
d7046878a8
Fix uninitialized values in MWMechanics::AiCombat
2016-05-07 20:41:47 +03:00
Michał Moroz
40cc6a4164
Changed AiSequence::stack to push_back lower priority packages instead of push_front (Bug #3384 )
2016-05-04 13:55:36 +02:00
Aesylwinn
14ae232938
Remove now unnecessary factory class.
...
It was originally used for storing normals, but that functionality
was removed.
2016-05-03 16:13:23 -04:00
Aesylwinn
5cac882123
Replace game version of pathgrid rendering with component.
2016-05-02 22:10:17 -04:00
scrawl
2ca7415708
Handle DialInfo::mFactionLess (Bug #3380 )
2016-05-01 00:10:50 +02:00
scrawl
93b2f09224
Workaround for some AI functions being incorrectly handled as AI packages (Bug #3378 )
2016-04-29 18:07:35 +02:00
scrawl
5edfe8c41c
Reduce the wander fast forward overcrowding offset ( Fixes #3370 )
2016-04-23 22:47:42 +02:00
scrawl
c64b8ab297
Merge pull request #928 from Salgat/bug-1320
...
AiWander - Creatures in cells without pathgrids do not wander (Bug #1320 )
2016-04-17 18:10:47 +02:00
Austin Salgat
be16857f96
Fix wrong height being used for water detection
2016-04-17 10:46:09 -05:00
Austin Salgat
e9157e9200
Fix idle animation and Fix water creature manual wandering
2016-04-16 20:38:58 -05:00
Austin Salgat
3dec10c686
Update variable to prevent underflowing
...
While not an issue presently, the variable may be used in the future in a way that could create issues if it underflows.
2016-04-16 17:51:13 -05:00
Austin Salgat
84179c262f
Update manual wandering to prevent actor from leaving/entering water
...
Water creatures will stay in the water, while land creatures will stay on land when wandering.
2016-04-16 16:39:13 -05:00
Austin Salgat
fc03216d48
Refactor to reuse existing obstacle detection
2016-04-16 12:14:00 -05:00
Austin Salgat
34726c24d9
Fix mDistance being reset prematurely
...
This was causing wandering without pathgrids to become disabled for most wandering units. Additionally, wandering now behaves the same for both NPCs and creatures.
2016-04-15 21:56:41 -05:00
scrawl
d784a77f4c
Set the default player cell in the StateManager ( Fixes #3269 )
2016-04-15 00:49:36 +02:00
Austin Salgat
92b352989a
Add logic for NPC wandering without pathgrids
2016-04-13 20:48:08 -05:00
Austin Salgat
c02881a4f8
Fix creatures not wandering
2016-04-12 21:16:55 -05:00
scrawl
ba3f4f122a
Account for the stack count in HasSoulGem (Bug #3340 )
2016-04-12 21:39:05 +02:00
scrawl
4854d6b093
Set the TalkedToPc flag for voiced dialogue ( Fixes #3346 )
2016-04-12 21:39:05 +02:00
scrawl
d15901b454
Merge pull request #927 from Salgat/bug-2981
...
When waiting, NPCs can go where they wouldn't go normally (Bug #2981 )
2016-04-12 00:55:20 +02:00
Austin Salgat
38f5a225ea
Refactor PathFinder functions to be useable by AiWander
...
This avoids having to duplicate the distanceSquared and getClosestPoint functions.
2016-04-10 20:44:08 -05:00
Austin Salgat
96231e17f0
Fix wandering NPCs going off pathgrid
...
If multiple pathgrids exist in the same cell, sometimes an NPC would port to a different pathgrid that was nearby. This is an issue since it allowed them to do things like travel through walls to inaccessible areas. Now they will only wander along the closest connected pathgrid.
2016-04-10 20:21:18 -05:00
scrawl
b2dc18e1aa
Merge pull request #926 from bentsherman/master
...
Allow +/- buttons in trade window to decrease offer to 0
2016-04-10 00:05:29 +02:00
Ben Shealy
8703609649
Allow +/- buttons in trade window to decrease offer to 0
2016-04-09 17:49:21 -04:00
Bret Curtis
2c90b0b78d
fix a few spelling mistakes
2016-04-07 11:55:49 +02:00
scrawl
79c8f69b24
Clear the class selected / race selected flags when starting a new game ( Fixes #3326 )
2016-04-03 20:23:28 +02:00
scrawl
cf62d860b2
Fix the adjustPlayerPos parameter not being respected in all cases
2016-03-30 01:54:03 +02:00
scrawl
e1dda9675d
Add "preload instances" setting, disabling this may help if you are low on memory.
2016-03-30 00:13:37 +02:00
scrawl
2162d9ed02
Restore key focus to the save list when the deletion confirmation messagebox is accepted
...
Gives me an idea for a new MyGUI feature - per-window widget focus as it is usually the case in other GUI toolkits.
2016-03-29 01:29:55 +02:00
scrawl
02016f4c56
Don't reset the save list when deleting a save ( Fixes #3279 )
2016-03-29 01:26:55 +02:00
scrawl
7a962fd8c5
Properly escape the keybinding labels (Bug #3281 )
...
A certain key name ("#") was being interpreted as a MyGUI markup code.
2016-03-29 01:13:17 +02:00
scrawl
5cda89c15d
Don't attempt to preload more exterior cells than the cache can hold (Bug #3273 )
2016-03-29 00:50:30 +02:00
scrawl
83f1ab6d25
Add a time threshold to the removing of preloaded cells when the maximum cache size is reached (Bug #3273 )
2016-03-29 00:50:21 +02:00
scrawl
4ac276b06c
Update the resource cache every frame (Bug #3273 )
...
Not much of a point in limiting this to cell loadings, since the update is done from a background thread and should be fairly cheap anyway if there's nothing to unload.
2016-03-29 00:50:13 +02:00
scrawl
2f8be401cc
Add the unref work items to the front of the workqueue (Bug #3273 )
...
Ensures that memory still gets freed even if the workqueue is overloaded.
2016-03-29 00:27:56 +02:00
scrawl
e71aa53574
Don't allow playing a sound/soundgen key more than once at the same time on the same object ( Fixes #2689 )
2016-03-24 19:26:12 +01:00
scrawl
5bd8ef247d
Do not adjust the player position when loading a savegame ( Fixes #2089 )
2016-03-24 17:18:08 +01:00
scrawl
92c2a10de4
Fall back to 'warrior' for not found class images ( Fixes #3228 )
2016-03-24 16:52:16 +01:00
scrawl
157c11398d
Add terrain parallax mapping
2016-03-22 21:46:15 +01:00
scrawl
e381957105
Don't assume that class ID and name are equal
2016-03-21 11:51:34 +01:00
scrawl
90cc1de46c
Do not list custom made classes in the pick class dialog
2016-03-21 11:46:25 +01:00
scrawl
b332704df7
Switch hand-to-hand attack types randomly when "always use best attack" is turned on ( Fixes #3259 )
2016-03-19 18:03:59 +01:00
scrawl
a6e23d03d3
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
2016-03-18 00:42:22 +01:00
scrawl
102f9719f7
Remove some garbage
2016-03-18 00:39:27 +01:00
scrawl
79eb2d20e0
Cleanup
2016-03-18 00:39:19 +01:00
scrawl
12ec90f9e7
Change default argument, fix GetDisposition
2016-03-18 00:38:02 +01:00
scrawl
bc5adfa4fe
Merge pull request #913
2016-03-18 00:31:55 +01:00
scrawl
30402f75e3
Use xbase_anim_female as the base skeleton for female NPCs ( Fixes #3258 )
2016-03-18 00:24:38 +01:00
scrawl
2b38d10449
Always add xbase_anim
2016-03-18 00:17:05 +01:00
scrawl
50acdf3e47
Move createCharacter inside the try block
2016-03-14 00:03:02 +01:00
scrawl
a0cc9de088
Make the creation of save file directories even more explicit
2016-03-14 00:00:11 +01:00
scrawl
b7b7c0612d
Make getCurrentCharacter create argument explicit
2016-03-13 23:48:44 +01:00
scrawl
7463c0c353
Addition to last commit, don't create a save directory on death
2016-03-13 23:48:22 +01:00
scrawl
426a6fdcc2
Don't create the save directory on loading a game
...
This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.
2016-03-13 23:42:08 +01:00
scrawl
d7c7bb850b
ToggleAI cleanup
2016-03-12 20:32:42 +01:00
scrawl
d840c7d5eb
Slightly tweak the spawn point heuristics
...
Fixes an issue with hlaalu building exits
2016-03-11 22:48:28 +01:00
scrawl
85bd4f52f0
Improve occlusion query geometry rendering
2016-03-11 00:09:46 +01:00
scrawl
93ec289b1d
Improve setting of occlusion query state
2016-03-10 23:18:20 +01:00
scrawl
14e1911820
Fix memory leaks
2016-03-10 20:38:14 +01:00
scrawl
f898bf493f
Don't use Geodes
2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8
Include cleanup
2016-03-10 12:59:17 +01:00
ae-g-i-s
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
2016-03-08 21:30:28 +01:00
ae-g-i-s
2f1c6c740c
Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )"
...
This reverts commit 000597236e
2016-03-08 20:41:39 +01:00
ae-g-i-s
9585a12fb1
Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check
2016-03-08 20:40:47 +01:00
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
2016-03-07 22:44:03 +01:00
scrawl
d0aba0d9ee
Catch exceptions thrown during reference loading (Bug #3238 )
2016-03-07 21:28:50 +01:00
ae-g-i-s
000597236e
Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )
2016-03-06 18:29:32 +01:00
scrawl
0fc65db6bb
Remove parts before setting the new object root
2016-03-06 11:34:15 +01:00
scrawl
0df975a4d7
Properly detach nodes in CopyRigVisitor ( Fixes #3234 )
2016-03-06 11:33:07 +01:00
scrawl
60a12b3dee
Use MyGUI's castType function
2016-03-05 20:00:51 +01:00
scrawl
763f647412
Add ItemModel::allowedToInsertItems
2016-03-05 19:53:24 +01:00
scrawl
373c1e7602
Assign the PageDisplay on initialization
2016-03-05 19:48:01 +01:00
scrawl
5ea7446eeb
Change a dynamic_cast to static_cast
2016-03-05 19:41:45 +01:00
scrawl
c085e503c6
Pass the btCollisionObject as const
2016-03-05 16:09:56 +01:00
scrawl
004f0d37d5
Fix the projectile launch position for spells cast from objects ( Fixes #3235 )
2016-03-05 15:56:54 +01:00
scrawl
910e41e3c4
Allow an Object to be specified as ignore parameter for castRay
2016-03-05 15:56:19 +01:00
scrawl
76b47c6d5d
PlaceAt: don't correct spawn points for non-actors
2016-03-04 12:25:22 +01:00
scrawl
16dca126dd
PlaceAt: don't use actor's X/Y rotation
2016-03-04 12:22:13 +01:00
scrawl
3d6323f13a
Force-enable hasWater() for exterior cells ( Fixes #3222 )
2016-03-02 17:02:30 +01:00
scrawl
67c8faec75
Infinite loop fix
2016-03-02 13:20:23 +01:00
scrawl
08f06c6c2d
Fix a crash that could occur with actors that define 'bip01 spine1' but do not define 'bip01 spine2' ( Fixes #3223 ).
2016-03-01 16:58:39 +01:00
scrawl
2821f46a18
Corpse clearing fix
2016-03-01 11:31:08 +01:00
scrawl
87871d7d54
Don't add RotateController to an uncontrolled node
2016-02-29 20:23:19 +01:00
scrawl
36bb255bc0
Use safePlaceObject in spawnRandomCreature
2016-02-29 17:30:38 +01:00
scrawl
7485abe5c3
Use safePlaceObject for summoned creature spawning
2016-02-29 17:27:07 +01:00
scrawl
be62ae758a
Fall back to sides first
2016-02-29 17:26:52 +01:00
scrawl
6df71f6250
Factor out safePlaceObject function
2016-02-29 17:19:22 +01:00
scrawl
11f00e3aa9
Rename safePlaceObject to placeObject
2016-02-29 17:05:18 +01:00
scrawl
be2f20f564
PlaceAt: attempt to select a safe spawn location ( Fixes #2515 , Fixes #1384 , Fixes #2925 )
2016-02-29 16:54:00 +01:00
scrawl
04d51d5871
Always update the ingredient icons ( Fixes #3220 )
2016-02-29 13:25:09 +01:00
scrawl
27577ce765
Add ESM::Land::DEFAULT_HEIGHT
2016-02-28 16:49:18 +01:00
scrawl
fc3de3302e
Create a collision shape for the default terrain
2016-02-28 16:47:41 +01:00
scrawl
84e9d346ef
Remove duplicate include
2016-02-28 16:47:33 +01:00
Marc Zinnschlag
ebaeabc962
Merge remote-tracking branch 'scrawl/respawn'
2016-02-28 10:19:14 +01:00
scrawl
3a2dccad4b
Implement 'Show' script instruction
2016-02-27 13:40:53 +01:00
scrawl
f2f601b958
Implement corpse clearing ( Fixes #2363 )
2016-02-27 13:20:50 +01:00
scrawl
c3ef387208
Vanilla-compatible creature/NPC respawning ( Fixes #2369 , Fixes #2467 )
2016-02-27 12:53:07 +01:00
Marc Zinnschlag
290da132b1
Merge remote-tracking branch 'scrawl/activate'
2016-02-26 16:03:50 +01:00
scrawl
a97eae864d
Fix the ObstacleCheck time step ( Fixes #3211 )
2016-02-26 13:15:41 +01:00
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
2016-02-26 13:08:35 +01:00
scrawl
d05603c7fe
Directly apply On Target 'When Strikes' enchantments instead of launching a projectile ( Fixes #3212 )
2016-02-22 19:42:54 +01:00
scrawl
5cdee454ef
Fix degree/radians mixup ( Fixes #3213 )
2016-02-22 19:13:56 +01:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
8bd16e4d5a
Don't compute the world matrix multiple times
2016-02-22 18:58:19 +01:00
scrawl
c5d3e6c993
Disable preloading of levelled lists
2016-02-22 14:31:02 +01:00
scrawl
8f81df2bd3
Cleanup
2016-02-20 20:34:56 +01:00
scrawl
0db7163363
Add specular mapping for terrain
2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950
Add specular mapping for objects
2016-02-20 19:55:08 +01:00
scrawl
5cf2441b10
ShaderVisitor: support automatic recognition of normal maps based on file pattern
...
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
2016-02-20 18:00:43 +01:00
scrawl
6a0ac824bd
Fix terrain error in OpenCS
2016-02-19 15:00:58 +01:00
scrawl
17c4dfdb62
Use the lowest unused texture unit for the enchanted item glow texture
2016-02-18 23:10:58 +01:00
scrawl
5e12a1b4ef
Add enchanted item glow to the shader
2016-02-18 23:05:44 +01:00
scrawl
268594dcf1
Recreate shader in NpcAnimation::setAlpha
2016-02-18 22:48:53 +01:00
scrawl
1232607385
Remove pointless widget names in settings layout file
2016-02-18 19:41:06 +01:00
scrawl
a73512afb7
Add shader settings to settings.cfg
2016-02-18 19:38:34 +01:00
scrawl
3969675afa
Remove unused settings
2016-02-18 19:38:34 +01:00
scrawl
553408949a
Fix character preview
2016-02-18 19:37:57 +01:00
scrawl
bd279c63f7
Fix fog on water
2016-02-18 19:37:57 +01:00
scrawl
9376811213
Vertex lighting shader
2016-02-18 19:37:57 +01:00
scrawl
044e0a829a
Add fog
2016-02-18 19:37:57 +01:00
scrawl
41e1fd407d
Disable shaders for the sky
2016-02-18 19:37:56 +01:00
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
2016-02-18 19:37:55 +01:00
scrawl
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
2016-02-18 19:36:17 +01:00
scrawl
6fb0022b35
Update preloading settings
...
Disable 'preload fast travel' by default.
Add 'min cache size' and 'max cache size' settings.
Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
2016-02-18 17:47:10 +01:00
scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
scrawl
83a9a164bc
Raise the required bullet version to 2.83
...
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587 ).
2016-02-15 00:33:17 +01:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
Marc Zinnschlag
29c2a99316
Merge remote-tracking branch 'scrawl/physics'
2016-02-13 16:20:48 +01:00
Marc Zinnschlag
d1d7804620
Merge remote-tracking branch 'origin/master'
2016-02-13 10:13:25 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
796a4a795a
Avoid the 'spiral of death'
2016-02-13 03:09:28 +01:00
scrawl
383524c688
Run physics in fixed timesteps, use the remainder to interpolate between current and previous state
...
Based on http://gafferongames.com/game-physics/fix-your-timestep/
2016-02-13 03:03:34 +01:00
scrawl
d1375cd3a3
Crashcatcher: limit backtrace to a sensible number of stack frames
...
When a stack overflow occurs, trying to print the whole stack would cause the process to hang indefinitely.
2016-02-13 01:35:53 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
2016-02-12 14:46:45 +01:00
scrawl
48ac0bef3e
Repair save games affected by bug #3080 ( Fixes #3160 )
2016-02-11 16:34:02 +01:00
scrawl
6bfeb118d7
Fix cleanup issue
2016-02-10 19:08:17 +01:00
scrawl
d3808580b0
Rename lightRoot to sceneRoot
2016-02-10 19:07:47 +01:00
scrawl
fb219fea17
Fix respawning of NPCs/creatures when they were moved to a different cell
2016-02-10 19:07:01 +01:00
Marc Zinnschlag
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
2016-02-10 16:23:38 +01:00
scrawl
5e876b1379
Add missing include
2016-02-10 15:34:06 +01:00
scrawl
9f729667fb
Remove debug output
2016-02-09 21:16:11 +01:00
scrawl
0865cea211
Preload terrain
2016-02-09 21:16:11 +01:00
scrawl
596fe56bfd
Make Land::loadData thread safe
2016-02-09 20:21:56 +01:00
scrawl
1457a0de78
Use the UnrefQueue to delete BulletShapeInstances
2016-02-09 19:04:59 +01:00
scrawl
3552b3a82c
Don't create a BulletShapeInstance for actors
2016-02-09 18:51:17 +01:00
scrawl
246566cef4
Preload instances in BulletShapeManager
2016-02-09 18:48:49 +01:00
scrawl
e28dc3e72f
Preload instances in SceneManager
2016-02-09 18:35:26 +01:00
scrawl
ce3cce24a5
Remove unneeded dynamic_cast
2016-02-09 16:39:05 +01:00
scrawl
8ece1885cd
Animation: don't create the NodeMap if we don't need it
2016-02-09 16:39:05 +01:00
scrawl
ae031b23d4
Do not detach NPC parts in destructor
2016-02-09 16:10:42 +01:00
scrawl
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
2016-02-09 15:45:35 +01:00
scrawl
f6f9eff9a6
Preload levelled creatures
2016-02-09 03:06:00 +01:00
scrawl
6806741d9b
Add settings for disabling the individual preloading types
2016-02-09 01:58:33 +01:00
scrawl
10a3e270a3
Preload fast travel destinations
2016-02-09 01:52:02 +01:00
scrawl
1cda2bf796
Preload sky & water from the main menu
2016-02-09 01:28:13 +01:00
scrawl
f9082502f8
Move construction of WorkQueue to RenderingManager
2016-02-09 01:02:40 +01:00
scrawl
d16450bff2
Fix correctActorModelPath in preloader not being used
2016-02-09 00:28:27 +01:00
scrawl
1b8e82e929
Preload NPC body parts
2016-02-09 00:26:22 +01:00
scrawl
84dcf59c50
Fix preloading of equipment parts that don't separate gender
2016-02-08 22:57:47 +01:00
scrawl
effe022bb2
Move preload model list to MWClass, preload NPC head/hair
2016-02-08 20:52:32 +01:00
scrawl
fc0be77e4c
Preload keyframes
2016-02-08 15:51:31 +01:00
scrawl
ef5de94548
Fix correctActorModelPath
2016-02-08 15:31:09 +01:00
scrawl
e4e313fe12
Remove outdated comment
2016-02-08 14:41:21 +01:00
scrawl
c8054424c9
Preload items equipped by NPCs
2016-02-07 22:37:52 +01:00
scrawl
a81b10b415
Make the cache expiryDelay configurable
2016-02-07 19:05:55 +01:00
scrawl
5efaa9817c
Add preloading settings
2016-02-07 18:01:14 +01:00
scrawl
610257cd3a
Preload the exterior cell grid
2016-02-07 07:37:56 -08:00
scrawl
8592166eeb
Preload surrounding cells when preloading an exterior cell destination
2016-02-07 05:27:19 -08:00
scrawl
023c87b215
Preload cell when the player goes near a teleport door. It works!
2016-02-07 05:13:46 -08:00
scrawl
a7b217def2
AI: don't cast fortify effects ( Fixes #3184 )
2016-02-07 01:29:11 +01:00
scrawl
162287b82d
AI combat actions: rename 'target' to 'enemy'
2016-02-07 01:29:11 +01:00
scrawl
94c05c6baa
AI: don't cast useless resist spells ( Fixes #2760 )
2016-02-07 01:29:02 +01:00
scrawl
d3415387a5
AI: take into account success chance when rating a spell
2016-02-07 01:18:20 +01:00
scrawl
d855a13b44
Clear the resource cache from the worker thread
2016-02-07 00:36:31 +01:00
scrawl
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
2016-02-07 00:14:13 +01:00
scrawl
df57d4bfba
Use a common base class for resource managers
...
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
2016-02-06 17:22:17 +01:00
scrawl
a72af4a1a3
cout that should be cerr
2016-02-05 23:25:01 +01:00
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
2016-02-05 23:21:54 +01:00
scrawl
499beda665
Clear terrain texture cache before applying filter settings
2016-02-05 23:20:13 +01:00
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
2016-02-05 23:10:27 +01:00
scrawl
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
2016-02-05 23:05:43 +01:00
scrawl
f99f403dda
Rename TextureManager to ImageManager
2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5
Remove TextureManager::getTexture2D
...
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.
This is closer to what the OSG serializer does.
Streamlines the TextureManager and will make it easier to multithread.
2016-02-05 23:01:11 +01:00
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
5b972ee777
Move texture filtering settings to SceneManager
...
Practical benefits:
- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
2016-02-05 21:03:10 +01:00
scrawl
c9a67ab423
Do not add scripts from levelled creatures twice (Bug #2806 )
...
Do not insert objects from within a CellStore visitor
2016-02-05 18:29:33 +01:00
scrawl
8e5398d85b
Add missing initializations
2016-02-05 14:35:29 +01:00
scrawl
7d647088ab
Make the local map cell distance configurable
2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd
Refactor local map updates
...
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.
Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
2016-02-05 01:19:45 +01:00
scrawl
300379617e
Accept a const CellStore in findInteriorPositionInWorldSpace
2016-02-05 01:19:45 +01:00
scrawl
41ebf62fb1
Accept a const CellStore in getNorthVector
2016-02-05 01:19:45 +01:00
Marc Zinnschlag
11a4a31bfd
Merge remote-tracking branch 'scrawl/localscripts'
2016-02-04 13:49:43 +01:00
scrawl
69c2c4fcc1
updateMergedRefs before reading MVRF tags ( Fixes #3161 )
2016-02-03 19:13:26 +01:00
scrawl
cc3563359e
Refactor local script iteration ( Fixes #2806 , Fixes #3108 )
...
This should be much safer. Don't use recursion. Don't fail if mIgnore happens to be in the list twice. Don't rely on preconditions / assertions.
2016-02-03 16:16:20 +01:00
scrawl
187d2bccda
Warn about adding a local script twice (Bug #2806 )
2016-02-03 16:09:10 +01:00
scrawl
aa9905b0eb
Do not crash when the water normal map is missing ( Fixes #3179 )
2016-02-03 15:24:28 +01:00
scrawl
74c18f532e
Fix comment
2016-02-03 14:40:59 +01:00
scrawl
5878291064
Fix the path correction for animation sources provided in NPC record ( Fixes #2444 )
2016-02-03 14:40:21 +01:00
scrawl
b9d1d6144a
Don't reveal unknown potion effects in alchemy window ( Fixes #3146 )
2016-02-02 22:50:11 +01:00
scrawl
d3b76b7006
Don't stack Ai packages ( Fixes #3101 , Fixes #3080 , Fixes #2697 )
2016-02-02 22:20:56 +01:00
scrawl
7aeafd3bb9
Revert "Apply the AiTravel maxRange to AiEscort as well ( Fixes #2697 )"
...
This reverts commit 1f543b4d79
2016-02-02 22:08:12 +01:00
scrawl
145756c0a1
Partly revert "Avoid directly iterating the actor map ( Fixes #3173 )"
...
Caused issues when a summoned creature is removed as part of the magic effect update.
Fixes #3178
2016-02-02 15:57:15 +01:00
scrawl
59d2de118f
Avoid directly iterating the actor map ( Fixes #3173 )
2016-02-02 00:50:21 +01:00
scrawl
50ed061154
AiWander: reset mAllowedNodes on cell change ( Fixes #3176 , Fixes #3130 )
2016-02-02 00:41:40 +01:00
scrawl
dda4273349
Actors that start the game as dead do not float to the surface ( Fixes #3177 )
...
This has a minor bug (can you spot it?) that affects the vanilla engine as well, unfortunately not so simple to fix.
2016-02-01 23:18:18 +01:00
scrawl
832eaae27b
Do not apply effects with CasterLinked flag when there is no valid caster
2016-02-01 22:57:08 +01:00
scrawl
c34314ae26
When an actor dies purge all spell effects cast by that actor ( Fixes #3175 )
2016-02-01 22:52:28 +01:00
scrawl
c403a6b113
Don't apply constant magic effects to dead actors ( Fixes #3174 )
2016-02-01 22:30:08 +01:00
Alexander "Ace" Olofsson
776c715ccd
Move NoTraverseCallback to mwrender/util.hpp
2016-01-29 23:21:58 +01:00
scrawl
aec8c38461
Move observer_ptr include where it belongs
2016-01-25 21:03:33 +01:00
scrawl
fc6fe9acfb
Do not crash ModVertexAlphaVisitor when there are no vertex colors
2016-01-25 18:52:20 +01:00
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
2016-01-25 14:13:16 +01:00
scrawl
b0431833a1
Fix some defects reported by Coverity CI
2016-01-21 16:08:04 +01:00
scrawl
f0971ee8ad
Implement Fixme script instruction
2016-01-20 04:07:07 +01:00
scrawl
ce9a18fb87
Merge pull request #879 from jordan-ayers/bugfix/1544
...
Improve Drop Command - Bugfix/1544
2016-01-19 15:02:51 +01:00
Jordan Ayers
5699cf7f09
Barter: Leave unsold projectiles equipped.
2016-01-18 20:00:18 -06:00
Jordan Ayers
1ff49cc637
Improve Drop command behavior. ( Fixes #1544 )
2016-01-18 19:58:19 -06:00
Jordan Ayers
c82d9a1e87
Adjust ContainerStore / InventoryStore to allow partial unequip of items.
2016-01-18 19:56:35 -06:00
mrcheko
b304e98568
implement ActionWeapon::getCombatRange (move logic from AiCombat)
2016-01-15 21:49:27 +03:00
scrawl
87beb73970
Correction
2016-01-15 16:34:57 +01:00
scrawl
fbf07133ea
Document usage of node masks
2016-01-15 16:31:24 +01:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
scrawl
4f2a031f4e
Improve error message
2016-01-14 18:34:47 +01:00
scrawl
0b84b3c2cf
Don't crash when region weather chances don't add to 100
...
The invalid weather ID was resulting in out-of-bounds vector access later in the code.
2016-01-14 17:41:39 +01:00
Jordan Ayers
2ce2e8a1e7
Add missing OOB slot check to InventoryStore.
2016-01-12 21:35:23 -06:00
scrawl
ef1a1125e0
Fix an error in restocking logic ( Fixes #3131 )
2016-01-12 17:10:23 +01:00
scrawl
4e6a60672d
When a spell explodes on an actor do not apply it to that actor twice ( Fixes #3142 )
2016-01-12 00:40:09 +01:00
scrawl
3089aeccc4
Factor out SceneUtil::addLight
2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0
Move configureLight to a separate file
2016-01-11 23:10:16 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
scrawl
f315a4386f
Accept an implicit reference in Journal ( Fixes #3135 )
2016-01-11 23:07:01 +01:00
scrawl
ef20962fc5
Disable fog of war rendering on the HUD map by default
2016-01-11 22:58:08 +01:00
scrawl
ca4e859f61
Remove unused argument
2016-01-11 22:58:01 +01:00
scrawl
4690fd3f22
Change the local map exploration radius to better match the original engine
2016-01-11 22:57:57 +01:00
scrawl
4f8f166f69
Fix GetPcInJail to work as in the original engine
2016-01-11 22:57:25 +01:00
scrawl
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
2016-01-11 22:57:16 +01:00
scrawl
745b29a995
Remove a debugging leftover
2016-01-05 17:01:21 +01:00
scrawl
d9d6228c94
Implement PageDisplay::_updateView ( Fixes #3125 )
2016-01-05 16:54:09 +01:00
scrawl
5952498e9e
Explicitely cast a size_t to int
2016-01-05 16:53:51 +01:00
scrawl
446c714727
Fix a possible memory leak in error case
2016-01-04 20:39:08 +01:00
scrawl
e6619c5306
Rebuild actor animations on resurrection ( Fixes #3124 )
...
A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
2016-01-04 20:27:38 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
mrcheko
bcb1f4ed05
refactor AiCombat: remove all pathfinding code, adopt new version of
...
AiPackage::pathTo;
fix couple of warnings;
2016-01-03 15:33:52 +03:00
Poncho
b1020dcd42
Use correct direction multipliers during awareness check
2016-01-02 12:24:39 -06:00
scrawl
1905f0bf2d
Add support for placing BodyParts in a cell (Bug #3118 )
2016-01-02 01:30:06 +01:00
scrawl
a9f0f30bb8
Reject conditions testing agaist Choice when not currently in a choice ( Fixes #3117 )
2016-01-01 23:55:52 +01:00
mrcheko
b960b0af93
rewrite pathTo for clearer logic; reapply Scrawl's aifollow threshold
2016-01-01 16:41:45 +03:00
scrawl
0333c40047
Fix typo in SameRace dialogue function (function was inverted, Fixes #3116 )
2016-01-01 02:59:55 +01:00
scrawl
6fde02ea42
LocalScripts: initialize mIter
2016-01-01 02:59:55 +01:00
scrawl
7f7e8c63bf
Correct path to gamecontrollerdb.txt ( Fixes #3112 )
2015-12-31 00:37:47 +01:00
mrcheko
d7d5cc6689
Merge remote-tracking branch 'upstream/master' into pathfinding
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aifollow.cpp
apps/openmw/mwmechanics/aipackage.cpp
apps/openmw/mwmechanics/aipackage.hpp
apps/openmw/mwmechanics/aiwander.cpp
apps/openmw/mwmechanics/pathfinding.hpp
Ogre::Vector3->osg::Vec3f; REACTION_INTERVAL->AI_REACTION_TIME; MakeOgreVec3->MakeOsgVec3
2015-12-29 19:15:40 +03:00
scrawl
63b9b075aa
Do not allow soul trapping the same creature more than once ( Fixes #3102 )
2015-12-26 18:47:22 +01:00
scrawl
0bec6e5fbe
Fix 'failed to find animation' warnings when a spell was equipped before the werewolf transformation
2015-12-26 18:45:09 +01:00
scrawl
6b67911658
Unset DrawState_Spell when becoming a werewolf
2015-12-26 18:26:55 +01:00
scrawl
f052c05018
Move werewolf functions from World to MechanicsManager
2015-12-26 18:23:13 +01:00
scrawl
53334d08a2
Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves ( Fixes #3100 )
2015-12-26 18:15:57 +01:00
scrawl
a1e163ed20
Correct an error in the timestamp subtracting logic ( Fixes #3105 )
2015-12-26 00:26:13 +01:00
scrawl
db7b80b503
Revert "Accept a ConstPtr in ItemPtr tooltips"
...
This reverts commit 41c8ec56e0
2015-12-19 22:52:35 +01:00
scrawl
2176ac592c
Call updateDialogueGlobals before dialogue starts ( Fixes #3034 )
2015-12-19 21:58:49 +01:00
scrawl
5ac226f519
Another collision mask fix
2015-12-19 17:02:57 +01:00
scrawl
e5d9ee30f4
Add count argument to copyObjectToCell
...
Fixes the gold bug introduced in c9ca5bc946
2015-12-19 16:48:32 +01:00
scrawl
41c8ec56e0
Accept a ConstPtr in ItemPtr tooltips
2015-12-19 16:37:26 +01:00
scrawl
5a7bbbd508
Accept a ConstPtr in ToolTips::setFocusObject
2015-12-19 16:34:26 +01:00
scrawl
32d5dece58
Add count argument to getToolTipInfo
2015-12-19 16:29:07 +01:00
scrawl
0d4729dcd5
Use the const version of CustomData::as*
2015-12-19 16:19:52 +01:00
scrawl
16e3699739
Fix collision mask in castSphere
2015-12-19 16:18:12 +01:00
scrawl
b0894ea20d
Accept a ConstPtr in hasToolTip
2015-12-19 16:15:45 +01:00
scrawl
29d0f448b4
Add const version of World::getAnimation
2015-12-19 16:15:45 +01:00
scrawl
51c77c5045
Accept a ConstPtr in getDoorState
2015-12-19 16:15:45 +01:00
scrawl
7a2ca5580a
Accept a ConstPtr in RippleSimulation
2015-12-19 15:51:41 +01:00
scrawl
53f4b92426
AiEscort do not follow target through doors
...
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
2015-12-19 15:15:44 +01:00
scrawl
2c51e7345f
Use a separate collision type for doors ( Fixes #1962 )
2015-12-18 18:32:42 +01:00
scrawl
604b5d24e9
Use a ConstPtr in SoundManager
2015-12-18 18:11:30 +01:00
scrawl
a0fb31e3b1
Accept a ConstPtr in getLOS
2015-12-18 18:03:47 +01:00
scrawl
029d467ea5
Accept a ConstPtr in getItemsOwnedBy, getContainersOwnedBy
2015-12-18 18:00:18 +01:00
scrawl
388aed1748
Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions
2015-12-18 17:56:48 +01:00
scrawl
ed101ad35a
Remove redundant getPlayerAnimation function
2015-12-18 17:44:57 +01:00
scrawl
c9ca5bc946
Accept a ConstPtr in placeObject
2015-12-18 17:42:59 +01:00
scrawl
6c505ca06f
Accept a ConstPtr in getHitContact
2015-12-18 17:38:21 +01:00
scrawl
0796f49c17
Accept a ConstPtr in various physics getters
2015-12-18 17:36:14 +01:00
scrawl
795032621c
Use a ConstPtr for the ActorMap and ObjectMap
2015-12-18 17:30:39 +01:00
scrawl
7a8a7e3dd6
Add const version of getAnimation
2015-12-18 17:21:51 +01:00
scrawl
7a4aac1842
Use a ConstPtr for the PtrAnimationMap
2015-12-18 17:20:29 +01:00
scrawl
553132cb51
Accept a ConstPtr in launchProjectile
2015-12-18 17:13:54 +01:00
scrawl
8f9fc87565
Accept a ConstPtr in LocalScripts::setIgnore
2015-12-18 17:09:11 +01:00
scrawl
1212c07266
Pass a string by reference
2015-12-18 17:08:26 +01:00
scrawl
f35ab12979
Accept a ConstPtr in InventoryStore::isEquipped
2015-12-18 17:06:58 +01:00
scrawl
3856f931db
Accept a ConstPtr in ContainerStore::addNewStack
2015-12-18 17:04:54 +01:00
scrawl
e1c6261fee
Accept a ConstPtr in ContainerStore::getType
2015-12-18 17:03:49 +01:00
scrawl
edde5bd065
Accept a ConstPtr in ContainerStore::stacks
2015-12-18 17:01:21 +01:00
scrawl
04f7a8f8eb
Remove redundant getId function
2015-12-18 16:58:38 +01:00
scrawl
266fbbef48
Accept a ConstPtr in canLock
2015-12-18 16:50:32 +01:00
scrawl
c43f80633a
Accept a ConstPtr in getEnchantmentPoints
2015-12-18 16:48:19 +01:00
scrawl
303521002d
Accept a ConstPtr in adjustScale
2015-12-18 16:46:02 +01:00
scrawl
09bdb0ad4b
Accept a ConstPtr in getServices
2015-12-18 16:44:35 +01:00
scrawl
648ee6e7fb
Accept a ConstPtr in applyEnchantment
2015-12-18 16:43:11 +01:00
scrawl
3c98f8dde3
Accept a ConstPtr in isPersistent
2015-12-18 16:41:37 +01:00
scrawl
3fe3091275
Accept a ConstPtr in isEssential
2015-12-18 16:39:35 +01:00
scrawl
4a47fc32fa
Accept a ConstPtr in getBloodTexture
2015-12-18 16:39:08 +01:00
scrawl
2bd8d60e9f
Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank
2015-12-18 16:33:54 +01:00
scrawl
2ac92012e8
Accept a ConstPtr in isClass
2015-12-18 16:29:30 +01:00
scrawl
5b082be79f
Accept a ConstPtr in getBaseGold
2015-12-18 16:28:20 +01:00
scrawl
da7ebfde99
Accept a ConstPtr in copyToCell
2015-12-18 16:27:18 +01:00
scrawl
954186fe1e
Accept a ConstPtr in canFly, canSwim & canWalk
2015-12-18 16:27:18 +01:00
scrawl
b09bdd6af5
Accept a ConstPtr in isBipedal
2015-12-18 16:27:18 +01:00
scrawl
92a3acfa56
Accept a ConstPtr in getBaseFightRating
2015-12-18 16:12:35 +01:00
scrawl
d120f76031
Accept a ConstPtr in getSound
2015-12-18 16:11:03 +01:00
scrawl
d77f785cbc
Accept a ConstPtr in get*SoundId
2015-12-18 16:09:54 +01:00
scrawl
dc92fefd2b
Accept a ConstPtr in canBeEquipped, getEquipmentSlots & hasItemHealth
2015-12-18 16:06:31 +01:00
scrawl
e0bb284804
Accept a ConstPtr in getWeight
2015-12-18 16:00:50 +01:00
scrawl
0047a2d330
Accept a ConstPtr in canSell
2015-12-18 15:58:45 +01:00
scrawl
2bc851c7d3
Accept a ConstPtr in getEnchantment
2015-12-18 15:56:45 +01:00
scrawl
beb8805a12
Accept a ConstPtr in getInventoryIcon
2015-12-18 15:53:47 +01:00
scrawl
f258c5c508
Accept a ConstPtr in getModel
2015-12-18 15:51:05 +01:00
scrawl
d9bbd83b09
Accept a ConstPtr in getToolTipInfo
...
Accept a ConstPtr in functions used by getToolTipInfo
2015-12-18 15:47:16 +01:00
scrawl
d3d6a69eea
Merge pull request #862 from scrawl/const
...
ConstPtr
2015-12-18 15:20:34 +01:00
scrawl
bc50587e71
Remove comment
2015-12-18 14:33:15 +01:00
scrawl
b2add6470b
Missing include fix
2015-12-18 02:58:38 +01:00
scrawl
1c8244276d
Exception handling improvements (Bug #3090 )
2015-12-18 02:36:34 +01:00
scrawl
a344183247
Comment fix
2015-12-18 02:34:42 +01:00
scrawl
ed3486e816
Improve const-correctness in writeAdditionalState
2015-12-18 00:19:06 +01:00
scrawl
b48445dea7
Accept a ConstPtr in getScript
2015-12-18 00:12:03 +01:00
scrawl
eb51e2838f
Utilize the mHasCustomData flag in writeAdditionalState
2015-12-18 00:07:40 +01:00
scrawl
19d87c78f2
Add CellStore::forEachConst
2015-12-17 23:59:18 +01:00
scrawl
d4eba794c3
Add ConstPtr
2015-12-17 23:34:52 +01:00
scrawl
c9d02c67c0
Remove unneeded const_cast in TerrainStorage
2015-12-17 23:33:47 +01:00
scrawl
2fe2f53b02
Set the changed flag in CellStore::search ( Fixes #3089 )
2015-12-17 22:37:41 +01:00
scrawl
04b6571d7d
Fix logic for scripting access of deleted objects
2015-12-17 20:34:50 +01:00
scrawl
e564c26314
Fix deleted objects being accessible in the Cells cache
2015-12-17 20:18:15 +01:00
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
2015-12-17 20:17:38 +01:00
scrawl
689dea4cb3
Add instant spell effects to the actor's magic effect list
...
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&start=20#p36208
2015-12-17 19:49:37 +01:00
scrawl
d6bcb7906d
Fix crash in a warning message
2015-12-17 16:11:20 +01:00
scrawl
fce43854bc
Fix last commit
2015-12-17 03:50:15 +01:00
scrawl
0a723ab075
Animation: do not assume the object root is a Group
2015-12-17 03:48:11 +01:00
scrawl
31c3324705
Don't assume the emitter node is a Group ( Fixes #3082 )
...
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
2015-12-17 03:38:26 +01:00
scrawl
8222c78cf2
Do not filter creature dialogue by NPC-only conditions ( Fixes #3086 )
2015-12-16 01:30:04 +01:00
scrawl
d5a2586f38
LoadingScreen: add support for important labels
...
Used in saveGame so the player can be sure whether or not the game was saved.
Fixes #3074
2015-12-15 21:16:20 +01:00
scrawl
67883feaae
LoadingScreen: ensure values are within progress range
2015-12-15 21:05:35 +01:00
scrawl
625644e917
LoadingScreen: documentation updates
2015-12-15 21:03:56 +01:00
scrawl
152f1d625d
LoadingScreen: remove unused declarations
2015-12-15 20:54:21 +01:00
scrawl
ccbba5e926
LoadingScreen: remove indicateProgress, not used
2015-12-15 20:52:23 +01:00
scrawl
375caf037d
Don't applyInstantEffect when magnitude is zero
2015-12-15 20:46:05 +01:00
scrawl
4af376133b
Don't tick effects when duration is zero
2015-12-15 20:41:00 +01:00
scrawl
4553db7b43
Merge pull request #861 from scrawl/soundcrash
...
Fix crash when running out of sound sources
2015-12-15 18:23:03 +01:00
scrawl
6a749e77f2
Fix crash when running out of sound sources
2015-12-15 15:12:48 +01:00
Chris Robinson
cddea4a99c
Start underwater sound after updating sounds
...
In between the startUpdate/finishUpdate calls, changes are deferred so that
they can happen all at once. This includes starting sounds, so when the
underwater sound is started it will be immediately checked to see if it's
playing. Since it's not yet playing, it'll be seen as stopped and get cleaned
up before ever playing.
2015-12-14 14:05:01 -08:00
Marc Zinnschlag
346052a67a
Merge remote-tracking branch 'scrawl/containerscript_fix'
2015-12-14 14:19:05 +01:00
scrawl
572786bff2
Instant effects that were added by a permanent ability are applied every frame
...
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&p=36120#p36121
2015-12-14 03:27:49 +01:00
scrawl
271fcb80c6
Remove container scripts before deleting container
2015-12-14 02:57:55 +01:00
Chris Robinson
8c364cd818
Remove left over declaration
2015-12-13 17:13:36 -08:00
Chris Robinson
12eda97e64
Merge remote-tracking branch 'main/master'
2015-12-13 17:06:04 -08:00
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
2015-12-13 17:05:19 -08:00
scrawl
2737aabe93
Pc functions apply to creature dialogue ( Fixes #3078 )
2015-12-14 01:52:13 +01:00
Chris Robinson
5c0a847eaf
Combine some duplicate code
2015-12-13 16:51:27 -08:00
Chris Robinson
b830a413d3
Rename the texture filter options
...
To avoid compatibility issues with upgrading from or downgrading to older
builds.
2015-12-13 16:02:09 -08:00
Chris Robinson
646092ce3a
Add warnings when loading unknown texture options
2015-12-13 15:20:59 -08:00
Chris Robinson
fb6abb53ae
Simplify the in-game texture options
...
This makes it behave like it originally did, although the config options remain
expanded.
2015-12-13 15:02:36 -08:00
Chris Robinson
76bde5ee13
Separate and expand texture filtering options
2015-12-13 11:25:01 -08:00
scrawl
a7e0562e1c
Fix improper handling of multiple AiFollow packages with the same target ( Fixes #3077 )
2015-12-13 17:42:11 +01:00
scrawl
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
2015-12-13 15:31:07 +01:00
scrawl
359b0b3772
Rename for clarity
2015-12-12 22:37:23 +01:00
scrawl
18cce3a6f9
Don't reset delete flag when loading reference from a save game ( Fixes #2724 )
2015-12-12 22:34:59 +01:00
scrawl
850092a5e5
Store: be consistent about struct / class usage
...
Don't inherit a struct from a class, and vice versa.
2015-12-12 22:34:59 +01:00
Chris Robinson
f47f0a996f
Stop the object's old say sound before playing the new one
2015-12-11 15:49:45 -08:00
Chris Robinson
7fc2df153a
Rename stopSound/stopStream to finishSound/finishStream
...
Since they're also used to clean up output resources, not just stopping.
2015-12-11 15:13:14 -08:00
scrawl
cc2315a0de
Minor fix
2015-12-11 16:59:13 +01:00
scrawl
b856460f86
ESMStore: fill mIds in setUp()
2015-12-11 16:55:28 +01:00
scrawl
ed27f0da25
Merge pull request #854 from kcat/master
...
Play NPC voices from the head position
2015-12-11 16:21:06 +01:00
Chris Robinson
808f701013
Use the actor's Head position for Say streams
2015-12-10 17:48:45 -08:00
Chris Robinson
a47bdecac7
Add missing include
...
Since Ptr is used directly in the header, a forward declaration isn't good
enough.
2015-12-10 17:47:55 -08:00
Chris Robinson
a00a4bce77
Avoid some unnecessary indirection
2015-12-10 16:33:27 -08:00
scrawl
f1f82af64e
Fix improper swimming animations in first person mode
2015-12-11 01:24:42 +01:00
scrawl
9bc6f2d5f6
Fix water ripples
2015-12-09 20:35:51 +01:00
scrawl
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
2015-12-09 20:12:45 +01:00
MatthewRock
ddd4004c95
Fix: remove space
2015-12-09 18:26:33 +01:00
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
2015-12-09 18:24:35 +01:00
scrawl
a8c287c831
Print detected game controllers to the log file
2015-12-09 14:33:02 +01:00
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
2015-12-09 14:10:57 +01:00
scrawl
6f98982bc2
Make sure that health is >= 1 when resurrecting the player ( Fixes #2972 )
2015-12-09 01:52:20 +01:00
scrawl
05f1fbf593
WindowManager: explicitely pass the ESMStore
...
Fixes potential crash when the loading screen layout tries to retrieve a GMST value via #{GMST} syntax before the World has been created.
Possibly related to Bug #2854 .
2015-12-09 01:09:09 +01:00
scrawl
a699b4128a
Add isInCell checks to PlaceAt and PlaceItem ( Fixes #2873 )
...
Avoids the game crashing when a script calls these functions before the player has been moved to the starting location.
2015-12-09 00:49:50 +01:00
scrawl
34f48d63f3
Apply spell absorption once per effect ( Fixes #2942 )
2015-12-09 00:35:54 +01:00
scrawl
bc1f7499ab
Do not allow deleting the player object ( Fixes #2982 )
2015-12-09 00:26:39 +01:00
MatthewRock
b0e6a52595
Replace ancestor with parent
2015-12-08 22:45:16 +01:00
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
2015-12-08 22:39:11 +01:00
scrawl
1264651af7
Fix coverity defects
2015-12-08 21:12:05 +01:00
scrawl
e69750905a
Fix gcc warning about function casts
2015-12-08 16:51:50 +01:00
scrawl
bd68ebac62
GetEffect fix
2015-12-08 15:24:02 +01:00
scrawl
3890afd6f5
Merge pull request #843 from kcat/master
...
Add HRTF options and fix an incorrect SoundID
2015-12-08 13:59:15 +01:00
Marc Zinnschlag
071ba3a4df
Merge remote-tracking branch 'scrawl/werewolf'
2015-12-08 09:28:35 +01:00
scrawl
07b064f616
Rename to lowerCaseInPlace
2015-12-07 22:49:15 +01:00
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
2015-12-07 21:58:30 +01:00
scrawl
1a654fa451
Reset locale after strftime() call
2015-12-07 21:24:30 +01:00
scrawl
152f415b9a
Change texture coordinates when falling back to player_hit_01
2015-12-07 18:32:58 +01:00
scrawl
998ef36837
Setting fix
2015-12-07 18:04:23 +01:00
scrawl
e520d37c87
Override the field of view for first person meshes ( Fixes #858 , Fixes #3051 )
2015-12-07 16:29:30 +01:00
scrawl
9621b66b78
Move field of view setting to Camera section
2015-12-07 16:23:06 +01:00
scrawl
136a425cec
Use the Werewolf field of view override ( Fixes #3064 )
...
Need to re-run the settings importer for the feature to work.
2015-12-07 16:11:47 +01:00
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
2015-12-07 15:33:04 +01:00
scrawl
5981e1cbb3
Don't create the werewolf overlay if its texture is not available
...
Avoiding a warning in the log when Bloodmoon is not installed
2015-12-07 14:41:33 +01:00
scrawl
621347b20f
Remove moved ref handling from listRefs()
...
Not needed since we now load cells when a reference is moved there.
2015-12-07 03:55:26 +01:00
scrawl
1875aa4a18
Restore getNearbyDoor
2015-12-07 03:53:46 +01:00
scrawl
f9dd549bff
Restore FindContainerVisitor
2015-12-07 03:47:40 +01:00
scrawl
1f543b4d79
Apply the AiTravel maxRange to AiEscort as well ( Fixes #2697 )
2015-12-07 00:26:17 +01:00
scrawl
65b5cbe3f7
AiEscortCell complains if no cell was given or cell does not exist
2015-12-06 23:42:58 +01:00
scrawl
965bea45c0
AiEscort makes the actor side with target in fights (Bug #2697 )
...
Also will follow the player through teleport doors.
2015-12-06 23:38:51 +01:00
scrawl
4e678ce6b3
Handle mCellId in AiEscort
2015-12-06 23:38:51 +01:00
scrawl
45a609bc54
Improve PositionCell warning message
2015-12-06 22:37:04 +01:00
scrawl
4b0ecaa0a0
Fix physics bug
2015-12-06 22:10:01 +01:00
scrawl
51b892195b
Restore getReadOnlyDoors()
2015-12-06 21:58:25 +01:00
scrawl
abcf91be5b
Port over more game logic to the visitor pattern
2015-12-06 20:43:50 +01:00
scrawl
9ea475d00c
Port LocalScripts::addCell to new CellStore interfaces
2015-12-06 20:33:22 +01:00
scrawl
a517f4f9ba
Add CellStore::forEachType to help with porting over game logic to the new interfaces
2015-12-06 20:32:39 +01:00
scrawl
0af33b5abd
Throw exception if moveTo() is passed an object not part of *this
2015-12-06 20:05:13 +01:00
scrawl
176a3c16f4
Resolve moved references loaded from a save game
2015-12-06 20:00:24 +01:00
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
2015-12-06 19:11:25 +01:00
scrawl
2219231230
Missing updateMergedRefs()
2015-12-06 18:46:49 +01:00
scrawl
138957c49a
Special case objects with no refnum
2015-12-06 18:43:52 +01:00
scrawl
5e99a3eda6
Rename CellStore Functor to Visitor
2015-12-06 18:13:04 +01:00
scrawl
2301080c63
Load CellStore when an object is moved there
2015-12-06 18:04:48 +01:00
scrawl
811df1e97b
Pass the ESM reader list to CellStore constructor
2015-12-06 18:03:55 +01:00
Paul Cercueil
0765ff3ba2
mwrender: Add missing includes
...
Those missing includes were causing the build to fail when compiled with
USE_GLES set.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 16:01:21 +01:00
Chris Robinson
91cd6be11b
Use the correct SoundId for NPC "land" sounds
2015-12-05 18:00:28 -08:00
Chris Robinson
c75303b652
Add an option to select and enable HRTF
2015-12-05 17:14:53 -08:00
Marc Zinnschlag
03a0b1fbfd
Merge remote-tracking branch 'origin/master'
2015-12-05 15:41:20 +01:00
scrawl
53158d29b1
stopSound crash fix
2015-12-05 01:54:16 +01:00
scrawl
66bcd2fd68
Write save games to a memory stream first
...
Two motivations for doing this:
- If the user chooses to overwrite existing save file, and there is an exception during the save process, the existing file will not be lost.
- Many small writes to a file are slow. Very slow. Writing to memory first then writing the completed file to disk appears to be ~500% faster.
2015-12-05 01:15:54 +01:00
scrawl
67a6a8f5d4
Make projectiles receive lighting
2015-12-05 00:44:18 +01:00
scrawl
6181594251
Disable freezeOnCull for magic projectile particles
2015-12-05 00:33:01 +01:00
scrawl
a8938589f6
Magic projectiles rotate during flight
2015-12-05 00:33:01 +01:00
scrawl
3f93af4181
Projectiles interact with the water surface ( Fixes #2986 )
2015-12-04 23:28:11 +01:00
scrawl
3dcefd17fc
Fix CellStore::count()
2015-12-04 20:03:14 +01:00
scrawl
3aa53f3cb4
Object cell movement tracker works. Savegame handling is still missing and some game functionality is still stubbed out.
2015-12-04 19:46:02 +01:00
scrawl
64b4926127
Add reference moving logic - untested
2015-12-04 18:29:41 +01:00
scrawl
7a983340bf
Add comment
2015-12-04 18:29:41 +01:00
scrawl
fc449233be
Restore support for inserting objects into a cell
2015-12-04 18:29:41 +01:00
scrawl
0975f60d59
Stub out CellStore::get<T> accessors in preparation of reference movement between cells
2015-12-04 18:29:41 +01:00
Marc Zinnschlag
49b37ce8bf
Merge remote-tracking branch 'scrawl/geteffect'
2015-12-04 10:42:22 +01:00
scrawl
8e9571d155
Double buffer the light StateAttributes and StateSets
...
Fixes a race condition where the position of a light could jump a frame ahead.
2015-12-04 00:06:22 +01:00
scrawl
f22982d251
Merge pull request #835 from sandstranger/opengles1
...
enable opengl es1
2015-12-03 21:25:00 +01:00
scrawl
5f349b9a6e
Support effects with attribute/skill argument in OpGetEffect
2015-12-03 21:12:58 +01:00
scrawl
1ec338f19d
Don't attempt to load external keyframes for non-NIF files
2015-12-03 20:11:28 +01:00
scrawl
795f6d77f2
Cache the Animation's Skeleton
2015-12-03 20:06:00 +01:00
Marc Zinnschlag
e0c9265148
Merge remote-tracking branch 'origin/master'
2015-12-03 15:56:24 +01:00
scrawl
389b168d5f
Restore OpGetWaterLevel to vanilla behaviour
2015-12-03 15:48:27 +01:00
scrawl
d0c6b407b4
Fix isUnderwater checks being off by one for exterior cells
2015-12-03 15:16:50 +01:00
scrawl
86881bcf39
In first person mode, attach sound listener to the camera
2015-12-03 15:16:20 +01:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
Chris Robinson
f19f1c47c8
Fix playing pending voices without a Ptr
2015-12-02 16:09:25 -08:00
Chris Robinson
2face3d0a9
Combine duplicate code
2015-12-02 16:09:25 -08:00
Chris Robinson
1407366e51
Use a premade SoundStream object for the output's streamSound functions
2015-12-02 16:09:25 -08:00
Chris Robinson
2ee3265b66
Use a premade Sound object for the output's playSound functions
2015-12-02 16:09:25 -08:00
Chris Robinson
53718a5ca0
Use a typedef for the sound instance handle
2015-12-02 16:09:25 -08:00
Chris Robinson
3a39a92b93
Keep track of audio tracks
2015-12-02 16:09:24 -08:00
Chris Robinson
2883cdba5c
Initialize the Sound object before modifying the pitch variable
2015-12-02 16:09:24 -08:00
Chris Robinson
a6db96b2d8
Update sound and stream parameters
2015-12-02 16:09:24 -08:00
Chris Robinson
4bd235284b
Rename a couple members to avoid confusion
2015-12-02 16:09:24 -08:00
Chris Robinson
1ce3e7f5b9
Use a separate type for streams
...
They're basically the same, but it's to help avoid accidents with passing non-
streaming sounds to the stream functions, or vice-versa.
2015-12-02 16:09:24 -08:00
Chris Robinson
816015d6e6
Avoid inheriting from Sound for sound types
2015-12-02 16:09:24 -08:00
sandstranger
b0b3192520
delete bad symbol
2015-12-02 22:50:54 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
3d12b2ca9d
Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager.
2015-12-02 14:59:32 +01:00
scrawl
c912310c52
Don't add persuasion results to the journal
2015-12-01 16:16:21 +01:00
scrawl
2327a41826
Fix journal freeze
2015-12-01 16:09:05 +01:00
scrawl
ba5433391f
Merge pull request #831 from ace13/win-fix
...
Fix windows builds
2015-12-01 01:03:16 +01:00
Alexander "Ace" Olofsson
24340bff95
Add a space
2015-11-30 17:47:36 +01:00
Alexander "Ace" Olofsson
6823298516
Different way to solve the type deduction issue
2015-11-30 17:42:25 +01:00
Alexander "Ace" Olofsson
a69e751089
Revert "Fix windows builds"
...
This reverts commit b085c09f86
2015-11-30 17:38:46 +01:00
scrawl
f5f3d18b8e
Add comment
2015-11-30 17:19:27 +01:00
scrawl
576d5111a5
Prefer Intersector::PROJECTION over Intersector::WINDOW
2015-11-30 17:04:45 +01:00
scrawl
14b143231c
Don't crash OpGetTarget when the target disappeared ( Fixes #3048 )
2015-11-30 15:26:43 +01:00
Alexander "Ace" Olofsson
b085c09f86
Fix windows builds
...
Can't instantiate a container (at least with MSVC) without knowing the exact size of the object being stored, forward-declares only work with pointers.
I couldn't see a simple way to remove the forward declare, so pointers and memory management it is.
2015-11-30 13:36:15 +01:00
Marc Zinnschlag
3a81bed001
Merge remote-tracking branch 'origin/master'
2015-11-30 12:12:18 +01:00
Marc Zinnschlag
7cc8fbfb3c
Merge remote-tracking branch 'scrawl/dynamic_cast2'
2015-11-30 12:11:00 +01:00
scrawl
0655abcd8b
Fix some character preview raycasting issues (Bug #2769 )
2015-11-30 05:43:36 +01:00
scrawl
8fb328ef4f
Fix updating of character preview size in InventoryWindow::setGuiMode
2015-11-30 05:43:36 +01:00
scrawl
d2290a8183
Don't crash when Water_SurfaceFrameCount is 0
2015-11-30 00:41:26 +01:00
scrawl
d5a738bd39
Apply 27e669296e (locale-unaware tolower) to more code
...
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
2015-11-30 00:38:52 +01:00
scrawl
f962ce0bbe
Don't link against unnecessary OSG libraries
2015-11-29 19:56:43 +01:00
scrawl
cd4a1ffd16
Fast version of dynamic_cast for MWClass
2015-11-29 14:26:52 +01:00
Marc Zinnschlag
20a076bdba
Merge remote-tracking branch 'origin/master'
2015-11-29 09:34:41 +01:00
Marc Zinnschlag
6df626ad71
Merge remote-tracking branch 'scrawl/crashcatcher'
2015-11-29 09:23:14 +01:00
scrawl
db71634a2d
Allow replacing of interactive message boxes ( Fixes #3040 )
2015-11-28 19:15:54 +01:00
scrawl
c9bfe01120
Fix applying of weather changes after serving a jail sentence
2015-11-28 17:57:35 +01:00
Marc Zinnschlag
6facce9d13
Merge remote-tracking branch 'origin/master'
2015-11-28 10:02:37 +01:00
Marc Zinnschlag
ff5582e318
Merge remote-tracking branch 'scrawl/ltex'
2015-11-28 09:51:57 +01:00
scrawl
a1fa1b2b2e
Don't attempt to open an empty texture
2015-11-28 06:01:24 +01:00
scrawl
d97dda05c9
Don't attempt to play unset weather sounds
2015-11-28 05:55:36 +01:00
scrawl
93a76e2f56
Revert debce0fb80, use a sleep() to work around the X11 bug
...
Problem with debce0fb80
2015-11-28 05:42:05 +01:00
scrawl
debce0fb80
crashcatcher: show the message box before killing crashed process
...
This change fixes a random X server lock-up that I get about 1 in 10 times when a crash is caught. I'm presuming it's an X server bug since faulty applications shouldn't be able to crash or freeze the X server under any circumstances.
2015-11-28 05:14:30 +01:00
scrawl
35fa1f5865
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
2015-11-27 21:57:24 +01:00
scrawl
4687c4baad
Do not assert() for invalid land data in plugins (Bug #3037 )
...
The resizing of LTEX store to the correct number of plugins was done in the load() method, but the load method won't be called if a plugin contains LAND records but doesn't contain LTEX records. For such plugins the Store<ESM::LandTexture>::search() function would then fail an assertion.
2015-11-27 21:57:15 +01:00
scrawl
5b8fd79b4b
Fix crash when exception is thrown in startNewGame()
2015-11-27 21:38:57 +01:00
scrawl
89783e047b
Fix typo
2015-11-27 19:40:31 +01:00
Chris Robinson
4ee409af84
Load loudness data asynchronously
...
Currently abuses the output audio streams' background processing thread to do
the work, since there's no generalized threaded processing mechanism.
2015-11-27 09:47:14 -08:00
Chris Robinson
0f05ccf72a
Use a non-recursive mutex and properly end the streaming thrread
2015-11-27 08:13:23 -08:00
Chris Robinson
b5ed2e65f8
Add a method to get the sound stream delay
...
This helps avoid a lock during the movie player's read method, since it needs
to sync with the current playback position which would otherwise need to get
the movie decoder's current position.
2015-11-27 06:01:50 -08:00
Chris Robinson
f3c035907c
Rename Sound::update to Sound::applyUpdates
2015-11-27 04:55:17 -08:00
Chris Robinson
9568aa6a84
Use a condition variable to wake up the audio stream thread
...
This should make starting streams a bit more responsive, and allows us to do
more in it that really shouldn't wait for its next wake up.
2015-11-27 04:30:09 -08:00
Chris Robinson
4a078725d4
Play player voices locally
2015-11-27 02:57:44 -08:00
Chris Robinson
449eca4fb4
Properly mark streams as 2D or 3D
2015-11-27 02:36:33 -08:00
Chris Robinson
21bb2e9314
Use a deque for loudness buffers with a map lookup
...
Similar to Sound_Buffer, this allows individual Sound_Loudness objects to
retain a constant pointer when new ones are inserted on to the end.
2015-11-27 02:01:18 -08:00
Chris Robinson
5f8a09df97
Play player sounds (except footsteps) local to the listener
2015-11-27 02:01:18 -08:00
Chris Robinson
82f3651f81
Treat the sound offset as the offset in seconds
2015-11-27 02:01:17 -08:00
Chris Robinson
8b7587f9a6
Track whether a sound is 3D
2015-11-27 02:01:17 -08:00
Chris Robinson
fc912b135f
Avoid unnecessarily friending classes
2015-11-27 02:01:17 -08:00
Marc Zinnschlag
7cc950ed64
Merge remote-tracking branch 'origin/master'
2015-11-27 10:34:22 +01:00
Marc Zinnschlag
b3532b6274
Merge remote-tracking branch 'scrawl/spells'
2015-11-27 10:21:17 +01:00
scrawl
44dd62067e
Remove some unnecessary per-frame store searches
2015-11-27 02:13:56 +01:00
scrawl
783594033a
Optimize MWMechanics::Spells
...
Use pointers as map keys instead of string IDs. Resolves a nasty performance bottleneck on functions like hasCommonDisease() that previously had to look up all contained spells from the ESM store on every call. hasCommonDisease() is called hundreds of times per frame by the AI target update since it's used to calculate target disposition.
The total cost of hasCommonDisease() was 2.7% of the frame loop, now it's negligible.
2015-11-27 01:07:15 +01:00
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
2015-11-26 23:56:32 +01:00
scrawl
984c455027
Fix Show Owned option affecting tooltips that are not objects ( Fixes #3036 )
2015-11-26 18:23:39 +01:00
scrawl
bcca1beb69
Merge branch 'configwriter' into HEAD
2015-11-26 17:17:26 +01:00
scrawl
d894d54e41
Improve path conversions
2015-11-26 17:15:28 +01:00
Chris Robinson
d4238a6d91
Add config options for the sound buffer cache size
...
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
2015-11-26 02:13:37 -08:00
Chris Robinson
8715add72f
Store sound buffers in a deque that's filled in as needed
...
A deque allows existing Sound_Buffer references to remain valid as long as new
ones are back-inserted. These references can be used instead of indices.
2015-11-26 01:26:33 -08:00
cfcohen
7605912ece
Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes
2015-11-26 00:57:21 -05:00
scrawl
8a3ec14bc6
Revert "Merge remote-tracking branch 'sandstranger/opengles'"
...
This reverts commit cc9cab6fd1da856eed95
2015-11-25 19:22:48 +01:00
Marc Zinnschlag
ef68e2aec4
Merge remote-tracking branch 'origin/master'
2015-11-25 19:18:17 +01:00
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
Marc Zinnschlag
cc9cab6fd1
Merge remote-tracking branch 'sandstranger/opengles'
2015-11-25 19:15:53 +01:00
Chris Robinson
8f08ca9cba
Revert "Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting"
...
This reverts commit 0d4fea896c
2015-11-25 06:06:27 -08:00
Chris Robinson
04f885d8cc
Rename mReferences to mUses
2015-11-25 04:24:27 -08:00
Chris Robinson
0d4fea896c
Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting
2015-11-25 04:24:27 -08:00
Chris Robinson
a1bdb544db
Avoid an unnecessary string copy
2015-11-25 04:24:27 -08:00
Chris Robinson
aac903484c
Remove a really unnecessary method
2015-11-25 04:24:26 -08:00
Chris Robinson
73448c72f6
Replace Play_NoTrack with playManualSound3D, and rename the latter
2015-11-25 04:24:26 -08:00
Chris Robinson
caae305ddd
Use a sorted list for unused buffers
...
Helps ensure the buffers being unloaded due to cache limits are not likely to
be needed anytime soon.
2015-11-25 04:24:26 -08:00
Chris Robinson
669b7a2295
Batch update changes together, when possible
...
Certain OpenAL implementations, including Rapture3D, Creative's hardware
drivers, and more recent versions of OpenAL Soft, can batch together changes so
that they all occur at once, avoiding potential discontinuities with one sound
being changed before another, or the listeenr being changed before sounds are.
On other implementaitons, this is a no-op and maintains existing behavior.
2015-11-25 04:24:26 -08:00
Chris Robinson
ea70b0baee
Don't store the buffer in the sound struct
2015-11-25 04:24:25 -08:00
Chris Robinson
fd7d58fe7e
Reset the sound handle back to null after unloading
2015-11-25 04:24:25 -08:00
Chris Robinson
4801661b34
Stop all sounds of the given id
2015-11-25 04:24:25 -08:00
Chris Robinson
8a69f676ec
Remove some duplicate code
2015-11-25 04:24:25 -08:00
Chris Robinson
45628316f8
Remove an unnecessary check
2015-11-25 04:24:25 -08:00
Chris Robinson
574c1923fe
Clear unused buffers after unloading them all
2015-11-25 04:24:25 -08:00
Chris Robinson
5ad772c3b3
Fix streaming sound time
2015-11-25 04:24:25 -08:00
Chris Robinson
3ce6aee98b
Return a decoder from the loadVoice function
2015-11-25 04:24:25 -08:00
Chris Robinson
24f8c78fca
Store sound buffer references by index instead of string
2015-11-25 04:24:24 -08:00
Chris Robinson
f7218f5a25
Use proper mutex mechanisms and don't check al errors in the stream thread
2015-11-25 04:24:24 -08:00
Chris Robinson
f9e18cd966
Prepare all Sound_Buffer objects when one is needed
...
This simply sets up the Sound record data to be used by the sound output. The
actual audio buffers, stored in the Sound_Handle, are still loaded on-demand.
2015-11-25 04:24:24 -08:00
Chris Robinson
6c3953766e
Use separate lists for the sound name and its buffer
...
This should make sound lookup a bit more efficient, especially when an integer
ID can be used.
2015-11-25 04:24:24 -08:00
Chris Robinson
fbfcc4050f
Stream voice clips
...
Voices tend to be a bit long, and not individually replayed often. So it's
better to stream them instead of loading theminto a sound buffer. The loudness
data is very small, though, so that can be kept buffered indefinitely.
2015-11-25 04:24:24 -08:00
Chris Robinson
eee6a19e31
Add a method to stream sounds in 3D
2015-11-25 04:24:24 -08:00
Chris Robinson
f1a1dc8408
Pass relevant sound parameters to the OpenAL_SoundStream constructor
2015-11-25 04:24:24 -08:00
Chris Robinson
83721092f2
Refactor the audio streaming code to be a bit saner
2015-11-25 04:24:23 -08:00
Chris Robinson
16f72886e9
Use separate lists for openal sounds and streams
2015-11-25 04:24:23 -08:00
Chris Robinson
0f33f41d8d
Actually unload sounds when running over
2015-11-25 04:24:23 -08:00
Chris Robinson
22a6811425
Limit the sound buffer cache to 15MB
2015-11-25 04:24:23 -08:00
Chris Robinson
0b2747098c
Keep track of unused sound buffers
2015-11-25 04:24:23 -08:00
Chris Robinson
4073495070
Add some missing sound handling
2015-11-25 04:24:23 -08:00
Chris Robinson
e362896817
Combine some duplicate code
2015-11-25 04:24:23 -08:00
Chris Robinson
febc7b510a
Remove an unneeded method
2015-11-25 04:24:23 -08:00
Chris Robinson
3fdc3c4ea9
Use a separate map for say sounds
...
Also restores lip movement
2015-11-25 04:24:22 -08:00
Chris Robinson
9d0018e1bc
Reorder active sound data to make lookup by Ptr better
2015-11-25 04:24:22 -08:00
Chris Robinson
495e138907
Load sound loudness and store it with the Sound_Buffer
...
Still not used for say yet, though
2015-11-25 04:24:22 -08:00
Chris Robinson
f4c22ec49e
Hold a separate list for voice sound buffers
...
This fixes say. Ideally voices would be streamed, but the loudness/"lip" buffer
extraction should be separated from the buffer loading code.
2015-11-25 04:24:22 -08:00
Chris Robinson
4571218827
Load the sound as needed and pass it directly to the play methods
...
This breaks say sounds, loudness handling, and the cache limit. Fixes are
forthcoming.
2015-11-25 04:24:22 -08:00
Chris Robinson
e2beefd8b5
Store info calculated from the ESM::Sound record
2015-11-25 04:24:22 -08:00
scrawl
edfcb45ad7
Fix crash when onPcEquip script removes the equipped item ( Fixes #3016 )
2015-11-24 22:55:17 +01:00
sandstranger
69acacefff
openmw building on Android with Opengl es
2015-11-23 20:28:35 +03:00
Marc Zinnschlag
da856eed95
Merge remote-tracking branch 'origin/master'
2015-11-23 18:17:36 +01:00
scrawl
3fe38e3556
Remove unused setting
2015-11-23 03:26:21 +01:00
scrawl
71cd57a3b5
Optimize World::getTimeStamp
...
World::getTimeStamp was searching through the globals store on every call. Not a big issue, but slow enough to show up in the profiler.
2015-11-22 23:55:21 +01:00
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
2015-11-22 19:54:26 +01:00
cfcohen
b507d5da5d
One more tooltip fix. This one in the review dialog with Socucius Ergalla.
2015-11-22 00:50:36 -05:00
Marc Zinnschlag
8da04bf76f
Merge remote-tracking branch 'scrawl/master'
2015-11-21 09:15:46 +01:00
scrawl
1b1d9a7a9c
Fixed another tooltip
2015-11-21 02:05:27 +01:00
cfcohen
cf4f3d9ebc
Correct tooltip for Magicka in stats window.
2015-11-20 14:57:42 -05:00
scrawl
43de13fa99
Do not allow resting on lava
2015-11-20 19:22:31 +01:00
scrawl
2d302aef99
Implement stayOutside script variable
2015-11-20 05:05:43 +01:00
scrawl
27617468c8
Fix the collision shape not updating when scaling an object via script
2015-11-20 03:29:58 +01:00
scrawl
5f143dee2d
Fix lighting incontinuity at nightfall and sunrise
2015-11-20 03:22:35 +01:00
scrawl
61314e1db1
Fix bounding box of bullet debug drawer
2015-11-20 03:04:03 +01:00
scrawl
706b1d4c28
Disable culling of ClipNode
2015-11-20 02:22:37 +01:00
scrawl
cbf344663f
animateCollisionShape checks if the shape is really animated
2015-11-20 00:17:07 +01:00
scrawl
894477849a
Store animated collision objects in a separate container
2015-11-19 23:33:08 +01:00
scrawl
8c268f239e
Set the object node scale before inserting model
...
This fixes initWorldSpaceParticles not taking object scale into account. Still not taking into account object rotation or node animations. Ideally the initWorldSpaceParticles needs to run in an updateCallback.
2015-11-19 15:57:12 +01:00
scrawl
ccc721ba3f
Print the OpenMW version to the logfile
2015-11-19 02:56:42 +01:00
scrawl
f08cfa19ea
Fix SoundManager::isPlaying to consider multiple entries with the same Ptr/id
...
Now it returns true if *any* sounds matching the given Ptr and id are playing. The previous behaviour was causing problems with "zombie" sounds (sounds that have finished playing, but weren't removed from the map yet) making the isPlaying method return false even though there's another legitimately playing sound in the map.
2015-11-19 01:06:51 +01:00
scrawl
a49058721e
Use a contactTest for collision script functions
...
The previous method didn't work for stationary actors. This change fixes the grinder in "Sotha Sil, Dome of Kasia" not registering collisions if the player stands still. (Fixes #1934 )
2015-11-18 21:20:12 +01:00
scrawl
9fce428929
ContactTestResultCallback: do not rely on col1 being the object tested against
...
Unsure why, but in some cases col0 and col1 are swapped.
2015-11-18 20:41:49 +01:00
scrawl
3453353091
AiCombat distance check takes into account collision box ( Fixes #1699 )
2015-11-18 19:00:43 +01:00
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
2015-11-17 09:54:49 +01:00
Marc Zinnschlag
5de9a5e840
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
2015-11-17 09:04:07 +01:00
scrawl
e62470d674
Auto-generate the collision shape for native mesh formats
2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682
Support for loading .osg mesh format
2015-11-16 23:26:43 +01:00
scrawl
71d9e7dc52
Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file
2015-11-16 02:21:45 +01:00
scrawl
e9e12d396d
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
2015-11-15 21:37:32 +01:00
scrawl
0f347eccbf
Flip the origin of global map texture
...
Now it's consistent with the overlay texture.
2015-11-15 21:36:41 +01:00
scrawl
8b7bdcd127
Fix the global map overlay viewport (Bug #3018 )
2015-11-15 21:32:34 +01:00
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
2015-11-14 17:17:22 +01:00
Alexander "Ace" Olofsson
d2a4175804
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
2015-11-14 16:02:42 +01:00
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
4e3bbe01b6
OS X: disable glTexStorage2D because of OSG/driver issue
...
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
2015-11-14 13:50:01 +01:00
scrawl
0ec56d321a
Remove unneeded using namespace
2015-11-14 03:01:40 +01:00
scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
2015-11-14 03:01:24 +01:00
Marc Zinnschlag
c312162b57
Merge branch 'openmw-37'
2015-11-13 14:24:57 +01:00
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
2015-11-13 01:34:36 +01:00
scrawl
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
2015-11-12 23:05:44 +01:00
scrawl
9897400d97
Restore the previous key focus widget after playing video
2015-11-12 19:03:24 +01:00
Emmanuel Anne
af7b5e636e
improves InterpreterContext::updatePtr
...
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
2015-11-12 17:53:17 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
scrawl
19cd987208
Fix Ptr updates in PositionCell
...
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
2015-11-12 14:32:39 +01:00
scrawl
9e3eb8291f
Rotations: fix the rotation order for doors
2015-11-12 02:09:00 +01:00
scrawl
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
2015-11-12 01:44:29 +01:00
scrawl
3647af8d73
Rotations: use different rotation order when object is rotated via script ( Fixes #2062 )
2015-11-12 01:44:00 +01:00
scrawl
b4ce73f179
Rotations: remove LocalRotation
...
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
2015-11-12 01:16:37 +01:00
scrawl
666fbba1e0
Rotations: World::rotateObject takes radians instead of degrees
...
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
2015-11-12 01:09:39 +01:00
scrawl
6405049add
Rotations: move doors via Rotation rather than LocalRotation
...
Now LocalRotation is unneeded, will remove in next commit.
2015-11-12 00:58:29 +01:00
scrawl
8aacbc398f
Rotations: don't wrap the angle values for non-actors
...
It's not really necessary, and just complicates logic elsewhere. Neither does vanilla MW do it. As well, the question is if wrapping to [-PI, PI] or [0, 2*PI] would be the desired range.
2015-11-12 00:52:36 +01:00
scrawl
a68fd791c8
Remove a stray method declaration
2015-11-11 17:24:27 +01:00
scrawl
79c44d0bfe
Style fix
2015-11-11 17:23:47 +01:00
scrawl
02148a43f5
Node mask fix
2015-11-11 17:22:31 +01:00
scrawl
0a52ee17c3
Fix Drawable removal issues
2015-11-11 17:04:06 +01:00
scrawl
afa590bddb
Leak fix
2015-11-11 16:04:17 +01:00
scrawl
c62c1693e9
Disable copy constructor and operator= in PartHolder
2015-11-11 01:47:26 +01:00
scrawl
2e9805fa0e
Leak fix
2015-11-11 00:50:57 +01:00
scrawl
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
2015-11-10 21:55:21 +01:00
scrawl
8e3bc981a2
Fix self-referencing camera
2015-11-10 21:45:53 +01:00
MatthewRock
a662a00c62
Fixing bug for merchant
2015-11-10 19:18:02 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
scrawl
f1ac408f35
Place Drawables directly in the scene graph when built with OSG 3.4
...
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.
There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5
Refactor lighting mask
2015-11-10 17:23:12 +01:00
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
2015-11-10 17:00:33 +01:00
scrawl
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
2015-11-10 01:01:41 +01:00
scrawl
3c338b9da9
ObstacleCheck: tweak the stuck detection parameters
...
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
2015-11-09 20:35:31 +01:00
scrawl
d233bc483d
ObstacleCheck: fix evasion issue
...
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
2015-11-09 20:35:31 +01:00
scrawl
caa523a959
ObstacleCheck: fix the framerate not being taken into account
2015-11-09 20:35:31 +01:00
scrawl
801dc8eee3
ObstacleCheck: fix weird distance calculation
2015-11-09 20:17:21 +01:00
scrawl
1b52749ae1
Adjust third person camera height based on character height
2015-11-09 17:42:35 +01:00
scrawl
b89945804c
BookPage: implement hit test with margin for error
2015-11-09 02:57:49 +01:00
scrawl
055841e721
Improve cloud lighting
2015-11-09 02:22:40 +01:00
scrawl
f0a1434578
Dead actors underwater will float to the surface
2015-11-08 20:58:00 +01:00
scrawl
66925be440
Partially revert 682f30ef9c
...
This change made dead netch fall through the floor, because the animation moves the creature *below* its external collision box.
2015-11-08 19:59:33 +01:00
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
2015-11-08 18:30:22 +01:00
scrawl
a7ad45e73e
WindowBase::center use the layer size instead of render window size
2015-11-08 18:30:21 +01:00
scrawl
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
2015-11-08 18:30:21 +01:00
scrawl
6c12c9a467
Layer renaming fix
2015-11-07 19:45:30 +01:00
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0
layer renaming
2015-11-07 17:49:11 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
13c7235b6b
Remove old FPS setting code
2015-11-07 00:13:13 +01:00
scrawl
2407f393ce
Fix double update traversal in screenshot function
2015-11-06 23:14:27 +01:00
scrawl
6e69808129
Fix the frameNumber not being incremented in certain frames
2015-11-06 23:14:27 +01:00
scrawl
8e4e4e5e38
Fix infinite loop in addToLevList
2015-11-05 01:18:01 +01:00
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
2015-11-04 20:34:50 +01:00
scrawl
1cf1c944b7
Don't attempt to render weather particles on the refraction and reflection textures
2015-11-03 23:20:17 +01:00
scrawl
209fa52883
Hide weather particles underwater ( Fixes #2701 )
2015-11-03 23:15:43 +01:00
scrawl
e3b30baff9
clipFudge fix
2015-11-03 23:10:52 +01:00
scrawl
682f30ef9c
Fix incorrect uses of PhysicsSystem::getHalfExtents
...
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
2015-11-03 19:05:36 +01:00
scrawl
46e07e4b19
Head tracking: fall back to target collision box center if the target has no head node
2015-11-03 18:27:15 +01:00
scrawl
a5f8ffb83d
aimToTarget: Fix the collision box translation not being taken into account
2015-11-03 18:15:47 +01:00
scrawl
de97a8a3da
Do not allow disabling the player object
2015-11-03 17:53:57 +01:00
scrawl
b72d5c5190
Don't play idlestorm animation when swimming
2015-11-03 17:48:35 +01:00
scrawl
c0a81030bb
Make use of INI settings for the simple water
2015-11-03 02:24:50 +01:00
scrawl
30c828dff0
Include cleanup
2015-11-03 02:17:42 +01:00
scrawl
8e8f72408d
Use diffuse/ambient lighting for the simple water
2015-11-03 02:12:00 +01:00
scrawl
380256977b
Fix another renderBin issue with the weather particles
...
Depth sorting w.r.t. the rest of the scene was broken
2015-11-03 01:53:38 +01:00
scrawl
9902dfc9ef
Comment
2015-11-03 01:53:22 +01:00
scrawl
ad016da31d
Enable fog on weather particles
2015-11-03 01:42:37 +01:00
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
2015-11-02 23:38:34 +01:00
scrawl
d6f45c3390
Fix the renderbin for weather particles
...
Regression from commit 2ee6b41887
2015-11-02 21:51:01 +01:00
scrawl
bd1f3493d7
Fix weather particles not being cleared when changing from one particle effect to another
2015-11-02 21:35:03 +01:00
scrawl
0348b8df1c
Fix applying of plane height in ClipCullNode ( Fixes #2985 )
2015-11-02 01:23:21 +01:00
scrawl
3f988327c7
Destructor fix
2015-11-02 00:57:59 +01:00
scrawl
913bbe347b
Don't check the extension string every frame
2015-11-02 00:52:20 +01:00
scrawl
c60388afb6
Add fudge factor to move the water mesh away from camera when the camera gets too close
2015-11-02 00:34:09 +01:00
scrawl
4690ec12cc
Render the water plane with GL_DEPTH_CLAMP if supported ( Fixes #996 )
2015-11-02 00:29:09 +01:00
scrawl
802620a86b
Use TimeOfDayInterpolator for Land Fog Depth
...
Fixes the sudden fog jump at nightfall.
2015-11-01 23:03:16 +01:00
scrawl
45bf3e6788
Create TimeOfDayInterpolator class to refactor time handling in WeatherManager
2015-11-01 22:59:26 +01:00
scrawl
8da4530957
Use INI-imported underwater fog settings ( Fixes #2907 , Fixes #1511 )
2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560
Use the correct scale for actor swim height ( Fixes #2833 )
2015-11-01 21:45:58 +01:00
scrawl
7b817ba010
Fix the node masks of water cameras being reset (Bug #2984 )
...
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
2015-10-31 03:14:05 +01:00
scrawl
93f4d31cf9
Raytest mask fix ( Fixes #2984 )
2015-10-31 01:30:02 +01:00
scrawl
b9b154a015
Minor cleanup
2015-10-31 00:01:12 +01:00
scrawl
d90fa977e8
GL_DEPTH_COMPONEN24 fix
2015-10-29 13:52:48 +01:00
scrawl
7692ae175a
Disable sun rendering on the reflection camera
...
Not needed, we have specular highlights.
2015-10-29 01:17:23 +01:00
scrawl
9b8e45fc01
Fix ripple particles z-fighting with the water surface
2015-10-29 00:28:09 +01:00
scrawl
d394b0793f
waterLevel fix
2015-10-29 00:27:42 +01:00
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
2015-10-29 00:27:42 +01:00
scrawl
8433e0679f
Water: connect to settings window
2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573
Water code cleanup
2015-10-29 00:25:24 +01:00
scrawl
11c997d09d
Water: move reflection code to a new class
2015-10-29 00:25:24 +01:00
scrawl
ebdf25ccb9
Water: move refraction code to a new class
2015-10-29 00:25:24 +01:00
scrawl
7bbdb13138
Remove debug code
2015-10-29 00:25:24 +01:00
scrawl
6ba9f561ea
Use simple water for the local map
2015-10-29 00:25:24 +01:00
scrawl
09631385c3
Use boost ifstream for water resources
2015-10-29 00:25:24 +01:00
scrawl
d485dd0782
Water: fix world UV coords
2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37
Water: pass the near and far planes
2015-10-29 00:25:24 +01:00
scrawl
37c9c12962
Water: clipping plane offset
2015-10-29 00:25:23 +01:00
scrawl
700a0099c3
Remove debug code
2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
2015-10-29 00:25:23 +01:00
scrawl
944e6d0844
Fix adjustment of inventory preview size when guimode changes ( Fixes #2973 )
2015-10-26 14:26:02 +01:00
scrawl
515c52211e
Disable mipmaps for temporary screenshot texture
2015-10-25 18:28:50 +01:00
scrawl
7b954e8cc3
Remove unnecessary dependency on MWScrollBar
2015-10-24 16:04:08 +02:00
scrawl
ef5838df7e
SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras
2015-10-24 15:46:15 +02:00
scrawl
69f234d97b
Small delay before the loading screen shows
...
Kinda irritating to have the loading bar pop up for a fraction of a second.
2015-10-23 16:50:08 +02:00
scrawl
6ef139e1d7
Implement a custom RenderBin for first person models ( Fixes #1612 )
2015-10-19 22:17:04 +02:00
scrawl
93565eccbf
Update the dialogue topic list after running greeting script
2015-10-18 21:40:16 +02:00
scrawl
04df656f54
Remove some junk
2015-10-18 21:39:53 +02:00
Marc Zinnschlag
90036e23b3
Merge remote-tracking branch 'scrawl/enchantment_error'
2015-10-14 09:33:51 +02:00
scrawl
8459a79a2c
Fix AI being able to open locked doors ( Fixes #2948 )
2015-10-13 19:05:17 +02:00
scrawl
f36d463617
Enchantment error handling fix ( Fixes #2959 )
...
Catch errors about missing enchantments before they propagate up the stack and interrupt the whole frame update.
2015-10-13 18:15:39 +02:00
scrawl
ee450471fd
Disable head controller for non-bipedal creatures ( Fixes #2843 , Fixes #2966 )
2015-10-13 17:55:57 +02:00
scrawl
a88d56148b
Read the Sun Glare Fader ini settings
2015-10-13 16:35:31 +02:00
Marc Zinnschlag
2f808f957d
fixed for compiler not recognising script names in some situations
2015-10-08 14:01:29 +02:00
Emmanuel Anne
944dfa5372
a light without the carry flag can't be equipped !
...
it fixes Antares big mod teaching disciplines, it adds a light which should
not be equipped to npcs which have learnt something.
2015-10-07 12:28:25 +02:00
Marc Zinnschlag
379d13c7b9
Merge remote-tracking branch 'scrawl/unstack_script'
2015-10-07 08:12:02 +02:00
Marc Zinnschlag
7e7215b3b3
Merge remote-tracking branch 'scrawl/master'
2015-10-07 08:09:27 +02:00
scrawl
91bf5ae237
Add new script instance when a container item is unstacked (Bug #2962 )
2015-10-07 02:43:21 +02:00
Marc Zinnschlag
231935356a
Merge remote-tracking branch 'origin/master'
2015-10-06 14:30:45 +02:00
Marc Zinnschlag
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
2015-10-06 14:30:32 +02:00
scrawl
7b6fe149f2
getSpellSuccessChance return 0 for used powers ( Fixes #2944 )
2015-10-05 15:41:43 +02:00
scrawl
77cb438714
Fix potential case smashing issue
2015-10-05 15:41:07 +02:00
artemutin@yandex.ru
ec4fff588d
uncomment updateActor call in buildPlayer for magicka recalc
2015-10-05 23:07:13 +10:00
Marc Zinnschlag
9279ae4ba0
Merge remote-tracking branch 'zelurker/removed_items'
2015-09-26 11:24:56 +02:00
Marc Zinnschlag
bebd442b49
Merge remote-tracking branch 'scrawl/godmode'
2015-09-26 11:23:33 +02:00
Emmanuel Anne
6ec8f9123e
Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items
2015-09-26 09:24:56 +02:00
scrawl
899e35591c
Escape MyGUI markup codes in console output
2015-09-26 02:08:23 +02:00
scrawl
387624e158
Add a threshold to AiFollow distance
...
Idle animations can move the actor around slightly, which sometimes causes AiFollow to constantly toggle between "arrived" and "following" state even when the player isn't moving. Could be observed by summoning a bonelord.
2015-09-26 02:02:50 +02:00
scrawl
b9c6a6862a
Don't reset god mode, scripts enabled and sky enabled flags when loading a save game
...
These flags aren't stored in the save file, so it makes no sense to reset them to their default each time a save game is loaded. Instead, reset on "new game".
2015-09-26 01:49:58 +02:00
Emmanuel Anne
2fff6b06cc
removed items by mods do not break cell loading
...
like fortify intelligence potions removed by sris_alchemy which break the
loading of the firewatch mages guild
2015-09-25 14:23:49 +02:00
Alexander "Ace" Olofsson
caa119f13c
Fix instantiation on non-Visual Studio
2015-09-24 15:55:38 +02:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
Marc Zinnschlag
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
2015-09-22 08:33:33 +02:00
scrawl
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87
Minor cleanup
2015-09-21 17:50:36 +02:00
scrawl
d812434fee
Add a subtle fading effect to the sun flash texture
2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05
Remove dead code
2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba
Scale the sun flash texture depending on occlusion query
2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71
Add the full-screen sun glare effect
2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
2015-09-21 17:20:08 +02:00
scrawl
d191a52847
Create occlusion query nodes for the sun flash
2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
2015-09-21 17:19:53 +02:00
scrawl
8de3ce90a7
Add comments for weather IDs
2015-09-19 18:04:24 +02:00
dteviot
60d0ad9283
When stuck, try moving backwards as well as to side.
2015-09-19 16:14:00 +12:00
dteviot
5369d20682
Moved pathfinding logic from AiCombat to Pathfinding.
2015-09-19 15:34:02 +12:00
scrawl
a37dee09e2
Fix invisibility effect disappearing after a view mode switch
2015-09-18 21:30:02 +02:00
Marc Zinnschlag
b58a63e14e
Merge remote-tracking branch 'scrawl/deathanim'
2015-09-17 14:54:29 +02:00
Marc Zinnschlag
96880b4dfe
Merge remote-tracking branch 'scrawl/tabs'
2015-09-17 09:30:31 +02:00
Marc Zinnschlag
c35ce88ee7
Merge remote-tracking branch 'scrawl/aiming'
2015-09-17 09:25:33 +02:00
Marc Zinnschlag
ed373aa320
Merge remote-tracking branch 'scrawl/animation'
2015-09-17 09:24:11 +02:00
scrawl
a7f898057b
Don't activate the initial death animation when skipAnim is set ( Fixes #2513 )
2015-09-17 04:38:42 +02:00
scrawl
c4b5a41ac3
Improve combat AI vertical aiming ( Fixes #1366 , Fixes #1330 )
2015-09-17 03:41:15 +02:00
Emmanuel Anne
29a84452ab
durations in tooltips : use "show effect duration" setting
2015-09-16 22:42:54 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6
durations in tooltips : water walking effects is seen differently
...
so move the duration info out of this block...
2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583
add duration to spell icons too
...
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce
show duration of light sources in tooltip
...
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
2015-09-16 17:53:06 +02:00
scrawl
f8d4bc378f
Move setAlpha from NpcAnimation to Animation ( Fixes #2917 )
2015-09-16 16:15:55 +02:00
scrawl
126960261f
Keep playing IdleSneak on the lower body when casting spells / using weapons
2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae
Add convenience operator [] to AnimPriority
2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7
Use the actual sneak state to determine visibility of indicator ( Fixes #2915 )
2015-09-16 15:37:36 +02:00
Marc Zinnschlag
c693656307
Merge branch 'localvarfix'
2015-09-15 14:01:45 +02:00
Marc Zinnschlag
2a981a5272
make sure local variables are loaded when trying to access them from outside of a script ( Fixes #2659 )
2015-09-15 13:58:07 +02:00
dteviot
0feae19140
AiCombat use evadeObstacles() from AiPackage.
2015-09-14 19:57:22 +12:00
Marc Zinnschlag
2c37731494
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d
Fixed errors pointed out by Zini.
...
1. Removed "Actor" from name of function isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12:00
Marc Zinnschlag
0ff786bebd
Merge remote-tracking branch 'origin/master'
2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
dteviot
10eabc9d51
actorutil.hpp includes mwworld/ptr.hpp
...
As pointed out by Scrawl, fixes compiler error if getPlayer() is called before MWWorld::Ptr is defined, because getPlayer() returns a Ptr by value.
2015-09-11 18:43:06 +12:00
dteviot
6f97187bb6
Fix travis warning about no newline at end of file.
2015-09-10 22:26:33 +12:00
dteviot
573a14993a
Moved isActorNearInactiveCell() logic to own function.
...
Also, triggers when actor is near edge of cell, not when less than 1/2 way to edge.
2015-09-10 21:53:31 +12:00
dteviot
e9c796166a
Added MWMechanics::isPlayerInCombat()
2015-09-10 18:48:34 +12:00
scrawl
cd0f8e556b
Merge pull request #753 from slothlife/thunderstorm-support
...
Improve thunderstorm support.
2015-09-09 14:44:36 +02:00
slothlife
29d74f0249
Improve thunderstorm support.
...
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
2015-09-08 22:05:33 -05:00
Marc Zinnschlag
353d6973e2
Merge remote-tracking branch 'origin/master'
2015-09-08 08:27:00 +02:00
scrawl
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
2015-09-07 22:31:11 +02:00
scrawl
5aa33fde43
Include cleanup
2015-09-07 22:16:15 +02:00
scrawl
e5d54fb539
Check for actor being the player in various actions
2015-09-07 22:15:17 +02:00
scrawl
fd48c1d6f4
Make the Equip script function "use" items (drink potion, use alchemy, etc)
2015-09-07 22:09:08 +02:00
scrawl
481f23d955
Implement framerate limit setting
...
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
2015-09-07 16:05:51 +02:00
dteviot
96e3933ee9
Fixed bug in smoothTurn()
...
Now correctly handles changing direction from 178 to -178 degrees.
2015-09-06 17:39:48 +12:00
scrawl
acbea2461b
Fix a typo
2015-09-04 23:27:33 +02:00
scrawl
d11952c48a
Stop rendering when the window is minimized
2015-09-04 03:44:14 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
b3fdf92d2b
more const-ness fixes
2015-08-31 16:08:19 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
7a96a04b75
Merge remote-tracking branch 'origin/master'
2015-08-31 09:22:19 +02:00
Marc Zinnschlag
a8bee25757
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-08-31 09:18:36 +02:00
Marc Zinnschlag
4b7a034cf9
Merge remote-tracking branch 'slothlife/weather-transition-fix'
2015-08-31 09:03:04 +02:00
scrawl
8aaba0af6f
Fix journal page navigation bug introduced by 7dd09dd637 ( Fixes #2899 )
2015-08-30 17:38:21 +02:00
dteviot
1dfe438a5d
reduce "reset if stuck" AiWander timeout.
...
Now is about 14 seconds, instead of 300.
2015-08-30 16:43:35 +12:00
dteviot
39c2ba8efe
Pathfinding bugfix.
...
Observed at Ebonheart (coe 1, -13). Especially at the western tower. Guards try to walk though tower door.
Cause: buildPath() adds destination (even when unreachable) when only using single node from pathgrid.
2015-08-30 16:12:51 +12:00
dteviot
f2c9b9351f
Try going right and left to "unstick" actor.
2015-08-30 10:06:09 +12:00
dteviot
31d82b6b0c
Unifiy evadeObstacles() logic between AiWander and AiPackage
...
Can't use same code, but logic is now same.
2015-08-30 08:32:47 +12:00
dteviot
f59e918a3b
removed useless code.
...
zTurn ignores turns < 0.0087 radians.
2015-08-29 17:34:33 +12:00
dteviot
0677799839
movement logic in AiPackage uses ObstacleCheck.
2015-08-29 17:21:18 +12:00
slothlife
2b48a20b76
Fix weather transition bugs
2015-08-28 23:12:39 -05:00
slothlife
d9a7986b3a
Remove redundant fast forward check
2015-08-28 18:04:22 -05:00
Marc Zinnschlag
45e7522aa6
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-28 16:09:18 +02:00
dteviot
300c48329d
Creature::isFlagBitSet() changed to free function.
2015-08-28 18:38:05 +12:00
slothlife
4fd00a75d5
Merge advanceTime and advanceTimeByFrame
2015-08-27 14:53:52 -05:00
slothlife
cd8ec5c11e
Improve checking for older weather records
2015-08-27 13:44:06 -05:00
slothlife
7817c52cbb
Discard old save game weather records
2015-08-27 09:57:32 -05:00
dteviot
95d2d82abf
extracted isFlagBitSet()
2015-08-27 18:36:46 +12:00
slothlife
c907ed517d
Remove C++11 explicit on conversion operator
2015-08-26 23:34:15 -05:00
slothlife
54fa5273dc
Refactor weather transitions to act more like MW
...
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
2015-08-26 22:59:21 -05:00
Marc Zinnschlag
a9f9a8d58e
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-26 15:59:28 +02:00
dteviot
541d7fb4fb
Fixed assorted issues
...
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
2015-08-25 18:19:16 +12:00
Marc Zinnschlag
8f7f29943a
Merge remote-tracking branch 'jordan-ayers/topic/dead-code'
2015-08-24 15:13:53 +02:00
Jordan Ayers
cd5bef958f
Remove dead code from alchemywindow.
...
Also align some braces.
2015-08-24 07:43:30 -05:00
dteviot
bb54bbd273
Pulled duplicated functions into common base class
2015-08-24 19:54:02 +12:00
scrawl
b509a18065
Remove code setting PcRace ( Fixes #2886 )
...
This is already handled by the RaceCheck script.
2015-08-23 14:30:23 +02:00
Marc Zinnschlag
a52b947efe
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-08-23 12:11:30 +02:00
scrawl
542c648e69
Fix incorrect assignment of PcRace, need to sort race IDs ( Fixes #2884 )
2015-08-22 22:53:06 +02:00
Marc Zinnschlag
50ec8b10f5
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-22 10:37:43 +02:00
scrawl
ba8e4c22aa
Avoid using loops to wrap angle values ( Fixes #2882 )
2015-08-21 20:17:42 +02:00
scrawl
52d8bc555c
Add missing checks to see if spell still exists when loading a savegame (Bug #2883 )
2015-08-21 14:24:49 +02:00
dteviot
5dd0ad6841
Fixed rest of travis errors.
2015-08-21 22:41:31 +12:00
dteviot
3fa5c6a0e7
fixed travis build failure
2015-08-21 22:00:08 +12:00
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb
replaced FLT_MAX with numeric_limits.
2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
dteviot
3b231b85bb
removed incorrect optimization.
...
Now it fixes #2871
2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-20 20:42:35 +02:00
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
2015-08-20 20:39:44 +02:00
Marc Zinnschlag
5cb0353b5c
Merge remote-tracking branch 'jeffreyhaines/npcsdontscream'
2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f
Correctly handle disjoint pathgrid ( Fixes #2871 )
...
Bugfix:
When
1. Cell has multiple subgrids (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
2015-08-20 21:50:58 +12:00
dteviot
0ee7407101
extracted common sub-expressions.
2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e
extracted function CreatureStats::isParalyzed()
2015-08-20 18:12:37 +12:00
Jeffrey Haines
f94d3237fc
Removed unused cmake import
2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4
Removed long int parameter
2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119
Time played display setting
2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf
Updated parameter name to reflect units
2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1
Time played displayed in save/load menus
2015-08-19 10:05:08 -04:00
Marc Zinnschlag
9918b57341
Merge remote-tracking branch 'origin/master'
2015-08-19 16:03:01 +02:00
Jeffrey Haines
e1baf1ea48
NPCs scream when they die
2015-08-19 09:51:04 -04:00
scrawl
232dfdc07e
Make an error message slightly more helpful
2015-08-19 01:24:54 +02:00
scrawl
681183df31
Restore handling of fog depth == 0 values (Bug #1549 )
2015-08-19 01:13:14 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
dca08b0b42
Remove a firing assert ( Fixes #2871 )
2015-08-18 14:51:32 +02:00
Marc Zinnschlag
e888fd7034
Merge remote-tracking branch 'scrawl/delete_noop'
2015-08-17 18:21:56 +02:00
Marc Zinnschlag
3992125b61
Merge remote-tracking branch 'scrawl/master'
2015-08-17 14:05:51 +02:00
Marc Zinnschlag
dc72b24f4e
Merge remote-tracking branch 'dteviot/PathfindingRefactorDraft'
2015-08-17 14:04:56 +02:00
Marc Zinnschlag
b5f3f0522a
Merge remote-tracking branch 'slothlife/weather-settings-fix'
2015-08-17 14:03:54 +02:00
scrawl
b583a2ec33
Make SetDelete a no-op for items in containers ( Fixes #2864 )
2015-08-17 00:06:26 +02:00
Jordan Ayers
be7bd9529d
Classes shouldn't use MWBase::Environment to access their own members.
2015-08-16 16:56:44 -05:00
scrawl
9fad33cd14
Don't reset the item model's sort/filter options in updatePlayer ( Fixes #2863 )
2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25
Remove an unused function
2015-08-16 17:40:20 +02:00
dteviot
4d9d8a060d
Pathing bugfix.
...
When path contains one one point from path grid, point is no longer being discarded.
2015-08-16 18:56:28 +12:00
dteviot
942a987d52
centralize the world/cell coordinate conversion logic.
2015-08-16 18:55:02 +12:00
dteviot
5049c9ab6a
removed unnecessary tests.
2015-08-16 17:41:33 +12:00
slothlife
3d419a612a
Corrected some weather transition calculations
...
Reversed some formulas for Transition Delta and Clouds Maximum Percent
and implemented them. Refactored Weather some to encapsulate those
formulas (to more closely match MoonModel). Did some small cleanup of
WeatherManager.
2015-08-15 23:38:49 -05:00
scrawl
8426d376f0
Use separate touch spell raycasts for actors and objects ( Fixes #2849 )
2015-08-16 02:06:04 +02:00
scrawl
afb3d94ba4
Fix cell names in the save/load menu not being localised ( Fixes #2840 )
2015-08-16 01:55:14 +02:00
scrawl
c25dacb480
Fix "Level" string in the save/load menu not being localised (Bug #2840 )
2015-08-16 01:53:58 +02:00
scrawl
8241976368
Don't attempt to play non-existing hit animations ( Fixes #2856 )
2015-08-15 23:27:37 +02:00
scrawl
7dd09dd637
Fix being able to flip journal pages with the mousewheel when the options overlay is active ( Fixes #2855 )
2015-08-15 20:44:15 +02:00
scrawl
58cd2b1a84
Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? ( Fixes #2148 )
2015-08-15 19:01:21 +02:00
scrawl
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
2015-08-15 16:09:53 +02:00
scrawl
d76fb2d266
Apply disintegrate only to weapons and armor ( Fixes #2853 )
2015-08-14 13:38:39 +02:00
Marc Zinnschlag
5aeabe22f0
Merge remote-tracking branch 'dteviot/PathfindingRefactor'
2015-08-14 10:13:04 +02:00
scrawl
e8c9d3ea2a
Fix cell names on world map not always being translated ( Fixes #2832 )
2015-08-13 17:08:21 +02:00
scrawl
1e18a73b1c
Don't play magic effect sounds & visual effects for unsuitable targets ( Fixes #2811 )
2015-08-13 17:08:21 +02:00
scrawl
211deeb63e
Don't attempt to lock or unlock unsuitable objects ( Fixes #2826 )
2015-08-13 17:08:21 +02:00
scrawl
0d8f07d563
Properly apply changes when backing out of chargen dialogs ( Fixes #2627 )
2015-08-13 17:08:21 +02:00
scrawl
86f0e505e9
Add a fixPosition for the --start exterior cell ( Fixes #2790 )
2015-08-13 17:08:20 +02:00
Marc Zinnschlag
d511772534
Merge remote-tracking branch 'rohit-n/gamepad'
2015-08-13 10:15:27 +02:00
Rohit Nirmal
d9b11f963a
Gamepad: Slow down simulated mouse with right trigger
...
in menus.
2015-08-11 21:46:54 -05:00
dteviot
55e3aaaa35
made variable const.
2015-08-10 20:30:43 +12:00
dteviot
e42a2478dc
Removed tests that are not necessary.
2015-08-09 17:58:40 +12:00
dteviot
2b9e22f593
extracted function stopAttack().
2015-08-09 14:29:38 +12:00
dteviot
0884a3796f
extracted function isTargetMagicallyHidden().
2015-08-09 14:20:55 +12:00
dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:08:42 +12:00
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:06:52 +12:00
Marc Zinnschlag
d29862eac3
Merge remote-tracking branch 'emperorarthur/anim_fail'
2015-08-08 10:47:46 +02:00
Marc Zinnschlag
b74a14211f
Merge remote-tracking branch 'origin/master'
2015-08-08 10:42:02 +02:00
Marc Zinnschlag
1eed1c4d23
Merge remote-tracking branch 'dteviot/AiCombatPerFrameUpdate'
2015-08-08 10:35:58 +02:00
scrawl
56b7196bea
Remove incorrect implementation of "Clouds Maximum Percent" weather setting
2015-08-07 15:34:01 +02:00
slothlife
3235cecddf
Use Glare View for visibility of celestial bodies
...
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
2015-08-07 00:08:18 -05:00
slothlife
238ae419a3
Fix use of incorrect material for Sun
2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579
Use diffuse alpha to fade Sun
2015-08-05 21:03:21 -05:00
slothlife
ea2f88a355
Fix several sky rendering bugs, maybe also #639
...
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
2015-08-04 21:07:42 -05:00
dteviot
58f732ebc9
Update path following checks each frame in AiCombat.
2015-08-04 18:20:05 +12:00
dteviot
ad9bab0b68
Removed redundant if.
2015-08-04 18:17:08 +12:00
dteviot
4256e151b1
Fixed error in deciding type of attack
2015-08-04 18:15:58 +12:00
dteviot
21e249cb92
pass parameters as const &
2015-08-04 18:14:36 +12:00
scrawl
664ae079db
Improve setting of culling mask for the savegame screenshot camera
2015-08-02 18:05:15 +02:00
scrawl
88c61ed2b6
Fix NotifyDrawCompletedCallback in single threaded mode
2015-08-02 17:57:50 +02:00
Marc Zinnschlag
e73c115ff5
Merge remote-tracking branch 'origin/master'
2015-08-02 13:44:17 +02:00
Marc Zinnschlag
529041f6f6
Merge remote-tracking branch 'slothlife/moon-settings'
2015-08-02 13:43:55 +02:00
Marc Zinnschlag
9ee3f1bfe7
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-02 13:42:39 +02:00
slothlife
0244a9b329
Correct moon texture with respect to trajectory
2015-08-01 07:57:05 -05:00
Marc Zinnschlag
9392e426c0
Merge remote-tracking branch 'origin/master' into mergetool
2015-08-01 10:16:20 +02:00
Marc Zinnschlag
15e8275443
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-01 10:14:28 +02:00
Arthur Moore
08d5aaf0fc
Remove more comments
2015-07-31 18:23:07 -04:00
Arthur Moore
6fce49bfb5
Don't warn twice when unable to play an idle animation
2015-07-31 18:01:02 -04:00
Arthur Moore
61c3835637
Don't try to play animations we know are bad
...
Prevents log spam
2015-07-31 18:01:02 -04:00
scrawl
7644a46ded
Creatures with no movement should not attempt to start combat ( Fixes #2786 )
2015-07-31 01:26:26 +02:00
scrawl
f326b8e5d2
Fix weapon animations playing on the lowerbody when swimming
2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e
Play swimming animation fallback on the upper body when possible
2015-07-31 00:35:41 +02:00
scrawl
1f755a2bc0
Don't use a shared Material in AlphaFader
2015-07-31 00:03:01 +02:00
slothlife
67a63cc662
Add some const correctness to MoonModel
2015-07-30 14:00:08 -05:00
Stanislav Bas
d13766cb3c
Remove redundant template specializations
2015-07-30 16:08:22 +03:00
Stanislav Bas
f15adb4e4f
Store::load() overwrites loaded records with the same IDs
2015-07-30 15:38:07 +03:00
Arthur Moore
5ea596f38d
Refactor onChooseActionStatePerFrameActions
...
This prevents playIdle errors from tyring to play idleAnimation 0
2015-07-30 08:15:45 -04:00
Arthur Moore
f69de1f263
Alert the user if trying to play a non-idle animation
...
Continue to propagate success/failure up the call stack.
2015-07-30 08:08:58 -04:00
Arthur Moore
5e6fcc2aef
Alert the user if attempting to play an animation fails
...
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
2015-07-30 08:00:26 -04:00
Marc Zinnschlag
26ea3aa1ad
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-30 10:26:40 +02:00
slothlife
a4e1630ec2
Remove unreferenced member in MoonModel
2015-07-30 00:41:30 -05:00
slothlife
8dc7e158c6
Fix forward declaration of MoonState
2015-07-30 00:18:56 -05:00
slothlife
24ba54f4fe
Implement accurate moon settings ( fixes #672 )
2015-07-29 23:57:45 -05:00
scrawl
7ba399fc92
Change a message to upper case spelling
...
More consistent with other loading messages
2015-07-28 03:21:44 +02:00
Marc Zinnschlag
bafa86d3e9
Merge remote-tracking branch 'scrawl/master'
2015-07-27 11:10:16 +02:00
dteviot
04aee1fe20
extracted function reactionTimeActions().
2015-07-26 17:32:29 +12:00
dteviot
c7aacaee70
extracted function returnToStartLocation().
2015-07-26 17:29:32 +12:00
dteviot
5e519ef550
extract function isPackageFinished().
2015-07-26 17:29:01 +12:00
dteviot
ad0d807103
extracted function reactionTimeActions().
2015-07-26 17:28:32 +12:00
dteviot
9c0e3d6c28
extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions().
2015-07-26 17:25:44 +12:00
dteviot
76f95eafe7
extract function onWalkingStatePerFrameActions().
2015-07-26 17:25:00 +12:00
dteviot
5ec310dfba
extract function onIdleStatePerFrameActions().
2015-07-26 17:24:33 +12:00
dteviot
b3d5b47fea
extracted function UpdateActorsMovement().
2015-07-26 17:23:45 +12:00
scrawl
dff84adf7e
Fix weapon animation priority
2015-07-26 01:35:36 +02:00
dteviot
aba7225817
Removed some duplicated operations.
2015-07-26 11:15:21 +12:00
scrawl
41996b0aad
Don't play turning animations in first person mode
2015-07-25 18:59:16 +02:00
scrawl
e0ee2fc01b
Adjust the movement animation speed every frame ( Fixes #1921 )
2015-07-25 18:22:48 +02:00
scrawl
278076e609
Include cleanup
2015-07-25 04:14:22 +02:00
scrawl
3bca3e73d4
Fix GetWeaponDrawn and GetSpellReadied script functions for creatures
2015-07-25 02:11:59 +02:00
scrawl
b3f5ac5dbb
Include cleanup
2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0
Outdated comment fix
2015-07-25 00:28:47 +02:00
scrawl
3f3c3d0ad3
Remove an already resolved todo comment
2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc
Include cleanup
2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35
Changed a settings variable responsible for number of loaded exterior cells.
2015-07-24 22:01:49 +02:00
scrawl
7f66339790
Remove a redundant function
2015-07-24 20:23:27 +02:00
scrawl
71bc22401f
Include cleanup
2015-07-24 18:23:23 +02:00
scrawl
7e4e59efb9
Fix excessive auto-equipping in InventoryStore::removeItem ( Fixes #2792 )
2015-07-23 02:29:09 +02:00
scrawl
7900631d51
Print the missing player cell to error output
2015-07-23 02:29:09 +02:00
scrawl
8286dc6c5a
Player followers don't report crimes ( Fixes #2457 )
2015-07-23 02:29:09 +02:00
Stanislav Bas
daaff1284e
Remove unused includes
2015-07-22 22:18:26 +03:00
Stanislav Bas
67c8f95c4e
Load/read methods (for ESM records) accept a deleted flag in OpenMW
2015-07-22 22:15:37 +03:00
Marc Zinnschlag
6e3032efc1
Merge remote-tracking branch 'koncord/fix-gold-beh'
2015-07-22 08:30:43 +02:00
Koncord
6c3c85f0d4
Fix indent
...
Remove misc.hpp in containerstore.cpp
2015-07-20 21:53:20 +09:00
Marc Zinnschlag
f3d3cbc58b
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-20 09:57:46 +02:00
Marc Zinnschlag
d2cd151f77
Merge remote-tracking branch 'kunesj/master'
2015-07-20 09:45:14 +02:00
dteviot
2a4d35b98c
fixed "comma at end of enumerator list" warning.
2015-07-20 18:20:57 +12:00
Koncord
7a86c8d8b6
Fix OpAddItem, OpGetItemCount and OpRemoveItem.
2015-07-20 12:48:19 +09:00
Koncord
a24df8cb66
Revert addImp() and remove()
...
add isGold() in MWWorld::Class
2015-07-20 12:43:58 +09:00
Koncord
9485aa5e44
Fix "removeitem gold_100" behavior
2015-07-20 09:53:08 +09:00
Koncord
aefcd1ad07
Fix "additem gold_100" behavior
2015-07-20 08:20:28 +09:00
Koncord
75e5023590
fix code duplication
2015-07-20 08:06:43 +09:00
Jiří Kuneš
a14a3c82de
added description of new syntax to the onRetrieveTag function comment
2015-07-19 19:52:50 +02:00
Stanislav Bas
5fd48efd28
Some refactoring. Remove unused code
2015-07-19 14:58:14 +03:00
Marc Zinnschlag
9b3d5c958f
Merge remote-tracking branch 'scrawl/music'
2015-07-19 11:49:00 +02:00
dteviot
00eef585af
renamed mPlayedIdle to mIdleAnimation.
2015-07-19 18:04:42 +12:00
dteviot
22f49128cc
replaced multiple booleans with single state variable.
2015-07-19 18:02:13 +12:00
dteviot
1ed6e95c07
Got rid of some radians to degrees to radians conversions.
2015-07-19 18:01:25 +12:00
dteviot
3ebe9fb34f
renamed mRotate to mTurnActorGivingGreetingToFacePlayer
2015-07-19 18:00:49 +12:00
scrawl
b01abe4d19
Stop title music when the game starts ( Fixes #2468 )
2015-07-19 02:08:24 +02:00
scrawl
1156668843
Render certain map markers on top of the player arrow ( Fixes #2559 )
2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5
define owned colours in settings.cfg
2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
2015-07-18 21:29:38 +02:00
scrawl
278a078e9d
Unify magic effect tick functions
...
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
2015-07-18 20:39:45 +02:00
scrawl
77f1387da8
Include cleanup
2015-07-18 20:36:28 +02:00
Jiří Kuneš
75f5972898
show owned - better settings
2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
2015-07-18 16:56:57 +02:00
scrawl
111cf5462b
Merge pull request #666 from scrawl/animation
...
Animation refactoring & fixes
2015-07-18 13:33:41 +02:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
2015-07-18 11:40:36 +02:00
Marc Zinnschlag
964cd44e96
Merge remote-tracking branch 'kunesj/master'
2015-07-18 11:34:04 +02:00
slothlife
f8f0380413
Fix for loading window icon on Windows
2015-07-17 21:41:53 -05:00
scrawl
a33ca75742
Pass AnimPriority by const reference
2015-07-18 03:23:41 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
scrawl
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127
fixed comment, save settings to member variable, removed usless include, changed variable to const
2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16
removed setCrosshairOwned from windowmanager
2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d
use correct mechanics manager
2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf
crosshair owned - settings option
2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93
change collor of crosshair
2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01
disable cusor when item/container is owned
2015-07-17 16:32:35 +02:00
scrawl
91d71d0fcd
Disable MyGUI's scrollbar autorepeat ( Fixes #2779 )
...
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
2015-07-17 03:39:09 +02:00
scrawl
660e7f5d89
Don't update animation states in skipAnim mode ( Fixes #2782 )
2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2
Don't restart the jump animation when equipping a different weapon ( Fixes #2286 )
2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1
Fix enchantments casting more than once per button press, broken by a1432b0255
2015-07-16 19:56:09 +02:00
scrawl
f6f82d433c
Fix bug with loop key assignment
...
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.
This fixes incorrect playing of the jump animation, one aspect of Bug #2286 .
2015-07-16 19:55:05 +02:00
scrawl
f8d360190d
Remove an unneeded virtual
2015-07-15 19:10:09 +02:00
scrawl
992b770315
Don't set OnPcEquip for items that failed to equip ( Fixes #2776 )
2015-07-15 18:52:23 +02:00
Stanislav Bas
e8a9567be3
Move DELE handling to CellRef record
2015-07-15 19:39:01 +03:00
scrawl
17ada63fcb
Don't play turning animations on the upperbody when in first person mode ( Fixes #2287 )
2015-07-15 16:43:11 +02:00
scrawl
3656851750
Remove the now unused changeBlendMask
2015-07-15 16:43:11 +02:00
scrawl
83cceeee72
Use the extended animation priority for Block animations, allow starting attacks during a block animation ( Fixes #2761 )
2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c
Use the extended animation priority for Hit animations
2015-07-15 16:33:10 +02:00
scrawl
50db6ed396
Use the extended animation priority for weapon animations
2015-07-15 14:40:36 +02:00
scrawl
e93a578f23
Extend the animation priority system to one priority value per bone group / distinct blend mask
2015-07-15 14:18:31 +02:00
scrawl
335ef97cf5
Rename Animation::Group to Animation::BlendMask
...
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
2015-07-15 13:49:16 +02:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
scrawl
dca4704b4b
Print exceptions in CharacterCreation::spawnDialog
2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a
Select the current resolution in resolution list on game start ( Fixes #2768 )
2015-07-13 18:00:41 +02:00
Stanislav Bas
c8c79dc1ef
Move ID loading into a separate method for Dialogue and DialInfo records
2015-07-13 11:26:23 +03:00
Marc Zinnschlag
d22f8703e5
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-13 09:09:01 +02:00
Stanislav Bas
c266315a35
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
2015-07-12 15:20:22 +03:00
Stanislav Bas
2ed182b144
Update to upstream/master. Resolve merge conflicts in MWWorld::Store
2015-07-12 12:01:18 +03:00
dteviot
ddeabcdfbe
Removed unused field that was giving compiler warning.
2015-07-12 17:15:41 +12:00
dteviot
e294cd95cd
extracted function playIdleDialogueRandomly()
2015-07-12 17:15:14 +12:00
dteviot
22059d68f6
Remove duplicated code.
2015-07-12 17:14:48 +12:00
dteviot
0b089a5564
extracted function evadeObstacles()
2015-07-12 16:38:36 +12:00
dteviot
1ef78b1e56
extracted playGreetingIfPlayerGetsTooClose()
2015-07-12 16:37:31 +12:00
dteviot
df421fce92
extracted function setPathToAnAllowedNode()
2015-07-12 16:35:15 +12:00
dteviot
b508846a64
Renamed mStoredAvailableNodes to mPopulateAvailableNodes.
...
Don't call getAllowedNodes() needlessly.
2015-07-12 16:32:48 +12:00
Stanislav Bas
e0983c815c
Some fixes for ESM Dialogues and Infos
2015-07-11 22:17:53 +03:00
Marc Zinnschlag
dacb93c57f
Merge remote-tracking branch 'scrawl/coverity_scan'
2015-07-11 11:53:43 +02:00
scrawl
24ae1d5ace
Fix some issues found by coverity
2015-07-11 03:34:08 +02:00
scrawl
667c80fb2a
Add brackets around a correct expression to fix coverity warning
2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993
Fix code that I forgot to uncomment (thanks coverity)
2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
12f413ba9b
Don't instantiate specialized templates
...
This fixes the VS2012 build issue
2015-07-10 20:21:55 +02:00
Marc Zinnschlag
ba9a9d16bb
Merge remote-tracking branch 'scrawl/master'
2015-07-10 09:06:04 +02:00
Marc Zinnschlag
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
2015-07-10 08:58:53 +02:00
scrawl
f12619b86a
Implement fStromWindSpeed ( Fixes #2764 )
2015-07-10 02:34:00 +02:00
Stanislav Bas
20723581a1
Letter case fix for MWWorld::Globals
2015-07-10 00:29:43 +03:00
Stanislav Bas
00bf87b561
Convert IDs of loaded records to lower case in MWWorld::Store
2015-07-10 00:29:41 +03:00
Stanislav Bas
897a52cdda
Remove NAME handling from MWWorld::Globals
2015-07-10 00:29:40 +03:00
Stanislav Bas
9301bc148e
Remove NAME handling from MWWorld::ESMStore
2015-07-10 00:29:38 +03:00
Stanislav Bas
89e44c8f1f
Remove explicit record ID in load/read methods of MWWorld::Store
2015-07-10 00:29:36 +03:00
Alexander "Ace" Olofsson
b3b55a5842
Explicitly instantiate MWWorld::Store
2015-07-09 19:22:04 +02:00
Alexander "Ace" Olofsson
b1cc74dd9a
Explicity instantiate MWMechanics::Stat
2015-07-09 14:41:37 +02:00
dteviot
f1774ee7c3
Fixed compile failing on OSX and Linux.
2015-07-08 19:34:33 +12:00
dteviot
52cf8541f5
End point tolerance restored to 64 units.
...
Corrected problem pointed out by Scrawl.
Destination needs tolerance of 64 to avoid overcrowding.
2015-07-08 18:41:03 +12:00
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
2015-07-07 19:19:37 +02:00
dteviot
40a925ad37
Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726
2015-07-07 18:16:15 +12:00
Marc Zinnschlag
e89614a35d
Merge remote-tracking branch 'origin/master'
2015-07-06 13:10:04 +02:00
Marc Zinnschlag
88f1220a77
Merge remote-tracking branch 'dteviot/Bug2726'
2015-07-06 13:07:40 +02:00
scrawl
49c07de773
Merge pull request #643 from ace13/win-build-fix
...
Fix build error and a pair of warnings
2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson
aaaee74a4d
Fix the comments
2015-07-05 21:56:04 +02:00
scrawl
531bca1273
Add a threshold for changing aicombat targets ( Fixes #2755 )
2015-07-05 18:09:13 +02:00
Marc Zinnschlag
432384d280
Merge remote-tracking branch 'scrawl/aicombat'
2015-07-05 14:47:20 +02:00
dteviot
1239667cb4
AiWander uses points between PathGrid points ( Fixes #1317 )
...
When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.
2015-07-05 18:21:35 +12:00
dteviot
eb2aa965b9
Extracted function SetCurrentNodeToClosestAllowedNode()
2015-07-05 18:17:18 +12:00
dteviot
76f20b8b20
fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning.
2015-07-05 18:10:02 +12:00
dteviot
0095737c40
Use correct type of variable. Remove unnecessary casts.
2015-07-05 18:09:14 +12:00
dteviot
f942db2b27
Simplified code.
2015-07-05 18:08:09 +12:00
dteviot
9a02a85a24
Pulled duplicate code into function.
2015-07-05 18:07:14 +12:00
scrawl
c90841d649
Fix head tracking for NPCs
2015-07-04 21:00:01 +02:00
mrcheko
c773ed9f9a
move checkWayIsClear to pathfinding; move shortcut logic to separate func (AiPackage::shortcutPath); rework AiPackage::pathTo
2015-07-04 18:00:16 +03:00
dteviot
fae93e3d82
Bugfix: was not resetting mStuckCount.
2015-07-04 19:00:27 +12:00
dteviot
46a654286b
Remove fix for #1317
...
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
2015-07-04 18:57:56 +12:00
dteviot
164994f3d3
Made PathFinder::buildPath() private.
...
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
2015-07-04 18:47:26 +12:00
scrawl
6bcea21e14
Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876 )
2015-07-04 05:19:05 +02:00
scrawl
a7bd050928
Accurate attack timings in AiCombat
2015-07-03 05:58:12 +02:00
scrawl
741e5db862
Fix for non-bipedal creatures that use weapons, e.g. rieklings
2015-07-03 05:37:18 +02:00
scrawl
82740c1645
Remove completely broken code
2015-07-03 02:29:42 +02:00
scrawl
d07b176b36
Take into account hit recovery, knockdown and other animations for AiCombat attack timing
2015-07-03 02:18:35 +02:00
scrawl
520a832a9a
Remove an already resolved todo comment
2015-07-02 22:24:23 +02:00
scrawl
6724585777
Light magic effect
...
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364 )
2015-07-02 20:46:34 +02:00
scrawl
bf9c62fa42
Fix for some coverity scan defects
2015-07-02 20:46:34 +02:00
scrawl
dcb8fbc69c
Accurate handling of fog depth/density ( Fixes #2752 )
2015-07-02 20:46:34 +02:00
scrawl
6691891bee
Include cleanup
2015-07-02 19:16:44 +02:00
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
2015-07-02 19:14:28 +02:00
scrawl
519fb9482a
Minor cleanup
2015-07-02 18:45:11 +02:00
Alexander "Ace" Olofsson
5d24091364
Fix build error and a pair of warnings
...
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
2015-07-01 15:06:38 +02:00
scrawl
20d03c7e39
Refuse loading save games of unknown format
2015-06-30 17:41:44 +02:00
scrawl
a081d402c5
Use the format field instead of version field
2015-06-30 17:26:33 +02:00
scrawl
4637750601
Savegame loading optimization
2015-06-30 16:47:41 +02:00
scrawl
4eaaa5e855
Increment save file version and mark it as used, will be used in next commit
2015-06-30 16:47:40 +02:00
scrawl
ca21e9ecb1
Fix magic hit VFX showing when casting on a static object
2015-06-30 03:14:49 +02:00
scrawl
4b2391c60f
Ignore effect meshes in getScreenBounds
2015-06-30 02:51:32 +02:00
scrawl
d5a47cfafe
Include cleanup
2015-06-30 01:41:03 +02:00
scrawl
017c9f7ac9
Fading for weather particle effects
2015-06-29 20:19:46 +02:00
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
2015-06-28 05:53:03 +02:00
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
2015-06-28 00:38:39 +02:00
scrawl
59db9664ba
Pass the CharacterController to AiPackage::execute
2015-06-26 17:47:04 +02:00
scrawl
a44be148d8
Fix door collisions
2015-06-26 06:40:28 +02:00
scrawl
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
2015-06-26 05:15:07 +02:00
scrawl
beb1086260
Fix attackStrength being unset for creatures with no weapons
2015-06-26 04:21:10 +02:00
scrawl
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
2015-06-26 02:32:41 +02:00
scrawl
4ef6aa6b7f
Fix weather particles disappearing
2015-06-26 02:30:39 +02:00
scrawl
ea0339d471
Make the string argument to BetaComment optional
2015-06-25 21:45:59 +02:00
scrawl
8a3889a81e
Rain fading
2015-06-25 17:38:12 +02:00
scrawl
3a21f05f6e
Rain effect
2015-06-25 17:23:01 +02:00
scrawl
6f34a0501a
Attempting to make a potion with no effects removes the ingredients ( Fixes #2722 )
2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722 )
2015-06-24 05:17:45 +02:00
scrawl
d7695f2560
Remove unused NpcAnimation visibilityFlags
2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55
Move HeadAnimationTime to the implementation file
2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13
Move head tracking from NpcAnimation to Animation (Bug #2720 )
2015-06-22 21:06:27 +02:00
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
2015-06-22 20:09:02 +02:00
Marc Zinnschlag
83961e9109
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-22 15:20:58 +02:00
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
2015-06-21 18:45:49 +02:00
scrawl
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
dteviot
c65e7a31e7
Aquatic creatures no longer try to get onto land.
...
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
2015-06-21 16:23:40 +12:00
scrawl
ad6764fa6a
Fix bug #2715
2015-06-20 17:08:46 +02:00
scrawl
efad4efe19
Star fading (Bug #2693 )
2015-06-19 20:55:04 +02:00
scrawl
74260a9a44
Tweak moon sizes
2015-06-19 20:30:04 +02:00
scrawl
f5c50aa581
Disable FreezeOnCull for effect particles
2015-06-19 18:38:44 +02:00
scrawl
1ed4e33815
Fading for mooncircle texture
2015-06-19 18:19:52 +02:00
scrawl
38d90f47a6
Moon fading fix (Bug #2713 )
2015-06-19 18:15:23 +02:00
scrawl
2b53e5d965
Fix for explosion effects playing when the game is paused
2015-06-19 03:32:48 +02:00
scrawl
e0dfc1425e
Correct moon blending
2015-06-19 02:51:01 +02:00
scrawl
0c4ebee6b3
Cloud opacity & cross-fading
2015-06-19 01:03:12 +02:00
scrawl
fb94395628
Fix atmosphere lighting
2015-06-18 23:15:13 +02:00
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-06-18 15:00:21 +02:00
scrawl
04010b8a1a
Set OnPcHitMe even for missed hits
2015-06-18 15:00:04 +02:00
scrawl
fabc5126f3
Include cleanup
2015-06-18 00:30:51 +02:00
scrawl
0ffa1f964b
Fix water ripple height
2015-06-17 22:49:20 +02:00
scrawl
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
2015-06-17 20:49:01 +02:00
scrawl
3ebfb4e0d9
Ignore particle systems in getScreenBounds
2015-06-17 18:22:31 +02:00
scrawl
b543308e3e
Remove an already resolved todo comment
2015-06-17 18:16:05 +02:00
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-17 15:56:01 +02:00
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
2015-06-17 15:13:41 +02:00
scrawl
7b35882814
RemoveParticlesVisitor fix
2015-06-17 15:13:17 +02:00
scrawl
1c151f2f0a
Re-enable some outcommented sky code
2015-06-16 20:56:48 +02:00
scrawl
3da8f6e62e
Water ripples
2015-06-16 20:36:48 +02:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
scrawl
b73947033d
Rotate sky meshes
2015-06-16 16:33:31 +02:00
scrawl
2d072aab2d
Broken bone references from .kf files are no longer a fatal error (Bug #2687 )
2015-06-15 22:42:14 +02:00
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
07937c741a
Improve exception handling when starting a new game from the main menu
2015-06-15 16:19:05 +02:00
scrawl
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
2015-06-14 23:56:35 +02:00
scrawl
f017fd6860
Reduce includes in animation.hpp
2015-06-14 23:13:26 +02:00
scrawl
b90fc8ad92
Fix for various Viewer::frame calls resetting the simulationTime
2015-06-14 18:19:53 +02:00
scrawl
9fc2c2e8ee
Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677 )
2015-06-14 16:32:34 +02:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +02:00
scrawl
2476cd4f9a
Error message fix
2015-06-14 16:12:18 +02:00
scrawl
195e1a8410
Fix the Viewer's FrameStamp not being set correctly during Engine::frame
2015-06-14 15:28:22 +02:00
Marc Zinnschlag
0994893bc5
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-14 12:05:53 +02:00
dteviot
520fbd63c4
simplified pathfinding code.
...
remove mIsPathConstructed. Instead call !mPath.empty().
2015-06-14 15:14:02 +12:00
scrawl
28caeadef4
Improve error message for not found records
2015-06-14 02:31:00 +02:00
dteviot
bfff84ba8f
replaced #include with forward class declaration, as suggested by slaugherfish.
2015-06-14 10:30:55 +12:00
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
2015-06-13 21:11:24 +02:00
scrawl
d4c45efb2b
Remove useless #undef's for windows now that we have NOMINMAX flag
2015-06-12 04:39:44 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
7407bbdac9
Add a function for SDL error handling
2015-06-12 01:08:58 +02:00
scrawl
800bd511f6
Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649 )
2015-06-12 00:12:12 +02:00
scrawl
76bdf7a5b7
Add night-eye effect
2015-06-11 23:16:05 +02:00
scrawl
712cef36b0
Minor cleanup
2015-06-11 18:01:00 +02:00
scrawl
f81c3bcd6d
Fix for broken InitWorldSpaceParticles on projectile effects
2015-06-11 16:40:26 +02:00
scrawl
c94c87d409
Attach effects to the insert node instead of the object root (Bug #2654 )
2015-06-11 16:22:09 +02:00
scrawl
c7493eb45c
Fix bug with invisibility effect for meshes w/ vertex colors
2015-06-11 16:14:51 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
2015-06-11 18:28:31 +12:00
scrawl
15453e3d90
Use MyGUI::UString for unicode conversion
2015-06-10 16:59:35 +02:00
scrawl
f511cb08ff
Compatibility with bullet versions < 2.81
2015-06-08 21:03:04 +02:00
scrawl
0330d3d61e
Restore the "transparent" loading screen
2015-06-07 21:21:57 +02:00
scrawl
f3cbe7b9da
Hide FPS widget since it currently doesn't work, use F3 instead
2015-06-07 19:38:59 +02:00
scrawl
bf02c7f6e4
Sun visibility fix
2015-06-07 19:28:12 +02:00
scrawl
508c57d6e2
addEffect crash fix for objects with no model
2015-06-07 17:09:37 +02:00
scrawl
16e080e252
Fix the physics debug drawer lagging a frame behind
2015-06-07 17:00:00 +02:00
scrawl
b33fe8fb62
Fix the inventory listener bug
2015-06-07 16:50:34 +02:00
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
2015-06-07 15:23:54 +02:00
scrawl
0a411cbd7c
Enable particle lighting
2015-06-07 04:41:55 +02:00
Stanislav Bas
49512a2b57
Correct the explanation for the Console::acceptCommand()
2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba
Add the explanation to Console::acceptCommand()
2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f
Reset Console editbox before command execution
2015-06-05 22:00:02 +03:00
scrawl
4c09ecef72
Normalize fixes
2015-06-05 03:41:10 +02:00
scrawl
1fd48e6f81
Fix not being able to move during ashstorm
2015-06-05 03:36:18 +02:00
scrawl
700000cbca
Error handling fix
2015-06-05 02:57:50 +02:00
scrawl
403ce30a35
Graceful handling for failing to create SDL window
2015-06-05 02:53:10 +02:00
scrawl
ddfed35d1c
Object placement raycasts should use the rendering meshes
2015-06-05 02:26:16 +02:00
Stanislav Bas
c40987338d
Scrollbars don't save their positions between openings
2015-06-04 23:09:40 +03:00
scrawl
a0b0ae9bd1
Remove an unused variable
2015-06-04 21:51:24 +02:00
scrawl
30ab15e605
Fix -Wunused-private-field clang warnings
2015-06-04 20:42:05 +02:00
scrawl
e23775e338
Fix -Woverloaded-virtual clang warnings
2015-06-04 20:31:28 +02:00
scrawl
141e9d36a4
Get rid of unused DialogueManager::mScriptVerbose
2015-06-04 20:12:39 +02:00
scrawl
78ac37b52a
Remove BOOST_STATIC_ASSERT to fix clang warnings
2015-06-04 20:11:40 +02:00
scrawl
93656aa6cf
Add a header missing from CMakeLists
2015-06-04 20:10:07 +02:00
scrawl
869f8a329a
Cloud scrolling fix
2015-06-04 20:08:44 +02:00
scrawl
ce0d93caed
Fix for "GlobalMap trying to erase an inactive camera" spam in main menu
2015-06-04 16:32:21 +02:00
scrawl
91eea1258c
doc.hpp fix
2015-06-04 01:30:16 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
b70383d127
Remove last remains of Ogre math
2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0
Remove dependency on Ogre::StringConverter
2015-06-03 19:59:54 +02:00
scrawl
cc6d5a3ba0
Fix player setup bug
2015-06-03 19:44:21 +02:00
scrawl
7bacb9418d
Various math code ported to osg
2015-06-03 19:41:19 +02:00
scrawl
0cc9b1bb40
Remove dependency on OgrePlatform.h
2015-06-03 18:49:52 +02:00
scrawl
e642f20a65
Restore screenshot key functionality
2015-06-03 17:25:18 +02:00
scrawl
2a85a22dba
Write savegame screenshot
2015-06-03 16:40:16 +02:00
scrawl
24551c7bab
Fix for savegame incompatibility with master branch
2015-06-03 14:56:57 +02:00
scrawl
41cce5240f
Delete remaining files that won't be of any use
2015-06-03 03:29:21 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3
Unify raycasting techniques for "on touch" magic
...
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
2015-06-03 03:16:26 +02:00
scrawl
cee1db532f
Improve area orb positioning for "on touch" spells
2015-06-03 03:04:39 +02:00
scrawl
2883ecc19a
Fix the hilarious bug of NPCs falling to their deaths in interiors
2015-06-03 02:48:45 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
58ebf57154
Apply a comment that got lost in the endless depths of my git stash
2015-06-02 17:13:30 +02:00
scrawl
8c50f8ed26
Fix for lights with no mesh
2015-06-02 17:06:55 +02:00
scrawl
5a7f2a4f1f
Restore light attenuation settings
2015-06-02 17:02:56 +02:00
scrawl
01944c33f5
Basic water rendering
2015-06-02 16:35:35 +02:00
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
2015-06-01 23:49:40 +03:00
scrawl
de8e5f0db1
Restore projectiles
2015-06-01 21:41:13 +02:00
scrawl
c85764b654
Wireframe mode
2015-06-01 17:02:44 +02:00
scrawl
7f9f9a32d2
InitWorldSpaceParticles fix
2015-06-01 16:29:42 +02:00
scrawl
987918ca15
NpcAnimation::setAlpha
2015-06-01 16:18:57 +02:00
scrawl
bed31996c9
Camera raycast
2015-06-01 15:34:46 +02:00
scrawl
2869424847
Fix first person camera for beast races
2015-06-01 04:41:03 +02:00
scrawl
f88079fddd
Restore the isOnGround hack
2015-06-01 02:40:42 +02:00
scrawl
ccd95419e5
Restore various raycasting
2015-06-01 01:57:15 +02:00
scrawl
8e0a988289
Icon fix
2015-06-01 01:32:02 +02:00
scrawl
e306853570
Fix chargen crash
2015-06-01 00:50:55 +02:00
scrawl
84fd682e4e
Fix for unnecessary exceptions when opening sounds
...
This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.
2015-06-01 00:41:44 +02:00
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
2015-06-01 01:14:11 +03:00
scrawl
5b846ebc71
Camera precision fix
2015-05-31 23:09:37 +02:00
scrawl
ed4863ad7d
Restore ranged weapon aiming
2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b
Restore head tracking
2015-05-31 18:04:14 +02:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
60f55997fd
Rotate first person meshes, sneak camera offset in first person
2015-05-31 02:26:58 +02:00
scrawl
a066b24303
Restore WeaponAnimation
2015-05-31 01:07:43 +02:00
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
2015-05-30 17:20:49 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
scrawl
988a9cad58
getHitContact Head exception fix
2015-05-30 01:41:38 +02:00
scrawl
cc3bfe2bb2
Restore collision tracker
2015-05-30 01:32:00 +02:00
scrawl
b2fe21dd3b
Minor cleanup
2015-05-30 01:11:00 +02:00
scrawl
fd50be0fb8
Restore various gameplay
2015-05-30 01:00:24 +02:00
scrawl
5c7ecb9c1d
string::compare exception fix
2015-05-29 23:38:31 +02:00
scrawl
af2f26d04d
Particle fixes
2015-05-29 20:45:27 +02:00
scrawl
7e715decd3
Color fix
2015-05-29 02:26:58 +02:00
scrawl
6d3528af70
Port global map exploration
2015-05-29 01:49:52 +02:00
scrawl
7a1408cfed
Restore display of global map overlay, no exploration yet
2015-05-28 18:49:24 +02:00
scrawl
72d0a69132
Fix global map markers not being cleared on a new game
2015-05-28 18:44:34 +02:00
scrawl
9ee63dc3f4
Change stats viewer key to f3
2015-05-28 16:28:48 +02:00
scrawl
5f7a82e0da
Fog of war fix
2015-05-28 16:20:29 +02:00
scrawl
f4ee805e3b
Object animation fix
2015-05-28 15:44:58 +02:00
scrawl
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
2015-05-28 03:50:49 +02:00
scrawl
5628a2b823
Camera zoom fix
2015-05-28 03:47:53 +02:00
scrawl
8b3054aa8b
Fix for player collision cleanup issue
2015-05-28 02:45:38 +02:00
scrawl
6555ee8d80
Minor include cleanup
2015-05-28 02:37:35 +02:00
scrawl
025a1a7866
Restore savegame screenshot display
2015-05-28 02:34:38 +02:00
scrawl
1f00174c02
Use a btCollisionWorld instead of btDiscreteDynamicsWorld
...
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
2015-05-27 23:09:38 +02:00
scrawl
fe439e53ff
Bullet include cleanup
2015-05-27 22:32:11 +02:00
Marc Zinnschlag
b6878c2e0c
improved error handling in LocalScripts::add
2015-05-27 19:45:26 +02:00
scrawl
2f97649540
Fix for cleanup issue when exiting after a failed savegame load ( Fixes #2580 )
2015-05-27 00:30:39 +02:00
scrawl
723beb1cac
Move IncrementalCompileOperation to SceneManager
2015-05-26 20:20:18 +02:00
scrawl
099f93f00d
Sky fixes
2015-05-26 18:22:21 +02:00
scrawl
c4951d1e73
Map rotation fix
2015-05-26 18:10:31 +02:00
scrawl
3dcb167066
Map rendering
2015-05-26 16:40:44 +02:00
scrawl
76dd3e4034
Fix lip animation regression
2015-05-24 04:40:09 +02:00
scrawl
1fd9fba7a3
Fix debug drawer crash
2015-05-24 04:28:34 +02:00
scrawl
95465a1489
Player raycast fix
2015-05-24 04:01:36 +02:00
scrawl
d84990be85
Restore getCollisions
2015-05-24 03:59:22 +02:00
scrawl
8b322fcd06
Implement getFacedObject using osgUtil::IntersectionVisitor
2015-05-24 03:36:34 +02:00
scrawl
c2131e7c31
Make near clip distance configurable
2015-05-24 02:34:20 +02:00
scrawl
9a0db5d55a
Restore cell changes
2015-05-24 01:32:00 +02:00
scrawl
152d690a7a
Minor cleanup
2015-05-23 23:10:53 +02:00
scrawl
da24e298ee
Fix -Wreorder warnings
2015-05-23 22:44:00 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
scrawl
0de6839890
Minor cleanup
2015-05-23 06:07:11 +02:00
scrawl
0b042b75cc
Restore actor visibility mask
2015-05-23 05:42:37 +02:00
scrawl
04e827ecf6
Don't try to play an empty video
2015-05-23 05:42:21 +02:00
scrawl
cd81ec92db
Minor cleanup
2015-05-23 05:41:53 +02:00
scrawl
8092f37ce5
New game crash fix
2015-05-23 05:40:24 +02:00
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
85345e663a
Restore getHitContact
2015-05-22 04:36:33 +02:00
scrawl
627fee07bc
Minor cleanup
2015-05-22 04:36:33 +02:00
scrawl
cac7c1e535
Restore various physics features
2015-05-22 04:36:33 +02:00
scrawl
d6da5c8007
Fix for crosshair not showing
2015-05-22 04:36:33 +02:00
scrawl
5ea61af6ac
Fix for applying view distance
2015-05-22 04:36:33 +02:00
scrawl
2235d2978b
Restore animation text key handling
2015-05-22 04:36:33 +02:00
scrawl
9b8e2e9db3
Port MWRender::Camera
2015-05-22 00:29:27 +02:00
scrawl
0fb97bd2e7
Readded baseonly parameter to Animation::setObjectRoot
...
Fixes the first person view.
2015-05-21 23:24:22 +02:00
scrawl
6031db7882
Character sliding fix
2015-05-21 21:04:48 +02:00
scrawl
cfe57199d7
Minor cleanup
2015-05-20 04:09:21 +02:00
scrawl
c4452afd89
Inventory item picking
2015-05-20 04:09:21 +02:00
scrawl
72c1f37527
Port CharacterPreview
2015-05-20 02:18:20 +02:00
scrawl
820f4a2688
Fix light direction
2015-05-20 02:07:18 +02:00
Stanislav Bas
163c12d3eb
Merge remote-tracking branch 'upstream/master'
2015-05-19 21:39:48 +03:00
Stanislav Bas
196be7283d
Reset an activated reference after activation's exectution ( Fix #1738 )
2015-05-19 21:39:17 +03:00
scrawl
8bcfac1ea3
Fix adjustPosition not always working correctly ( Fixes #2563 )
...
moveObject was returning an incorrect Ptr for cell movements.
2015-05-17 18:16:42 +02:00
scrawl
75ace9f8b5
Global map base layer
2015-05-16 14:48:20 +02:00
scrawl
1b41f6c4c5
Sleep interruption fix
2015-05-16 12:29:26 +02:00
scrawl
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
2015-05-15 23:21:29 +02:00
scrawl
737c2114dc
Change viewer stats keybinding to F9
2015-05-15 19:43:48 +02:00
scrawl
b7fa645530
Don't destroy a NULL window
2015-05-15 19:34:18 +02:00
scrawl
49df07ea7f
Implement UI scaling factor
2015-05-15 00:41:21 +02:00
scrawl
842ff4d874
Catch exception for not found videos
2015-05-15 00:23:31 +02:00
scrawl
24bb2e152c
Apply texture filter setting changes
2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6
Apply video mode & gamma setting changes
2015-05-14 20:31:16 +02:00
scrawl
3e86dd7df0
Apply runtime changes to field of view & view distance
2015-05-14 18:46:28 +02:00
scrawl
b7258c8d23
Readded Objects::updatePtr
2015-05-14 17:34:55 +02:00
scrawl
bc237ee1fe
Actor placement fix
2015-05-14 17:14:49 +02:00
scrawl
4ad0b83aa5
Eliminate string lookups in AnimationTime
2015-05-14 16:33:41 +02:00
scrawl
e3b1707bbd
Pause simulationTime when the GUI is up
2015-05-14 02:26:19 +02:00
scrawl
a18663c8b3
Improve MyGUI texture updates
2015-05-14 01:26:10 +02:00
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
2015-05-13 18:56:14 +02:00
scrawl
39fb46601a
Readded input & event handling
2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef
Create the GraphicsWindowSDL2 directly
2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0
Readded window icon
2015-05-13 15:03:21 +02:00
scrawl
36e0cfbc9d
Cleanup
2015-05-13 03:36:20 +02:00
scrawl
375b736e74
Use SDL to create the window
...
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.
Thanks to KittyCat for the GraphicsWindowSDL2 code.
2015-05-13 02:53:09 +02:00
scrawl
7a3bc69df7
Readded sound listener
2015-05-12 19:02:56 +02:00
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
2015-05-12 17:40:42 +02:00
scrawl
56ff280230
Mention the RefId in "error during rendering: " errors
2015-05-12 16:50:43 +02:00
scrawl
4036978718
Empty model exception fix
2015-05-12 16:50:31 +02:00
scrawl
e8ec4387d6
Creature collision fix
2015-05-12 16:50:11 +02:00
scrawl
2bc95df265
Actor collision object placement fix
2015-05-12 16:49:28 +02:00
scrawl
65f0195c71
Readded animated collision shape support
2015-05-12 16:26:11 +02:00
scrawl
19988d5e45
Remove RefData::getHandle
2015-05-12 04:04:54 +02:00
scrawl
47758c11cd
Readded collision objects and movement physics
2015-05-12 03:02:15 +02:00
scrawl
5abeab21ed
Various integer/floating point roll adjustments based on wiki
2015-05-11 16:55:09 +02:00
scrawl
58a2ad663c
Fix regression of sleep interruption chance
2015-05-11 16:38:16 +02:00
scrawl
97c35da441
Change exterior water level to z=-1 ( Fixes #1405 )
2015-05-11 16:38:16 +02:00
scrawl
c819180aa1
Minor cleanup
2015-05-11 16:38:16 +02:00
scrawl
9d86e5b028
GetSpellEffects returns true for active abilities ( Fixes #2530 )
2015-05-11 16:38:16 +02:00
scrawl
ac88326909
Exit out of choice when no responses are found ( Fixes #2525 )
2015-05-11 16:38:16 +02:00
scrawl
3b8b217888
Fix no punishment for stealing when taking an item with the inventory opened
2015-05-11 16:38:16 +02:00
scrawl
eef8f71797
Add a comment
2015-05-11 16:38:16 +02:00
scrawl
b312f50b1f
Fix regression with detect spells detecting deleted objects ( Fixes #2518 )
2015-05-11 16:38:15 +02:00
scrawl
033719ccd7
Correct the icon used for custom map markers
2015-05-11 16:38:15 +02:00
scrawl
ca53457a1c
Correct the map icons used for detect spells ( Fixes #2519 )
2015-05-11 16:38:15 +02:00
scrawl
54c1f19c18
Readded height fields
2015-05-10 02:08:25 +02:00
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
2015-05-10 01:09:00 +02:00
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
2015-05-10 00:28:51 +02:00
scrawl
48ffeab191
Remove old BulletShapeManager
2015-05-09 01:06:55 +02:00
scrawl
52a4456cf7
LoadingScreen update
2015-05-09 00:02:38 +02:00
scrawl
c8eb77c557
Move StatsHandler construction to allow profiling of loading screen
2015-05-08 16:22:42 +02:00
scrawl
5db0639983
IncrementalCompileOperation tweak
2015-05-08 16:20:40 +02:00
scrawl
cf0fc43004
GUI shutdown fix
2015-05-08 15:10:17 +02:00
scrawl
483dc9de45
Stop viewer threading before changing MyGUI textures
2015-05-07 23:17:47 +02:00
scrawl
00f4f78717
Give a name to video streams for logging purposes
2015-05-07 23:08:52 +02:00
scrawl
77f733362c
Add stats graphs for Script, Mechanics and Physics timings
2015-05-07 21:57:02 +02:00
scrawl
100d6e5fff
Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance
2015-05-05 02:38:59 +02:00
scrawl
e191f0e044
Rename MWRender::Debugging to MWRender::Pathgrid
2015-05-04 17:41:30 +02:00
scrawl
c1edc30ad7
Dead code removal
2015-05-04 03:29:12 +02:00
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
2015-05-04 02:41:50 +02:00
scrawl
f0789352c6
Silence error message
2015-05-04 00:34:30 +02:00
scrawl
5a759f8b0d
GUI cleanup fix
2015-05-03 18:35:29 +02:00
scrawl
9de575ad42
Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
...
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
2015-05-03 18:16:54 +02:00
scrawl
37e3118d21
FontLoader cleanup fix
2015-05-03 17:52:50 +02:00
scrawl
283b252142
Stub InputManager
2015-05-03 17:24:35 +02:00
scrawl
31ead3a9f4
Increase loading screen FPS
...
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
2015-05-03 17:04:21 +02:00
scrawl
351fd842fd
Port loading screen
2015-05-03 16:58:05 +02:00
Marc Zinnschlag
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
2015-05-03 09:54:32 +02:00
scrawl
92cbc13964
Remove BtOgre
2015-05-03 00:50:56 +02:00
scrawl
1943110170
Add bullet debug drawer
2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e
Pathgrid rendering
2015-05-02 22:45:39 +02:00
scrawl
1a5407af98
Reduce texture memory usage in OpenMW
2015-05-02 19:36:36 +02:00
scrawl
d772da3720
Main menu background videos
2015-05-02 18:15:00 +02:00
scrawl
dc9b27acfe
Create manual GUI textures
2015-05-02 18:06:54 +02:00
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
2015-05-02 17:48:24 +02:00
scrawl
bddd31e385
Dead code removal
2015-05-02 17:11:51 +02:00
scrawl
d9d84bd7b2
Remove bullet raycasting shapes, to be replaced with OSG ray casts
2015-05-01 21:43:21 +02:00
scrawl
82c4d01b37
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
scrawl
bd8f0248f0
Player rendering
2015-05-01 18:21:50 +02:00
scrawl
b0804734e5
Port VideoWidget
2015-05-01 03:03:44 +02:00
scrawl
223e3a53f5
Move OEngine::Gui::Layout to MWGui
2015-05-01 02:22:51 +02:00
scrawl
6afb0e43ef
Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69
2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7
Move MyGUI platform to components
2015-05-01 01:44:21 +02:00
scrawl
db7fe1952d
Move MyGUI texture to a separate file
2015-05-01 01:44:21 +02:00
scrawl
62847f0489
Use node masks to separate Scene and GUI
2015-05-01 01:44:21 +02:00
scrawl
c90125f936
Uninitialized basenode fix
2015-05-01 01:44:21 +02:00
scrawl
83c6ba97c0
Disable skinning updates for actors beyond the AI processing distance
2015-04-30 00:10:24 +02:00
k1ll
96d9afec38
More header case fixes
2015-04-29 18:31:30 +02:00
k1ll
a230050ec8
Boost tr1 unordered map does not work with mingw
2015-04-29 18:31:29 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
scrawl
48a6d7c1a0
Remove mygui platform libraries from cmake
2015-04-28 16:33:30 +02:00
scrawl
a27446c8fb
Remove unused headers
2015-04-28 16:02:29 +02:00
scrawl
8971a200f7
Sky fix
2015-04-26 14:34:14 +02:00
scrawl
7809caf9dc
Dead code removal
2015-04-25 15:53:11 +02:00
scrawl
0ff7b2ff11
MechanicsManager, frame update
2015-04-25 15:19:17 +02:00
scrawl
2db097f80e
Fix nested callbacks bug
2015-04-25 15:10:37 +02:00
scrawl
372a54bbc7
Dead code removal
2015-04-25 01:28:01 +02:00
scrawl
a3417a9c49
CharacterController compiles
2015-04-25 01:20:07 +02:00
scrawl
15164e20f7
Cleanup fix
2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c
Add mygui backend by chris
2015-04-24 21:55:30 +02:00
scrawl
9f12e53956
Scale NPCs by their Weight property ( Fixes #814 )
2015-04-24 14:49:20 +02:00
scrawl
1c0e3a6488
rotateObject, scaleObject
2015-04-23 23:50:46 +02:00
scrawl
6f3e920f85
Animation port complete
2015-04-23 23:30:06 +02:00
scrawl
86b4a610cb
Movement accumulation works
2015-04-23 22:46:07 +02:00
scrawl
09742d5b95
Animation playback works, no movement accumulation yet
2015-04-23 20:41:31 +02:00
scrawl
1a19cd3607
Some cleanup
2015-04-22 19:08:56 +02:00
scrawl
8c810e3620
Move rng to components
2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a
Dead code removal
2015-04-22 17:48:06 +02:00
scrawl
04accb7652
Add LightController
2015-04-22 17:37:39 +02:00
scrawl
e49b8fe690
Fix persuasion mechanics using player stats instead of NPC's ( Fixes #2475 )
2015-04-22 01:17:34 +02:00
scrawl
dfd8e08698
Dead code removal
2015-04-21 23:40:10 +02:00
scrawl
26766b8e0a
Dead code removal
2015-04-21 23:36:36 +02:00
scrawl
9e177df61b
Add fog, view distance, and far plane culling
2015-04-21 23:36:36 +02:00
scrawl
c53a56ed6e
clear stream errors before attempting the read
2015-04-21 16:10:11 +02:00
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b
Port video player
2015-04-19 20:07:18 +02:00
scrawl
68f93294da
Port EffectManager
2015-04-19 17:55:56 +02:00
scrawl
fcc7aa02ab
Port addExtraLight
2015-04-19 15:03:08 +02:00
scrawl
c924e64047
Port HeadAnimationTime
2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930
Port BoneOffset
2015-04-19 14:25:36 +02:00
scrawl
9c4b2ea61a
CreatureAnimation compiles
2015-04-19 03:05:47 +02:00
scrawl
27cfe8fb58
Crash fix
2015-04-19 02:39:10 +02:00
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
scrawl
edc5cad79e
Port Animation::addEffect
2015-04-19 01:57:52 +02:00
scrawl
083c41c950
Environment map for enchanted objects
2015-04-17 01:23:37 +02:00
scrawl
c334a76a6f
Fix skinning bug
2015-04-15 22:38:43 +02:00
scrawl
5b8c28f641
NpcAnimation compiles
2015-04-15 22:11:38 +02:00
scrawl
13a1ba0aab
Moon rendering
2015-04-15 18:50:50 +02:00
scrawl
c516e897ee
Move Controller base classes to SceneUtil, add visitor to assign ControllerSources
2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe
More efficient StateSetController, beginnings of sky rendering
2015-04-14 15:58:16 +02:00
scrawl
8c7c89a4aa
Port SoundManager
2015-04-13 22:48:37 +02:00
scrawl
246b06ca27
Forgot to add
2015-04-13 17:30:32 +02:00
scrawl
61aaf0cf70
Attach light lists to the object base nodes instead of each renderable
...
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
2015-04-12 18:03:36 +02:00
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
2015-04-12 15:38:30 +02:00
scrawl
642c1d2d36
Build fix
2015-04-10 15:31:19 +02:00
dteviot
0a5de33a1a
fireEquipmentChangedEvent() updates the InventoryWindow. ( Fixes #2424 )
2015-04-06 15:13:09 +12:00
dteviot
fe69dc2863
Made LineInfo a struct, as requested by Scrawl.
2015-04-05 14:56:29 +12:00
dteviot
52de622e97
provide incremental update of SpellWindow ( Fixes #2411 )
...
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d
removed redundant calls.
2015-04-03 13:45:13 +13:00
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
dteviot
be6ee927b9
AiWander, use closest two points if distance is too small ( Fixes #1317 )
...
In AiWander, if wander distance is set too small to get two points, take the closest two points.
2015-03-28 20:05:54 +13:00
scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
dteviot
63ab856024
Removed duplicated code.
2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6
Waypoint check only considers X & Y distance ( Fixes #2423 )
...
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
2015-03-23 20:09:46 +13:00
scrawl
5cb61fa01c
Don't mark gold as stolen, adjust stolen tooltip ( Fixes #2465 )
2015-03-22 17:28:27 +01:00
Marc Zinnschlag
47bac13749
Merge remote-tracking branch 'scrawl/master'
2015-03-18 12:07:40 +01:00
Marc Zinnschlag
c032113247
Merge remote-tracking branch 'sandstranger/release-jni-memory'
2015-03-17 11:41:41 +01:00
scrawl
d573458896
Fix case sensitivity bug in default head/hair selection ( Fixes #2453 )
2015-03-16 17:42:15 +01:00
sylar
db10c87b89
release jni memory
2015-03-16 18:21:38 +04:00
Marc Zinnschlag
545ca9c9b4
Merge remote-tracking branch 'sandstranger/fix-bad-code-in-command-line'
2015-03-16 08:42:22 +01:00
sylar
bd4e832cf3
fix memory leaks in emulating command line
2015-03-16 07:41:51 +04:00
Marc Zinnschlag
e6e02714a0
Merge remote-tracking branch 'sandstranger/command-line-support-for-Android'
2015-03-15 22:52:34 +01:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
sylar
a418b70937
command line support for Android
2015-03-15 21:15:58 +04:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Rohit Nirmal
2540a901d5
Remove unused variable.
2015-03-13 20:04:47 -05:00
cc9cii
4d46d7ba72
Fix some compiler warnings.
2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
767624f518
Combat mechanic fixes
2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3
Update hit chance according to wiki and implement fCombatInvisoMult
2015-03-12 02:47:16 +01:00
scrawl
f603a68144
Allow binding Hand To Hand in quick keys menu ( Fixes #2024 )
2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2
CharacterCreation refactoring
2015-03-12 00:43:28 +01:00
scrawl
d00c75d428
Remove more outdated TODO comments.
2015-03-12 00:37:28 +01:00
scrawl
3879ce6ac1
Get rid of "player" string checks ( Fixes #2216 )
2015-03-11 23:07:39 +01:00
scrawl
68de876051
Switch to weapon drawstate when creating a bound weapon ( Fixes #2387 )
2015-03-11 21:12:08 +01:00
scrawl
48ea6286fd
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
scrawl
457c135097
Remove old workaround
2015-03-09 03:15:11 +01:00
scrawl
36e1b6cc48
Support fatigue below zero for the Drain effect ( Fixes #2430 )
2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190
Adjust fix for maximum attribute damage limit
2015-03-09 03:15:11 +01:00
Ivy Foster
4f100e6870
Fix rapid toggling when holding sneak button.
2015-03-08 16:08:45 -05:00
Ivy Foster
ba7fc8609c
Add toggle sneak option; fix bug #2119
...
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.
Outstanding issues:
- In toggle sneak mode, holding the Sneak button causes
rapid, repeated toggling.
- The button in the settings menu doesn't do anything.
2015-03-08 15:23:46 -05:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
f19863b545
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 18:11:54 +13:00
dteviot
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
2015-03-08 13:22:56 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
scrawl
58807064b4
Revert "Fix reference cell movement leaving behind deleted Ptrs for script access"
...
This reverts commit 666248618e
2015-03-07 15:31:21 +01:00
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
dteviot
27f91a8326
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-06 19:47:46 +01:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
dteviot
80fe24207c
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
9f155df761
Merge remote-tracking branch 'maqifrnswa/bug2407' into openmw-35-1
2015-03-04 17:09:13 +01:00
Marc Zinnschlag
2e31f01585
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-04 16:55:46 +01:00
scrawl
cced508916
Remove unintended 1.5 factor for damage/restore magic effects
2015-03-04 01:49:00 +01:00
scrawl
8931ddf428
Remove unneeded casts
2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d
PositionCell/PlaceItemCell: add console message if cell doesn't exist
2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2
Merge remote-tracking branch 'scrawl/master' into openmw-35-1
2015-03-03 18:23:38 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
Marc Zinnschlag
3b8d709583
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01:00
scrawl
f09cbfb167
Add a comment
2015-03-02 23:29:33 +01:00
scrawl
666248618e
Fix reference cell movement leaving behind deleted Ptrs for script access
2015-03-02 23:20:59 +01:00
scrawl
8eb1f4e70e
Remove more log spam
2015-03-02 22:13:50 +01:00
scrawl
e3f1cb8305
Remove "loading cell" message
...
This spams the log too much, in particular when loading a savegame.
2015-03-02 21:12:21 +01:00
scrawl
653ddd3f25
Warning fix
2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
2015-03-02 20:01:31 +01:00
Scott Howard
53213bf236
if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407
2015-03-02 11:53:59 -05:00
scrawl
730138035d
Cycle infinite loop fix ( Fixes #2421 )
2015-03-02 17:25:26 +01:00
scrawl
191c0104f6
Crash fix for creatures with no skeleton base ( Fixes #2419 )
2015-03-02 15:19:57 +01:00
scrawl
a653716e2c
Fix for damage/restore effects using the instant apply path when they have a duration
2015-03-01 22:22:20 +01:00
scrawl
239c0071f5
Armor tooltip should show the effective armor rating
2015-03-01 19:40:38 +01:00
Marc Zinnschlag
185757da43
Merge remote-tracking branch 'dteviot/Bug2367'
2015-03-01 10:24:02 +01:00
dteviot
cdee6f41fc
fix: multi effect spell with different ranges ( Fixes #2285 )
...
Applies all effects for a spell with multiple effects, where not all effects have the same range.
2015-03-01 15:34:18 +13:00
dteviot
41e15e0c2d
Limit maximum attribute damage ( Fixes #2367 )
...
Maximum damage that an attribute can have = base + fortify.
2015-03-01 10:27:51 +13:00
scrawl
2f2a95f735
Fix crash for terrain without data, part 2
2015-02-28 19:33:49 +01:00
scrawl
f82751422d
Fix constant effect restore enchantments being applied incorrectly ( Fixes #2408 )
2015-02-28 16:31:22 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
Digmaster
84ff11d0ab
check if v2 exists before attemping to copy it
2015-02-27 22:21:33 +01:00
Digmaster
464bbe4d6f
if v2 doesn't exist, don't erroneously set keyboardUserExists to true.
2015-02-27 22:21:07 +01:00
Digmaster
5d77ebdc60
If v3 doesn't exist, copy from v2
2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c
uses v3 input bindings, not v2
2015-02-27 22:19:13 +01:00
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0
Fix activating every frame when action is bound to a trigger
2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
scrawl
2eedb3acec
Include fix
2015-02-27 20:22:43 +01:00
sylar
cda3782cf2
fix crash game on Android after start loading
2015-02-26 18:30:38 +04:00
sylar
1bb29f610f
enable mipmapping for Android again
2015-02-26 18:29:38 +04:00
Marc Zinnschlag
281e0042ab
Merge remote-tracking branch 'scrawl/master'
2015-02-26 13:23:15 +01:00
scrawl
e7989a197d
Add defaults for some required globals ( Fixes #2397 )
2015-02-25 20:35:11 +01:00
Jordan Ayers
659a8ba279
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash on confiscating items if a prison marker cannot be found.
2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash when finding the closest marker to an exterior position.
2015-02-24 20:51:57 -06:00
scrawl
24de6ba27e
Fix crash for LAND records without data
2015-02-24 21:42:40 +01:00
