1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 04:19:55 +00:00
Commit graph

13924 commits

Author SHA1 Message Date
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
MiroslavR
a66d310a1d ESS-Importer: Fix uninitialized paid crime ID 2017-09-15 00:21:02 +02:00
MiroslavR
6e869c3123 ESS-Importer: Convert ballistic projectiles (Feature #2320) 2017-09-15 00:07:19 +02: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
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
Marc Zinnschlag
9a8a4c744f Merge remote-tracking branch 'capostrophic/controlplus' 2017-09-11 10:46:34 +02: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
Capostrophic
97ff24b8d6 Change ctl to ctrl in OpenMW-CS shortcut manager 2017-09-10 20:48:09 +03: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
Kyle Cooley
25d4a0370f Changes to land data access in tables, also update Land once per frame in scene view. 2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8 Fix potential segfault, cleanup, get rid of warnings. 2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2 Some bug fixes, changes to land load code. 2017-09-08 21:03:52 -04:00
AnyOldName3
a9b95596bc Add a missed trailing new line. 2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247 Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01: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
Kyle Cooley
2eacc2f093 Changes to land creation, add ability to specifically clear terrain cache 2017-09-08 14:37:03 -04: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
Kyle Cooley
ab607f3028 Tweaks to land loading, land cloning, terrain signals, placeholder land update handling 2017-09-08 00:51:46 -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
Kyle Cooley
99e90ef808 Cleanup. Also modify ltex index generation. 2017-09-05 19:29:07 -04:00
Kyle Cooley
97d0fd756a LTEX importing 2017-09-04 19:31:09 -04:00
Kyle Cooley
5c3e90da88 Fix includes 2017-09-04 15:14:42 -04:00
Kyle Cooley
d3014cf394 Temporary fix for adding new lands, cloned lands will still reference old data though 2017-09-04 15:13:45 -04:00
Kyle Cooley
90c485104a Land creator 2017-09-04 01:06:58 -04:00
Kyle Cooley
7cc95a11a4 Add more land table columns 2017-09-03 20:00:19 -04:00
Kyle Cooley
30ba1d4c25 Move touch command to creator, to allow customization and not break abstraction 2017-09-03 17:01:16 -04:00
Thunderforge
e0ffc94f3e Fix OpenMW-CS internal name 2017-09-02 18:07:12 -05: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
Kyle Cooley
1d480015b4 Add ability to touch records, LAND records in particular 2017-08-31 22:09:49 -04:00
Kyle Cooley
9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture 2017-08-31 22:09:49 -04:00
Kyle Cooley
5d14a2afcc Initial LTEX/LAND tables 2017-08-31 22:09:49 -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
Marc Zinnschlag
91f674bb6f Merge remote-tracking branch 'aesylwinn/master' 2017-08-25 10:24:17 +02:00
Kyle Cooley
a8576d78ad Change default topic info values 2017-08-24 13:51:53 -04:00
Kyle Cooley
42b948dffe Fix pathgrid segfault 2017-08-23 11:35:26 -04:00
Marc Zinnschlag
f4110a72cc Merge remote-tracking branch 'aesylwinn/fixvideotable' 2017-08-23 11:24:51 +02:00
Kyle Cooley
157ecb166c Fix wrong folder name 2017-08-23 00:02:02 -04:00
scrawl
30665b743d Merge pull request #1416 from akortunov/guifixes
Display large  journal entries correctly
2017-08-22 20:37:46 +00:00
scrawl
aa95cb3d91 Merge pull request #1406 from Aesylwinn/reloadassets
Editor: Asset Reloading
2017-08-22 20:17:30 +00:00
Andrei Kortunov
0177fe6602 Display large entries in journal correctly 2017-08-22 23:26:06 +04:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -04:00
Andrei Kortunov
e799cbdb51 Combat AI: allow only one summoned creature at time 2017-08-22 09:18:49 +04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document.
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
3b9326d238 Clear terrain cache and reload terrain 2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d Reload water 2017-08-20 20:55:56 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
scrawl
f0dea8b8e6 Revert "Implement a Fisher-Yates shuffle on background music" 2017-08-20 20:20:27 +00:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04: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
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04: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
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -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
scrawl
24eaced7d2 Merge pull request #1395 from akortunov/tradeconfiscatefix
Confiscate an item when you try to sell it to its owner
2017-08-14 22:18:42 +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
Kyle Cooley
249c1ae95a Fix orbit camera jumping back to old position 2017-08-13 19:26:32 -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
Thunderforge
f41a4bb937 Changing "New Installation" to "Retail CD/DVD" for clarity 2017-08-09 00:20:49 -05: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
551045e4cc Merge pull request #1370 from Siimacore/data_files_loc_fix
Correcting https://bugs.openmw.org/issues/3906.
2017-08-07 18:52:54 +00: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
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02: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
Marc Zinnschlag
6001e04e51 Merge remote-tracking branch 'rcutmore/bug-3148' 2017-07-27 16:29:44 +02:00
Andrei Kortunov
6ab36c0539 Spellbuying menu improvements 2017-07-27 13:20:18 +04:00
Rob Cutmore
3f2cd9b669 Editor: Do color to int conversion in ColorEditor 2017-07-26 19:56:54 -04:00
Rob Cutmore
c7241c692f Editor: Do int to color conversion in ColorEditor 2017-07-26 19:43:37 -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
Rob Cutmore
3fb7c42845 Editor: Use colour field for cell map colour 2017-07-25 19:11:47 -04:00
Rob Cutmore
0082f5a2dc Editor: fix handling of colour columns
Colours are stored as ints in the backend but the conversion from
QColor to int was broken.
2017-07-25 19:11:47 -04: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
Marc Zinnschlag
cfc5cdd309 Merge remote-tracking branch 'plutonicoverkill/highlight-occurence-fix' 2017-07-24 09:18:24 +02:00
PlutonicOverkill
16be1e1a84 Fix occurrence highlighting preferences panel 2017-07-23 20:29:42 +12: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
scrawl
73fbaae97f Merge pull request #1325 from jordan-ayers/bugfix/3684-restock-soul-gems
Adjust restock calculations to ignore filled soul gems. (Bug #3684)
2017-06-20 00:39:39 +02:00
scrawl
41fb17f39b Revert "Correcting https://bugs.openmw.org/issues/3906"
This reverts commit b0abed00e5.
2017-06-20 00:36:06 +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
cd1821c464 Merge pull request #1322 from Siimacore/wizardthreadfix
Stopping the thread in the wizard that prevented it to stop correctly
2017-06-13 19:48:06 +02: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
Siimacore
6af470ff03 Stopping the thread in the wizard that prevented it to stop correctly 2017-06-13 12:00:55 +02:00
Andrei Kortunov
87939bf3b1 Use mRange to check spell range instead of mArea. 2017-06-13 11:02:40 +04:00
scrawl
f7969fb178 Merge pull request #1317 from Siimacore/master
Correcting https://bugs.openmw.org/issues/3906
2017-06-12 23:47:07 +02: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
Siimacore
b0abed00e5 Correcting https://bugs.openmw.org/issues/3906 2017-06-10 21:36:35 +02: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
Marc Zinnschlag
6906e35ac0 Merge remote-tracking branch 'origin/master' 2017-05-12 14:48:03 +02:00
PlutonicOverkill
5ec97811d8 Don't switch pages when right-clicking on list 2017-05-12 20:22:18 +12:00
PlutonicOverkill
7281e8b888 Remove C++11 features 2017-05-12 12:48:25 +12:00
PlutonicOverkill
cd75c5618c Move context menu code to PageBase 2017-05-11 19:46:51 +12:00
PlutonicOverkill
16f8341de3 Prevent context menu appearing for modifier settings 2017-05-10 21:24:12 +12:00
PlutonicOverkill
c2f427f48d Prevent context menu appearing when right-clicking shortcut setting 2017-05-10 20:43:52 +12:00
PlutonicOverkill
646ff72cdc Add a more elegant way of showing the context menu 2017-05-10 20:27:50 +12:00
PlutonicOverkill
bd9f657603 Show context menu when user clicks on empty space 2017-05-10 19:51:43 +12:00
PlutonicOverkill
30af92f575 Fix pointer initialisation bug 2017-05-09 20:58:32 +12:00
PlutonicOverkill
4879405097 Add reset context menu for key binding pages 2017-05-09 19:58:34 +12:00
PlutonicOverkill
3545cfa00a Rewrite feature to reset options to default 2017-05-09 19:50:16 +12:00
Allofich
315ad54b29 Don't make NPCs or player speak while underwater
(Fixes #3851)
2017-05-08 19:55:54 +09:00
Andrei Kortunov
de14e9811d Fixed Travis CI build 2017-05-08 11:16:03 +04:00
PlutonicOverkill
f30d1a3075 Revert everything 2017-05-08 17:24:28 +12:00
scrawl
48c764a580 Update test 2017-05-07 23:31:06 +02:00
scrawl
813af876f6 Use a partial binary search in isReservedName (Fixes #3835) 2017-05-07 23:28:56 +02: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
scrawl
796d2c59ca Merge pull request #1282 from MiroslavR/noenv_player_vo
Do not apply underwater effects to player's voice
2017-05-07 21:07:19 +02:00
PlutonicOverkill
a9760ec805 Fix indenting 2017-05-07 17:07:58 +12:00
PlutonicOverkill
d8a711f89f Fix tabs 2017-05-07 17:05:50 +12:00
PlutonicOverkill
477af73ad6 Missed another one 2017-05-07 17:00:26 +12:00
PlutonicOverkill
418aeb65f1 Remove unneeded dependencies 2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8 Forgot to remove debugging code 2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710 Keep the settings page in sync with the real settings 2017-05-07 16:51:11 +12:00
PlutonicOverkill
64879c03e4 Add option to reset settings to default 2017-05-06 20:18:31 +12:00
Marc Zinnschlag
a2e863e7dd Merge remote-tracking branch 'origin/master' 2017-05-03 14:31:21 +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
PlutonicOverkill
829560719e Make name highlighting more consistent and only for variable names 2017-05-02 17:28:42 +12: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
PlutonicOverkill
95f60d2bb3 Merge branch 'master' into mark-variable 2017-04-28 20:15:48 +12:00
PlutonicOverkill
cbb2b8b119 Add setting so feature can be turned off 2017-04-28 19:57:49 +12:00
PlutonicOverkill
a8e7628e83 Enable highlighting when cursor is placed over a name (script editor) 2017-04-28 19:28:05 +12:00
Marc Zinnschlag
7919c4d672 Merge remote-tracking branch 'plutonicoverkill/master' 2017-04-28 08:40:07 +02:00
PlutonicOverkill
e685de0f84 Fix script editor undo/redo context menu actions 2017-04-27 19:48:01 +12:00
PlutonicOverkill
6063d8e31b Fix existing context menu in script editor 2017-04-27 16:31:45 +12: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
Marc Zinnschlag
61e6b0d03c improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault) 2017-04-26 15:03:30 +02:00
PlutonicOverkill
3d1e640388 Add setting to change keyboard shortcut and fix another crash 2017-04-26 19:42:03 +12:00
PlutonicOverkill
1f699552f7 Fix infinite recursion bug in uncommentSelection() 2017-04-26 15:49:39 +12:00
PlutonicOverkill
61e374fdfc Implement commentSelection() and uncommentSelection() 2017-04-25 19:12:18 +12:00
PlutonicOverkill
83ff7d162c Add comment/uncomment actions to the context menu 2017-04-25 16:12:59 +12: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