Chris Robinson
01dbac7b15
Don't use a different setting for distant viewing distance
2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae
Make settings for distant fog parameters
2018-03-04 11:37:57 -08:00
Chris Robinson
4caa7c9674
Workaround older MSVC quirk
2018-03-04 11:37:57 -08:00
Chris Robinson
154cc8c659
Use alternate fog parameters when distant land is enabled
...
This allows the distant land to actually be seen when the user enables it. The
values used are replicated from MGE XE's default settings and should probably
be exposed somewhere.
2018-03-04 11:37:57 -08:00
Chris Robinson
6d557fec8e
Increase the far clip plane when distant terrain is enabled
2018-03-04 11:37:57 -08:00
Capostrophic
d371bebb33
Prevent items in a container owned by a dead actor from being counted as stolen (Bug #4328 )
2018-03-03 15:57:13 +03:00
Capostrophic
cc0c6ddaa6
Account for empty victimRef (Bug #4328 )
2018-03-03 15:57:03 +03:00
scrawl
839196e4fa
Force normal polygon mode for the map camera ( Fixes #4235 )
2018-03-03 00:15:57 +00:00
Florian Weber
10fe334247
add more precise float-spinbox and use it for rotations
2018-03-02 15:05:00 +01:00
David Cernat
c18d07827d
[Client] Hide difficulty widget because it has no use in multiplayer
2018-03-01 09:31:21 +02:00
David Cernat
37b349c2f6
Merge pull request #390 from OpenMW/master
...
Add OpenMW commits up to 28 Feb 2018
2018-03-01 05:33:37 +02:00
Thunderforge
b6d9b6f544
Formatting improvement for advanced page
2018-02-27 20:17:43 -06:00
Thunderforge
4292351993
Adding Max Quicksaves setting to Launcher
2018-02-27 20:17:21 -06:00
scrawl
9e9c278527
Merge pull request #1597
2018-02-27 23:48:45 +00:00
Capostrophic
929fc68160
Consider items with dead owner not stolen (fixes bug #4328 )
2018-02-26 23:21:51 +03:00
David Cernat
9e10eb9c84
Merge pull request #389 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2018
2018-02-25 22:05:32 +02:00
David Cernat
03266d7648
[Client] Prevent guards from arresting players who are currently jailed
2018-02-25 21:33:04 +02:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
scrawl
31d7e6af32
Merge pull request #1608
2018-02-24 16:53:32 +00:00
scrawl
56613d817e
Merge pull request #1612
2018-02-24 16:52:30 +00:00
Capostrophic
089666dd68
Round up displayed encumbrance
2018-02-24 15:13:14 +03:00
Thunderforge
a67373d116
Fixing "Show Enchant Chance" checkbox setting melee info instead
2018-02-19 18:28:04 -06:00
Capostrophic
99360e132f
Only display "new journal entry" message in dialogue if there *is* a new entry
2018-02-18 16:01:50 +03:00
David Cernat
60f686ee43
[General] Implement setting of physics framerate as part of GameSettings
2018-02-14 05:53:44 +02:00
Daniel Vukelich
3bdd989a50
Remove numeric quicksave slot IDs
...
When multiple quicksaves occurred in quick succession, the numeric order
of the saves could not be guaranteed. To prevent players from getting
confused as to why their saves appear out of order, don't number them.
2018-02-13 21:01:15 -05:00
David Cernat
886b3431bc
[Client] When resurrecting players, set pcknownwerewolf to 0
...
This makes it so players are no longer known werewolves and are no longer attacked infinitely by guards.
2018-02-13 21:55:10 +02:00
David Cernat
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
2018-02-13 05:22:41 +02:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
scrawl
a708ac488e
Don't call Store::setUp() unnecessarily
...
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
2018-02-13 00:38:55 +00:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master
...
Add OpenMW commits up to 11 Feb 2018
2018-02-11 06:57:54 +02:00
scrawl
5bb7d76913
Merge pull request #1605
2018-02-10 23:15:26 +00:00
scrawl
899d464b0d
Cap the rain emitter's frame time ( Fixes #4314 )
2018-02-10 23:14:41 +00:00
scrawl
f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons ( Fixes #4225 , Fixes #4320 )
2018-02-10 23:11:03 +00:00
Andrei Kortunov
f626a7fcc7
Take in account PC rank during disposition calculation (bug #4322 )
2018-02-10 17:58:30 +04:00
David Cernat
74765b3ace
[General] Implement selected spell sync as part of PlayerMiscellaneous
2018-02-06 06:36:46 +02:00
Marc Zinnschlag
2a5a574134
Merge remote-tracking branch 'thunderforge/feature/4054-launcher-advanced-settings-panel'
2018-02-05 13:30:47 +01:00
David Cernat
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
2018-02-01 02:11:45 +02:00
David Cernat
aa448523f8
[Client] Clean up WorldEvent::runConsoleCommands() slightly
2018-01-31 23:23:52 +02:00
David Cernat
ce5670e57e
[Client] Ignore invalid object refIds from ObjectPlace packets
2018-01-31 18:51:53 +02:00
David Cernat
4496625154
Merge pull request #381 from OpenMW/master
...
Add OpenMW commits up to 31 Jan 2018
2018-01-31 05:03:28 +02:00
David Cernat
66078bfea7
[General] Implement Mark location sync as part of PlayerMiscellaneous
2018-01-31 04:50:29 +02:00
scrawl
b1b8e31562
Use unique_ptr over new/delete ( Fixes #4305 )
2018-01-30 22:05:16 +00:00
David Cernat
989f6e6b51
[General] Implement PlayerReputation packet
2018-01-30 22:55:29 +02:00
David Cernat
88ae0772cf
[Server] Initialize new processors and fix issues with RecordDynamic
2018-01-30 22:51:35 +02:00
David Cernat
3d80e2db62
[General] Add placeholders for new packet types, part 2
2018-01-30 16:01:33 +02:00
Thunderforge
8b17844781
Replacing Qt5-only method with Qt4-compatible code
2018-01-29 21:14:31 -06:00
David Cernat
02af7f6ba1
[General] Add placeholders for new packet types
2018-01-29 22:32:51 +02:00
Thunderforge
8837046d9c
Adding panel for advanced settings.cfg options
2018-01-28 22:49:49 -06:00
David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
2018-01-29 02:36:48 +02:00
scrawl
89c6b59c30
Merge pull request #1602
2018-01-28 22:35:47 +00:00
David Cernat
ce11a1dfa9
[Client] Fix potential invalid pointer when storing cell unloads
...
Notably, builds of the client done with Clang were crashing on startup before this.
2018-01-29 00:14:26 +02:00
David Cernat
420dab10e1
[General] Track objects directly placed by players in ObjectPlace
...
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).
Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
2018-01-28 17:46:51 +02:00
David Cernat
595bc5a152
[Client] Only send ObjectScale packets when scale actually changes
2018-01-28 05:58:56 +02:00
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
2018-01-27 22:52:59 +02:00
David Cernat
d7e29f1f61
[Client] Unequip items with constant effect damage when resurrected
2018-01-27 20:19:39 +02:00
David Cernat
d19d8b0a34
[Client] Add and use enchantmentType argument for unequipItemsByEffect()
2018-01-27 19:37:16 +02:00
David Cernat
6c4bb8c423
[Client] Move resurrection code for local player to LocalPlayer
2018-01-27 19:09:55 +02:00
David Cernat
6b75a82777
[Client] Ignore equipment items for DedicatedActors with count below 0
2018-01-27 18:08:45 +02:00
David Cernat
e3bc11d9eb
[Client] Fix ListBox overlap crashes by removing ListBoxes properly
2018-01-27 15:41:11 +02:00
David Cernat
c6a85ee8f9
[Client] Add doesEffectListContainEffect() method to MechanicsHelper
2018-01-26 03:18:01 +02:00
David Cernat
aa392ebf20
[Client] Unequip items if necessary when attr/skill modifier is set to 0
2018-01-26 00:45:39 +02:00
David Cernat
ace825b99c
[Client] Ignore invalid player class IDs from packets
...
Additionally, clean up variables names in related code.
2018-01-24 02:47:56 +02:00
David Cernat
c6874509b6
[Client] Ignore invalid faction IDs from packets
2018-01-24 02:25:44 +02:00
Ilya Zhuravlev
8d44d3124e
Android: Add callbacks for basic cursor handling.
2018-01-18 21:18:31 -05:00
Ilya Zhuravlev
455f718394
Android: register a virtual controller definition
2018-01-17 23:14:23 -05:00
Daniel Vukelich
3af8f63895
Use unsigned integer types for QuickSave indices
2018-01-17 21:43:30 -05:00
David Cernat
5894ffae7d
[Client] Ignore dynamic object placements or spawns in packets
2018-01-17 11:01:31 +02:00
David Cernat
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
2018-01-17 08:10:49 +02:00
David Cernat
f746958afa
[Client] Send enchantmentCharge for items added or removed in containers
2018-01-17 08:10:49 +02:00
David Cernat
bce3d0eb4c
[Client] Use more descriptive message for version mismatch
2018-01-17 08:10:49 +02:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
Daniel Vukelich
f09fd6795c
Follow openmw style guide
2018-01-14 11:57:11 -05:00
scrawl
2caaa48b91
Workaround to make sure message box remains on top ( Fixes #4298 )
2018-01-14 00:27:53 +00:00
scrawl
e2e48e0a50
Add default value for 'sAnd' GMST ( Fixes #4269 )
2018-01-14 00:27:05 +00:00
scrawl
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269 )
2018-01-14 00:26:37 +00:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557 )
2018-01-14 00:24:30 +00:00
Daniel Vukelich
97924d97c7
Add the option for multiple quicksave slots
...
With more than 1 quicksave slot, slots will be created each time you
quicksave until the maximum number (configured in settings) of
quicksaves has been reached. After that, the oldest quicksave slot will
be replaced each time you quicksave. Saves are numbered sequentially,
unless the maximum number of slots is 1, in which case it is not numbered.
2018-01-12 20:09:39 -05:00
Andrei Kortunov
eccb49da18
Do not summon the bound bow if there is no suitable ammo
2018-01-11 21:08:30 +04:00
Andrei Kortunov
b995617559
implement rateAmmo() function
2018-01-11 21:08:11 +04:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
scrawl
1522bda60b
Fix crash in getDistance when invoked before the game starts
2018-01-11 01:48:05 +00:00
scrawl
83726ee06a
Fix Reset Controls button not functioning properly
2018-01-11 01:47:42 +00:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
2018-01-10 03:49:53 +02:00
scrawl
c7f60a6dc8
Merge pull request #1595
2018-01-09 13:48:07 +00:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595 "
...
This reverts commit 7ef7b1a7b1
, reversing
changes made to 9e7e4de0ab
.
2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595
2018-01-09 00:42:27 +00:00
scrawl
9e7e4de0ab
Merge pull request #1594
2018-01-09 00:42:20 +00:00
Andrei Kortunov
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
2018-01-08 13:12:12 +04:00
David Cernat
8316ec0fa7
[Client] Update tes3mp change comment for object rescaling
2018-01-08 02:19:05 +02:00
David Cernat
09548d05f7
[Client] Ignore cell changes that move actors to where they already are
2018-01-08 01:37:01 +02:00
David Cernat
4a9a628a0f
[Client] When getting an actor, make sure their cell is initialized
2018-01-07 02:35:30 +02:00
David Cernat
4caf7ca30a
[Client] Add temporary fix for crashes caused by custom GUI elements
2018-01-06 20:16:32 +02:00
David Cernat
0cc86c04d1
[Client] Print plugin discrepancies, not just plugin lists side by side
2018-01-06 05:39:25 +02:00
David Cernat
a639d3494a
[Client] Fix use of DedicatedPlayers as targets for ConsoleCommand
2018-01-05 01:24:15 +02:00
David Cernat
502df7d9c1
[Client] Clean up GUIChat slightly
2018-01-05 00:03:05 +02:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
2018-01-04 12:12:18 +02:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
David Cernat
1cf2f35a28
[Server] Add script functions to set & get plugin enforcement state
2018-01-02 16:33:18 +02:00
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
2018-01-02 14:52:42 +04:00
Bret Curtis
c3c3fbc68e
overriden -> overridden
2018-01-02 11:42:08 +01:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
2018-01-02 07:50:37 +02:00
David Cernat
bca9c55046
[Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 2f4cd6b713
and adds back the changes made by 45993d3da2
because the OpenMW issue at https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
2018-01-02 07:47:27 +02:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
.
2018-01-01 13:28:14 +01:00
scrawl
57257d057f
Remove unintended jump cooldown ( Fixes #4250 )
2017-12-31 23:48:51 +00:00
David Cernat
47a3dc9ff2
[Server] Add broadcast argument to functions for sending WorldPackets
2017-12-30 21:52:30 +02:00
David Cernat
1e2517698d
[Server] Send player speech and animation packets only to nearby players
2017-12-29 06:17:45 +02:00
David Cernat
2f4cd6b713
[Client] Revert "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 45993d3da2
, reversing
changes made to 3d347730dc
.
That commit made players have to wait around 1.5 seconds after each jump before doing a new one.
It will be reinstated once its accompanying OpenMW issue at https://bugs.openmw.org/issues/4250 is fixed.
2017-12-26 19:27:13 +02:00
David Cernat
db0e0d376e
[Client] Use new code to set the console's Ptrs from server scripts
...
Previously, reusing the console's object selection code made it so using the same Ptr twice in a row was akin to clicking on the same object twice in the console window, i.e. the object was deselected the second time around. Additionally, that same code was setting key focus to the hidden console window, preventing players from moving until they activated another window (such as their inventory or chat window).
2017-12-26 15:04:28 +02:00
David Cernat
5fd9079b26
[Client] Stop drag and drop when setting player inventory
2017-12-25 05:41:13 +02:00
David Cernat
40e70ebf9c
[Client] Fix key focus for chat window
2017-12-25 05:08:36 +02:00
David Cernat
bed96e5a3d
[Client] Remove check of GM_RestBed GUI mode that no longer exists
2017-12-25 03:26:28 +02:00
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
2017-12-25 02:25:01 +02:00
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
2017-12-25 02:03:02 +02:00
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
2017-12-23 13:16:38 +02:00
scrawl
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
2017-12-21 14:49:09 +00:00
Marc Zinnschlag
7245b251e8
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-19 17:01:13 +01:00
Marc Zinnschlag
93716cecd9
Merge remote-tracking branch 'origin/master'
2017-12-19 17:01:03 +01:00
scrawl
993982628d
Merge pull request #1590
2017-12-18 20:41:12 +00:00
Andrei Kortunov
1a58171e86
Do not allow to sell items from containers with zero capacity (bug #4268 )
2017-12-17 18:09:25 +04:00
David Cernat
fef6bddc68
[Client] Fix typo related to drag and dropping
2017-12-16 23:19:54 +02:00
David Cernat
535fba0cb3
[Client] Finish drag and drops when arrested or teleported by server
2017-12-16 07:21:02 +02:00
Miloslav Číž
01f9d90315
CS: Reorder 3D input menu
2017-12-15 17:22:32 +01:00
Miloslav Číž
13dc1bd41e
CS: Add tooltip to camera-ortho-size preference
2017-12-15 14:56:03 +01:00
Miloslav Číž
1f5feeddb9
CS: Change camera parameter types to int
2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242
CS: Mover object-marker-alpha under Rendering
2017-12-15 14:36:12 +01:00
Marc Zinnschlag
ecf1cea1b7
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-15 13:41:54 +01:00
Miloslav Číž
79527b746a
Remove unused variable
2017-12-14 17:29:24 +01:00
Miloslav Číž
b246580c63
Fix orbit camera axis
2017-12-13 20:08:38 +01:00
Andrei Kortunov
ba46473038
Do not skip weather transitions from SetPos script command (bug #3603 )
2017-12-13 10:53:23 +04:00
David Cernat
ebf88d12a3
[Client] Send PlayerInventory packet after buying skill training
2017-12-13 05:46:48 +02:00
scrawl
e9ecaf712b
Merge pull request #1584
2017-12-12 20:11:05 +00:00
scrawl
7d62f05f81
Merge pull request #1583
2017-12-12 20:10:59 +00:00
David Cernat
0ad9c99cf4
[Client] Send PlayerInventory packet after completing a vendor trade
2017-12-12 15:18:56 +02:00
Andrei Kortunov
0e04a26ef6
Set duration of magic effects from ingredients (bug #4261 )
2017-12-10 16:10:44 +04:00
Andrei Kortunov
c908ad2fba
Do not allow to place actors underground via SetPos (bug #3783 )
2017-12-10 14:38:02 +04:00
Chris Robinson
08e947319a
Restore exception throwing to the decoder
2017-12-09 11:00:56 -08:00
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
2017-12-09 14:03:56 +01:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
Miloslav Číž
e309dfd234
CS: Rename variables (AppVeyor fix)
2017-12-08 22:06:03 +01:00
scrawl
9cee439e37
Merge pull request #1577
2017-12-08 20:00:58 +00:00
scrawl
1d823d8ae1
Merge pull request #1579
2017-12-08 20:00:26 +00:00
scrawl
b12cd1f5b2
Merge pull request #1581
2017-12-08 20:00:15 +00:00
Miloslav Číž
199e41833f
Merge branch 'master' into cs-cam
2017-12-08 20:56:05 +01:00
Miloslav Číž
d85f8deaa3
CS: Add fixed roll setting, plus ortho fix
2017-12-08 20:51:40 +01:00
Miloslav Číž
1b77e3ed62
CS: Add ortho camera setting
2017-12-08 18:18:27 +01:00
Miloslav Číž
bfad5ebde4
CS: Fix camera orbit control with keys
2017-12-08 17:42:20 +01:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Miloslav Číž
5e076ee015
CS: Fix camera orbit with arbitrary roll
2017-12-08 00:19:05 +01:00
Miloslav Číž
cfdc6c788e
CS: Make camera FOV change dynamically
2017-12-08 00:05:50 +01:00
Miloslav Číž
7d36dd68dc
CS: Make orbit camera not change roll
2017-12-07 23:52:05 +01:00
Miloslav Číž
360d786ff2
CS: Add rendering prefs and camera FOV
2017-12-07 23:48:34 +01:00
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +04:00
Miloslav Číž
a142a67972
Add default settings for 360 screenshots
2017-12-06 21:16:30 +01:00
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
2017-12-06 20:39:09 +01:00
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
2017-12-06 01:03:24 +09:00
Allofich
e0c54b3f39
Stop guards trying to arrest player when calm
...
(Fixes #3863 )
2017-12-05 23:53:02 +09:00
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
2017-12-05 10:24:58 +04:00
Andrei Kortunov
29b2308b2c
Do not display cyrillic soft/hard signs in the journal index
2017-12-04 22:42:17 +04:00
Andrei Kortunov
b6ae7f3cc8
Do not add greetings to the journal index (bug #4342 )
2017-12-04 22:42:10 +04:00
David Cernat
e97c9f72a2
[General] Rework getting/clearing of skill modifiers as with attributes
2017-12-04 15:06:27 +02:00
David Cernat
07f0cc2b0e
Merge pull request #353 from OpenMW/master
...
Add OpenMW commits up to 4 Dec 2017
2017-12-04 04:38:38 +02:00
scrawl
ff1226c96b
Merge pull request #1575
2017-12-03 22:22:29 +00:00
Andrei Kortunov
8decd35607
Fixes crash on quickload from the container menu (bug #4239 )
2017-12-03 21:49:13 +04:00
David Cernat
047ad40b96
[Client] Clear FortifyAttribute effects when server sets modifier to 0
2017-12-02 09:22:36 +02:00
David Cernat
2944be18ae
[Server] Actually, turn SetAttributeModifier into ClearAttributeModifier
...
There's no way SetAttributeModifier() was going to make sense if, say, a player had drunk 3 different potions fortifying the same attribute and was wearing equipment fortifying it as well. How would one change the sum modifier of those while accounting for each specific effect's duration and magnitude?
The only workable solution is to allow the server to clear the modifier.
2017-12-02 09:19:33 +02:00
Miloslav Číž
37aa761283
Change spherical screenshot filtering to nearest
2017-12-01 21:47:26 +01:00
David Cernat
ef6dc61797
[Client] Send PlayerAttribute packets when attribute modifiers change
2017-11-30 23:03:34 +02:00
David Cernat
e8d636ebc3
[Server] Rework Get/SetAttributeCurrent into Get/SetAttributeModifier
...
As seen here, attributes don't use the concept of current values, but rather of value modifiers and value damage:
https://github.com/OpenMW/openmw/blob/master/apps/openmw/mwmechanics/stat.cpp#L217
2017-11-30 22:37:06 +02:00
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
2017-11-30 12:18:15 +02:00
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
scrawl
47a5229eed
Merge pull request #1564
2017-11-29 22:10:36 +00:00
scrawl
59bfd670c0
Merge pull request #1571
2017-11-29 22:04:41 +00:00
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
2017-11-29 03:52:15 +02:00
Grigorii Latyshev
2abb1a2ec2
Added checkMagicka parameter
2017-11-28 23:35:54 +01:00
Grigorii Latyshev
9fe5a4d236
Revert condition changes
2017-11-28 23:35:46 +01:00
Grigorii Latyshev
dab72b45db
Move mana reducing code back
2017-11-28 23:34:05 +01:00
Andrei Kortunov
b9d9660efd
Update music state in the menu mode (bug #3664 )
2017-11-28 20:49:48 +04:00
Andrei Kortunov
f7f8dfaf2a
AiWander: do not allow flying/swimming creatures to use pathgrid
2017-11-28 18:03:13 +04:00
scrawl
9920779a7b
Merge pull request #1543
2017-11-27 21:21:54 +00:00
scrawl
c50b18b3bb
Move PathgridGraph out of CellStore
...
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.
This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
2017-11-27 21:20:31 +00:00
scrawl
5fe68ab062
Merge pull request #1419
2017-11-27 21:13:11 +00:00
scrawl
fee2e946d1
Merge pull request #1565
2017-11-27 21:13:09 +00:00
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
2017-11-27 07:39:02 +02:00
Kyle Cooley
eb23367175
Fix rendering depth/order issues
2017-11-26 17:39:57 -05:00
Grigorii Latyshev
ce32462358
Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*)
2017-11-26 13:58:04 +01:00
Andrei Kortunov
dea7d0beff
Do not interrupt swim and sneak idle animations during attack (bug #4122 )
2017-11-26 09:54:12 +04:00
Kyle Cooley
c8f79ea838
Adjust rotation markers
2017-11-25 20:46:14 -05:00
scrawl
88ec6179ff
Merge pull request #1566 from akortunov/guifixes
...
Set default values for class and birthsign select menus
2017-11-25 22:58:40 +00:00
David Cernat
300ca905fc
[Client] Don't pause game when minimizing window, despite MyGUI issues
2017-11-25 13:32:43 +02:00
Andrei Kortunov
55db3c2712
Set default values for class and birthsign select menus (bug #4226 )
2017-11-25 11:35:29 +04:00
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
2017-11-25 08:54:22 +02:00
Grigorii Latyshev
32096ae0cc
Fix displayed spell success chance in God Mode
2017-11-25 01:47:18 +01:00
scrawl
665ca5b2d5
Merge pull request #1558 from akortunov/rusjournal
...
Cyrillic journal index (bug #2485 )
2017-11-24 23:17:28 +00:00
scrawl
8226c8dc92
Merge pull request #1560 from akortunov/guifixes
...
Fix the Topics button position if the Tribunal is not installed
2017-11-24 23:16:33 +00:00
scrawl
f5c075b188
Merge pull request #1563 from drummyfish/throwfix
...
Make thrown projectiles rotate (#4216 )
2017-11-24 23:15:54 +00:00
Grigorii Latyshev
a7c953b318
Display 0 chance for spell if player does not have enought magic energy
2017-11-24 15:06:07 +01:00
David Cernat
2373be9735
Merge pull request #345 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-24 05:46:53 +02:00
Miloslav Číž
4373fea21e
Correct projectile rotation
2017-11-23 20:27:22 +01:00
Miloslav Číž
d0a299caab
Rotate thrown projectiles around the bb center
2017-11-23 20:02:38 +01:00
Miloslav Číž
38bda3bd71
Do not save thrown state for projectiles
2017-11-23 18:00:10 +01:00
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
Andrei Kortunov
a8bf4cdd98
Remove redundant include
2017-11-23 19:29:40 +04:00
Miloslav Číž
3dbcda6686
Make use of mEffectAnimationTime for projectile rotation
2017-11-23 15:14:15 +01:00
Miloslav Číž
2b9a0a7732
Save new projectile state
2017-11-23 12:11:26 +01:00
Andrei Kortunov
4f190bf7f4
Do not show carriage return characters (bug #3696 )
2017-11-23 14:58:20 +04:00
Andrei Kortunov
4d384889af
Fix the Topics button position if the Tribunal is not installed
2017-11-23 10:14:45 +04:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-23 04:51:13 +02:00
Miloslav Číž
de42aa9d03
Make thrown projectiles rotate
2017-11-23 00:32:22 +01:00
David Cernat
6668b9ab42
[General] Implement ConsoleCommand packet
2017-11-23 00:21:47 +02:00
Andrei Kortunov
86a17b1e3e
Get rid of the redundant Utf8Stream when during journal index creation
2017-11-22 09:06:54 +04:00
Andrei Kortunov
3571f7f413
Remove getEncoding() from WindowManager
2017-11-22 08:32:38 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
Andrei Kortunov
a83a43e376
Determine when need to use the Cyrillic journal index
2017-11-21 09:32:35 +04:00
scrawl
719255c5c6
Merge pull request #1557 from akortunov/journalfix
...
[Feedback needed] Handle 128px Tx_menubook_topics textures
2017-11-20 23:07:18 +00:00
Andrei Kortunov
ce5bdd6361
Split the JournalBooks::createTopicIndexBook()
2017-11-20 22:25:53 +04:00
Andrei Kortunov
a391990f2a
Provide multibyte toLower() and single chars comparator
2017-11-20 21:30:46 +04:00
Andrei Kortunov
4dcaf040e6
A Russian journal index
2017-11-20 19:37:24 +04:00
Andrei Kortunov
60d0c83cca
Handle 128px Tx_menubook_topics textures
2017-11-20 17:39:28 +04:00
Miloslav Číž
ea2bbce68a
Fix memory leak in WindowManager
2017-11-18 19:27:09 +01:00
David Cernat
28e1947f23
Merge pull request #339 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/engine.cpp
2017-11-17 01:26:31 +02:00
Miloslav Číž
df61a30259
preincrement
2017-11-16 23:20:24 +01:00
Miloslav Číž
ddbf6c162f
use linear filtering for the cubemap
2017-11-16 22:43:41 +01:00
Miloslav Číž
fc507c66f7
remove no longer needed stuff
2017-11-16 22:17:00 +01:00
Miloslav Číž
3ae5310567
use loading screen to freeze the screen
2017-11-16 22:08:33 +01:00
Miloslav Číž
2b5f147545
allow non-power-of-2 sized cubemaps
2017-11-16 20:06:34 +01:00
scrawl
36f4f0ef85
Don't increase simulationTime while the game is minimized ( Fixes #4211 )
2017-11-16 18:48:49 +00:00
Miloslav Číž
902862aa8b
display confirming message for all screenshots
2017-11-16 13:50:10 +01:00
Miloslav Číž
bccff768ff
select closest power of 2 resolution for the cubemap
2017-11-16 13:41:09 +01:00
Miloslav Číž
56c74fb96f
add scene switch node
2017-11-16 12:46:46 +01:00
Miloslav Číž
1a4f351e3d
move camera freeze code
2017-11-16 12:17:52 +01:00
David Cernat
5aff515d3f
Merge pull request #337 from OpenMW/master
...
Add OpenMW commits up to 15 Nov 2017
2017-11-16 08:49:56 +02:00
scrawl
cf40d19d7d
Merge pull request #1551 from thegriglat/abs
...
Change abs to std::abs
2017-11-15 17:34:59 +00:00
scrawl
35d68f038d
Update dialogue topics list after result script is run
...
Regression from 0.42.
2017-11-15 17:20:40 +00:00
scrawl
60fba7acd8
Fix reorder warning
2017-11-15 17:20:08 +00:00
scrawl
c36d250044
Parse dialogue text for keywords after the resultscript runs ( Fixes #4210 )
2017-11-15 17:20:06 +00:00
scrawl
7c5d2a1ac4
Update dialogue topics list after result script is run
...
Regression from 0.42.
2017-11-15 17:20:06 +00:00
Miloslav Číž
af38d3a47d
get rid of sphericalscreenshot class
2017-11-15 17:01:16 +01:00
Miloslav Číž
226fb9c26b
render cubemaps in OGL coordinates
2017-11-15 16:07:01 +01:00
Miloslav Číž
1c3d45f641
dirty 360 screenshot GPU setup
2017-11-15 15:20:59 +01:00
Miloslav Číž
823218bb61
freeze screen during screenshot taking
2017-11-14 18:23:12 +01:00
Grigorii Latyshev
6e4f6c4bd5
Change abs to std::abs
2017-11-13 21:36:55 +01:00
David Cernat
2ba1c84cf7
Merge pull request #335 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
2017-11-12 06:35:15 +02:00
scrawl
a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix
...
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192 )
2017-11-11 22:30:59 +00:00
scrawl
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
...
Item models reworking
2017-11-11 22:12:07 +00:00
scrawl
dc016059c3
Disable Activate key when textinput is active (Bug #4151 )
2017-11-11 22:00:18 +00:00
scrawl
3b9e1e8c1b
Make movement keys not function in text input mode
2017-11-11 22:00:09 +00:00
Miloslav Číž
1ab854446c
remove unused include
2017-11-11 17:21:01 +01:00
Andrei Kortunov
8c0dcd8b2b
Do not track a nearest actor during combat and pursue (bug #4179 )
2017-11-11 19:46:59 +04:00
Miloslav Číž
511a5686da
planet mapping adjustment
2017-11-11 15:10:54 +01:00
Miloslav Číž
4fc532d873
reference screenshot settings only from one place
2017-11-11 14:32:28 +01:00
Miloslav Číž
d71d984cfa
more unused stuff cleanup
2017-11-11 14:14:24 +01:00
Miloslav Číž
525f8b4d8e
get rid of special key for 360 screenshot
2017-11-11 13:51:42 +01:00
rexelion
f0649849b8
changed variable name to be more descriptive
2017-11-11 12:00:23 +00:00
Andrei Kortunov
9943bd4d74
AiWander fast forwarding improvements (bug #3638 )
2017-11-11 15:31:06 +04:00
Andrei Kortunov
03f129b53c
remove redundant allowedToInsertItems() function from ItemModel
2017-11-11 11:58:22 +04:00
Andrei Kortunov
99517d83ea
Bound items detection refactoring
2017-11-11 11:58:22 +04:00
Andrei Kortunov
a02124f884
Handle item owners during pickpocketing
2017-11-11 11:58:18 +04:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
2017-11-11 03:46:21 +02:00
scrawl
f1aeb416ec
Disable Activate key when textinput is active (Bug #4151 )
2017-11-10 22:54:53 +00:00
scrawl
b06512a60d
Fix error message that referred to the wrong file (Bug #4159 )
2017-11-10 22:51:32 +00:00
scrawl
1afbf99f74
Make movement keys not function in text input mode
2017-11-10 22:51:31 +00:00
Miloslav Číž
1f49612ca3
enable water effects for 360 screenshots
2017-11-10 19:18:16 +01:00
Miloslav Číž
319ed2f9b8
disable 360 screenshots in vanity/preview mode
2017-11-10 15:23:44 +01:00
Miloslav Číž
497b33e403
small corrections
2017-11-10 14:28:09 +01:00
rexelion
69a56eaea3
don't initialise rangeAttackOfTarget
2017-11-10 10:44:53 +00:00
Miloslav Číž
9ab3a0c44b
set cubemap width differently
2017-11-10 11:16:25 +01:00
Miloslav Číž
5baff05bac
add cubemap mapping
2017-11-10 10:50:28 +01:00
Miloslav Číž
5a07d135ae
add settings for cubemap size
2017-11-10 10:34:46 +01:00
Kyle Cooley
1cd539bad2
Fix render order for markers
2017-11-10 02:06:06 -05:00
Andrei Kortunov
3694b6ec90
Move onClose() check to item models
2017-11-10 10:58:43 +04:00
Andrei Kortunov
ac33ff9482
Move onDropItem() check to item models
2017-11-10 10:58:43 +04:00
Andrei Kortunov
3604b73d60
Move onTakeItem() to item models
2017-11-10 10:58:40 +04:00
Kyle Cooley
556117f6e6
Update marker transparency when changed.
2017-11-10 01:56:06 -05:00
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
2017-11-10 08:43:50 +02:00
Miloslav Číž
43c49e2f31
delete accidentally commited files
2017-11-09 23:12:23 +01:00
Miloslav Číž
1b184d8716
correct player mask
2017-11-09 23:09:13 +01:00
Miloslav Číž
e54c0a90fa
fix mirrored spherical screenshots
2017-11-09 21:14:02 +01:00
Miloslav Číž
d763e9fe46
add settings for spherical screenshots
2017-11-09 20:25:29 +01:00
Kyle Cooley
de214db8d4
Use configured transparency.
2017-11-09 13:45:32 -05:00
Kyle Cooley
197ea95646
Prevent arrows for move/scale markers from intersecting.
2017-11-09 13:04:46 -05:00
Miloslav Číž
8f32114025
segfault fix
2017-11-09 18:26:27 +01:00
Miloslav Číž
d4fd08a63f
save 360 screenshots in the configured directory
2017-11-09 16:49:46 +01:00
Miloslav Číž
1b97a541f4
make a new action for 360 screenshot
2017-11-09 16:06:29 +01:00
rexelion
983c33c4c8
don't use a pointer for ActionWeapon
2017-11-09 14:23:26 +00:00
Miloslav Číž
f60840754f
disable water effects for spherical screenshots
2017-11-09 14:44:42 +01:00
Miloslav Číž
5698d70806
small planet mapping
2017-11-08 12:58:27 +01:00
Miloslav Číž
5f36518181
spherical mapping
2017-11-08 09:15:45 +01:00
scrawl
41ecbdbe6c
Add missing WaitDialog::clear() ( Fixes #4196 )
2017-11-08 00:56:05 +00:00
scrawl
9ecdcc187f
Clarify a warning message refers to inventory objects
2017-11-08 00:26:09 +00:00
scrawl
95b3c1181a
Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects ( Fixes #4190 )
2017-11-08 00:24:52 +00:00
scrawl
e42bd71081
Add missing WaitDialog::clear() ( Fixes #4196 )
2017-11-08 00:24:04 +00:00
Miloslav Číž
4761a3d98b
dirty cylindrical projection
2017-11-07 22:13:05 +01:00
Miloslav Číž
3be9e2ee95
make spherical screenshot class
2017-11-07 19:47:36 +01:00
rexelion
cab0002461
Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents
2017-11-07 17:57:23 +00:00
Miloslav Číž
5afe02505b
hide player in first person 360 screenshot
2017-11-07 16:12:31 +01:00
Miloslav Číž
ce55d7c2f5
basic cubemap rendering
2017-11-07 15:02:01 +01:00
Miloslav Číž
7feba7e498
basic setup for 360 screenshots
2017-11-07 13:07:11 +01:00
rexelion
a1d9f11b04
use fProjectileMaxSpeed for ranged weapons distance
2017-11-07 11:43:21 +00:00
Kyle Cooley
492b99b008
Transparent object markers
2017-11-07 00:41:27 -05:00
scrawl
801f2d42d5
Merge pull request #1537 from drummyfish/guardfix
...
Check the real distance to target in AIPursue (issue #4184 )
2017-11-05 23:24:59 +00:00
Miloslav Číž
f98a821482
fix possible bug in aipursue
2017-11-05 23:46:15 +01:00
scrawl
87c79d7102
Merge pull request #1536 from rexelion/knockoutfix
...
Wait a few seconds before getting up (fixes #3884 )
2017-11-05 20:27:54 +00:00
scrawl
45993d3da2
Merge pull request #1529 from drummyfish/animfix
...
Stop character landing animation when turning (issue #4177 )
2017-11-05 20:24:24 +00:00
Miloslav Číž
430d01a39a
additional animation refactor
2017-11-05 20:19:47 +01:00
rexelion
de7a7d842b
mTimeUntilWake is initialised in the constructor
2017-11-05 18:30:34 +00:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
...
Trigger OnActivate when item is picked up through the inventory (Issue #3726 )
2017-11-05 15:35:39 +00:00
rexelion
48ec680f23
use game time instead of real time
2017-11-04 19:37:20 +00:00
Miloslav Číž
f34223fce9
check the real distance to target in aipursue
2017-11-04 20:02:21 +01:00
rexelion
ab66034ed1
use uniform_int_distribution instead of rand()
2017-11-04 02:15:56 +00:00
rexelion
ee2f3db9a8
fixed randomness
2017-11-04 01:31:15 +00:00
rexelion
8c2cc0f42f
break invisibility first
2017-11-04 00:44:16 +00:00
rexelion
bcbfa5fe1e
prevent activation, leave the rest to the script
2017-11-04 00:38:33 +00:00
rexelion
de83ad0116
use real time; wait random number of seconds
2017-11-04 00:24:09 +00:00
rexelion
5b8610b34b
knocked out characters wait some time before getting up
2017-11-01 23:44:50 +00:00
David Cernat
2ca4017371
[Client] Force position updates for players in animations
2017-11-01 22:00:54 +02:00
rexelion
a9e5e19482
OnActivate is triggered when the item is picked up
2017-10-31 22:33:26 +00:00
Miloslav Číž
ff1265c0e7
refactor jump animation
2017-10-31 14:22:24 +01:00
David Cernat
be25decee2
[General] Implement PlayerSpeech packet
2017-10-31 15:19:14 +02:00
David Cernat
a31d43965f
Merge pull request #328 from OpenMW/master
...
Add OpenMW commits up to 31 Oct 2017
2017-10-31 06:22:57 +02:00
rexelion
e8743f3f79
check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords
2017-10-30 21:16:25 +00:00
Miloslav Číž
3c65bdaf14
weapon cycle fix
2017-10-30 18:05:45 +01:00
Miloslav Číž
7bc512974f
use mcurrentjump instead of custom attrib
2017-10-30 15:26:38 +01:00
David Cernat
605b06c303
[General] Find actor speech captions instead of sending them in packets
2017-10-30 11:06:09 +02:00
rexelion
4e6f53d6f1
item added to the player and OnActivate is triggered when the inventory is closed
2017-10-29 11:45:17 +00:00
rexelion
1ee5dcff77
added a function to determine if a script contains OnActivate
2017-10-28 20:56:08 +01:00
Miloslav Číž
5c8f491441
move animation disabling code to a better place
2017-10-28 18:46:52 +02:00
Miloslav Číž
f9c396e0ea
stop landing animation when turning
2017-10-28 15:48:07 +02:00
Miloslav Číž
03401bb5df
remove redundant condition
2017-10-27 20:19:20 +02:00
David Cernat
413893aa51
[General] Implement PlayerAnimPlay packet
2017-10-27 09:10:29 +03:00
David Cernat
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
2017-10-26 17:28:56 +03:00
scrawl
f9397ce933
Merge branch 'master' into openmw-43
2017-10-25 14:17:06 +00:00
David Cernat
50d5fffb7f
[General] Add and implement PlayerQuickKeys packet
2017-10-25 07:21:00 +03:00
Alexander "Ace" Olofsson
3e51c9e6b3
Missed the OpenCS config file
2017-10-24 23:23:55 +02:00
scrawl
4a7be0ffda
Don't reset journal index to a lower value ( Fixes #4172 )
2017-10-24 20:02:35 +00:00
David Cernat
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
2017-10-24 19:36:14 +03:00
David Cernat
a94d4ce6f5
Merge pull request #323 from TES3MP/0.6.1
...
Add hotfix commit for 0.6.1 from 23 Oct 2017
2017-10-24 19:34:34 +03:00
scrawl
4437a72e47
Merge pull request #1519 from drummyfish/rainfix
...
fix rain ripple regression (bug #4169 )
2017-10-24 15:31:16 +00:00
Miloslav Číž
3731e20228
fix rain ripple regression
2017-10-24 14:12:41 +02:00
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
2017-10-23 23:33:06 +00:00
scrawl
e564dd842e
Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response ( Fixes #4166 )
...
Don't delete Link objects prematurely (Fixes #4171 )
2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24
Hide modal window before deleting it ( Fixes #4168 )
2017-10-23 23:33:05 +00:00
David Cernat
3aedc2e5bc
[Server] Don't automatically share PlayerTopic packets between players
2017-10-23 19:39:35 +03:00
David Cernat
360cf2ead7
Merge pull request #321 from OpenMW/master
...
Add OpenMW commits up to 22 Oct 2017
2017-10-23 14:51:29 +03:00
scrawl
8b19a8b7f6
Merge pull request #1513 from lukago/feature4082b
...
Feature #4082 : use many ingredients/potions instantly
2017-10-22 20:51:14 +00:00
scrawl
3d0094bd2e
Fix behavior of 'journal' command when invoked with already seen entry
2017-10-22 20:50:15 +00:00
scrawl
768da57da2
Fix dialogue topics displayed in lower case
2017-10-22 20:50:15 +00:00
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
2017-10-22 20:27:44 +03:00
lukago
b6cb3b445c
use getIndex to handle other windows, nullsafe fixes
2017-10-21 23:34:57 +02:00
scrawl
bb4ffb7743
Merge pull request #1514 from akortunov/ringfix
...
Do not replace an equpped ring of the same value
2017-10-21 13:35:55 +00:00
scrawl
075a7fee20
Merge pull request #1515 from akortunov/guifixes
...
Fix a 'Good Beast' companion window
2017-10-21 13:35:29 +00:00
scrawl
5b2fe01375
Merge pull request #1508 from AnyOldName3/shut-up-travis
...
Mark worldimp functions as override to stop distracting Travis CI war…
2017-10-21 13:34:48 +00:00
Andrei Kortunov
eaff7e30aa
Fix a 'Good Beast' companion window
2017-10-21 16:56:21 +04:00
Andrei Kortunov
e64f14b7ce
Do not replace an equpped ring of the same value
2017-10-20 23:05:12 +04:00
lukago
a3225364ff
refactor, use dragItem method
2017-10-19 17:43:27 +02:00
AnyOldName3
03fc3353b9
Tidy up indentation 2
2017-10-19 16:34:50 +01:00
AnyOldName3
f3e6b26e6b
Tidy up indentation
2017-10-19 16:34:11 +01:00
scrawl
9be27193a3
Merge pull request #1512 from Rhiyo/patch-1
...
fixed new clothing replacing old clothing of same value
2017-10-19 14:54:27 +00:00
lukago
43f94a8890
simplify drag and drop on avatar for potions and ingredients
2017-10-19 16:50:04 +02:00
Marc Zinnschlag
0b163f0a50
Merge remote-tracking branch 'aesylwinn/forceNewProject'
2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
2017-10-19 14:24:58 +02:00
Rhiyo
d9fe3aac99
fixed new clothing replacing old clothing of same value
...
Found on the bug http://bugs.openmw.org/issues/4165 .
In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind.
In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
2017-10-19 22:46:08 +10:30
Kyle Cooley
6d8666d80d
Force new project file when creating new project
2017-10-18 20:21:44 -04:00
AnyOldName3
2abff22c08
Make MWWorld::World final to enable compiler optimisations
2017-10-18 13:48:31 +01:00
AnyOldName3
7440cf37bc
Remove redundant virtual keywords implied by override keywords
2017-10-18 13:37:37 +01:00
David Cernat
260b3411c3
Merge pull request #317 from OpenMW/master
...
Add OpenMW commits up to 18 Oct 2017
2017-10-18 15:13:48 +03:00
AnyOldName3
69da89be39
Mark a method I missed out the first time as override
2017-10-18 13:05:04 +01:00
scrawl
33ceddc58b
Merge pull request #1506 from akortunov/swimanimations
...
Use SwimTurnLeft/Right animations correctly
2017-10-18 10:03:30 +00:00
scrawl
21a705fb75
Merge pull request #1507 from AnyOldName3/data-local-fix
...
Fix the loading of 'data-local' lines which I broke
2017-10-18 09:59:43 +00:00
scrawl
7328de6c50
Merge pull request #1505 from drummyfish/master
...
Make snow create water ripples (fixes #4156 )
2017-10-18 09:59:21 +00:00
AnyOldName3
2aad5bed7a
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
2017-10-18 05:06:09 +01:00
AnyOldName3
43e9e955c8
Do the same for the CS
2017-10-18 02:04:48 +01:00
AnyOldName3
1f77f9654b
Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path)
2017-10-18 01:42:11 +01:00
Andrei Kortunov
4d4d247565
Use SwimTurnLeft/Right animations correctly
2017-10-17 23:26:55 +04:00
Miloslav Číž
a7cad65aab
fix water shader switching bug
2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd
update uniform from one place
2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269
make snow create water ripples
2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625
move rain intensity uniform to water node
2017-10-17 09:59:45 +02:00
David Cernat
184c5f2b29
Merge pull request #315 from OpenMW/master
...
Add OpenMW commits up to 17 Oct 2017
2017-10-17 04:34:46 +03:00
Kyle Cooley
6d7a24224b
Add documentation.
2017-10-16 12:52:13 -04:00
AnyOldName3
654bd401fb
Switch openmw-cs to the escape versions of option types
2017-10-16 15:38:17 +01:00
David Cernat
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-10-16 07:37:29 +03:00
scrawl
03554b2f4b
Fix some style issues flagged by cppcheck
2017-10-15 17:06:58 +02:00
scrawl
64d02f577e
Fix missing null check
2017-10-15 17:06:58 +02:00
scrawl
624046c558
Fix unused event handler
2017-10-15 17:06:58 +02:00
scrawl
bbf9b0c0a7
Merge pull request #1503 from akortunov/regressions
...
Handle Trespassing crime differently from Theft
2017-10-15 09:08:52 +00:00
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
2017-10-15 09:04:48 +00:00
Andrei Kortunov
8f255a6b72
Handle Trespassing crime differently from Theft (bug #4158 )
2017-10-15 11:03:02 +04:00
Miloslav Číž
af6eeddbe5
use operator instead of drawcallback
2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e
wrap weather around in all directions
2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100
transform weather particles to world space
2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62
make use of renderinfo
2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11
search for particle system by class name
2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483
rain independent from camera plus wrap-around
2017-10-14 21:40:28 +02:00
Kyle Cooley
11eae16645
Get rid of duplicate function, fix flag checking
2017-10-14 15:09:12 -04:00
Kyle Cooley
d27071f06a
Fix LTEX import bug.
2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1
Merge cleanup.
2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c
Merge Land/LandTextures
2017-10-14 11:32:42 -04:00
scrawl
548af6dbfb
Fix jail screen fading
2017-10-14 14:03:16 +00:00
scrawl
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b
ExtraSpell magic effect: a basic implementation
2017-10-14 16:55:00 +04:00
scrawl
09d7681254
Merge pull request #1499 from lukago/bug4155
...
Bugfix #4155 : NPCs don't equip a second ring in some cases
2017-10-13 19:35:03 +00:00
glbwsk
83a5c7c3d8
removed unnecessary comments, added gitignore for clion cmake
2017-10-13 20:32:52 +02:00
scrawl
548e90a7bc
Set cursor active when moving by controller
2017-10-13 16:22:44 +00:00
glbwsk
ff9cb22a58
npc swap cheaper ring during auto equip
2017-10-13 15:16:07 +02:00
glbwsk
e6e482ea98
added some comments for autoEquip
2017-10-13 14:47:26 +02:00
glbwsk
a25903b075
fixed autoequiping rings by npc - now checks if right hand is free
2017-10-13 14:39:44 +02:00
David Cernat
ec2c964ae1
Merge pull request #311 from TES3MP/0.6.1
...
Add hotfix commit for 0.6.1 from 10 Oct 2017
2017-10-10 06:26:33 +03:00
David Cernat
f532ab241d
[Server] Avoid duplicates of the same player in a cell's loaders
2017-10-10 05:48:56 +03:00
David Cernat
c35101cc36
[Client] Don't use message box call boolean for regular message boxes
2017-10-10 04:11:36 +03:00
David Cernat
4f112ba3d7
[Client] Use regular message boxes where expected to do so
...
This helps us move towards using the same terminology as OpenMW for GUI elements, leading to less confusion.
2017-10-10 04:05:36 +03:00
David Cernat
41ff3fee89
Merge pull request #310 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2017-10-09 14:41:55 +03:00
scrawl
479f9535b4
Allow training window exit()
2017-10-08 20:38:20 +00:00
scrawl
9cde3e4408
Merge pull request #1495 from akortunov/regressions
...
Add showsInInventory() check to the ContainerItemModel
2017-10-08 14:09:59 +00:00
Andrei Kortunov
ea3729790f
Add showsInInventory() check to the ContainerItemModel
2017-10-08 09:20:07 +04:00
David Cernat
182f8c1f06
[General] Print client version on startup
2017-10-08 06:17:53 +03:00
David Cernat
3d38da0e85
[Server] Put includes in a specific order
2017-10-08 05:17:14 +03:00
David Cernat
61b1a59814
[General] Move server's version printing method to Utils
2017-10-08 04:16:30 +03:00
David Cernat
08f34e5356
[Client] Fix recent problems with password window
2017-10-08 02:42:41 +03:00
David Cernat
711c4d83da
[Client] Fix build after recent OpenMW changes to GUI
2017-10-07 23:33:36 +03:00
David Cernat
3e8d7c8416
Merge pull request #306 from OpenMW/master
...
Add OpenMW commits up to 7 Oct 2017
2017-10-07 21:54:21 +03:00
Kyle Cooley
b14404e9cc
Fix region colors
2017-10-06 20:05:06 -04:00
scrawl
7021d354c6
Merge pull request #1493 from akortunov/regressions
...
Regression fixes
2017-10-06 16:21:16 +00:00
scrawl
2805781542
Fix a crash when exit() already hides the window ( Fixes #4148 )
2017-10-06 16:18:57 +00:00
Andrei Kortunov
ad27e0f945
Fix owned tooltip in the spellwindow
2017-10-06 11:38:27 +04:00
Andrei Kortunov
e2afd3690c
Remove item by id from InventoryStore
2017-10-06 10:54:25 +04:00
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
2017-10-06 04:10:04 +03:00
scrawl
842a42ee66
Fix non-top level Windows accepting key focus
2017-10-05 18:41:02 +02:00
scrawl
8c0790580a
Add screen fading for exterior cell transitions
2017-10-05 18:41:02 +02:00
scrawl
cd437f094d
Fix exiting savegamedialog with 'esc' when no game is running
2017-10-05 18:35:09 +02:00
scrawl
d94235e3a7
Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard
2017-10-04 16:00:39 +00:00
scrawl
12510efab7
Fade screen out during loading screen (when travelling)
2017-10-04 16:00:38 +00:00
scrawl
a4737d8417
Use MyGUI frame events for ScreenFader
2017-10-04 16:00:38 +00:00
scrawl
e4f0f7157a
Fix pinned windows not being updated
2017-10-04 16:00:37 +00:00
scrawl
49a0922f1b
Remove 'visibility mask' gui feature which did not end up being useful
2017-10-04 16:00:37 +00:00
scrawl
7c68ed04b2
Don't require modal windows to be removed in the same order they were added
2017-10-04 16:00:37 +00:00
scrawl
b5c9977a7b
Merge pull request #1489 from akortunov/guifixes
...
Use an "owned crosshair" feature for items in containers
2017-10-04 15:59:43 +00:00
Andrei Kortunov
1cb7ed5db1
Use owned tooltips for items in containers correctly
2017-10-04 12:13:45 +04:00
scrawl
433028e8d7
Fix GUI regressions
2017-10-03 22:07:56 +00:00
Marc Zinnschlag
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
2017-10-03 13:32:02 +02:00
Kyle Cooley
2f5449a68c
Remove now unnecessary overrides.
2017-10-02 16:13:40 -04:00
Kyle Cooley
137ea872d3
Hide base land textures.
2017-10-02 15:56:22 -04:00
scrawl
b24fd77ea2
Merge pull request #1488 from akortunov/equipfix
...
AI: Autoequip armor when bound armor spell expires
2017-10-01 16:06:26 +00:00
scrawl
302e3c8b3d
Merge pull request #1486 from akortunov/pickpocketfix
...
Fix some issues with pickpocketing (bug #4131 )
2017-10-01 16:05:38 +00:00
Andrei Kortunov
21b6bd176f
AI: Autoequip armor when bound armor spell expires
2017-10-01 17:11:30 +04:00
Andrei Kortunov
c5fcb9684e
Improve owned crosshair feature behaviour
2017-09-30 21:29:02 +04:00
Andrei Kortunov
b8fd530ee1
Do not speak with unconscious creatures
2017-09-30 21:20:38 +04:00
Andrei Kortunov
f26206b630
Make unconscious actors do not speak and do not track targets
2017-09-30 20:55:42 +04:00
Andrei Kortunov
3ebb18ce18
Make unconscious actors do not report about crimes
2017-09-30 20:35:29 +04:00
Andrei Kortunov
34895157f9
Consider taking items from unconscious NPC as a theft
2017-09-30 20:22:26 +04:00
Andrei Kortunov
04452b0949
Use a pickpocket crime instead of theft when pickpocketing was failed
2017-09-30 20:11:53 +04:00
scrawl
3c62a8c5c2
Fix console selected object persisting on a new game
2017-09-30 15:40:47 +00:00
scrawl
097b9d90bc
Fix travel service not showing
2017-09-30 15:40:47 +00:00
Kyle Cooley
dfcbee3ab1
Ignore case when comparing textures, also add new textures to lookup map.
2017-09-30 00:04:52 -04:00
scrawl
77ddaa869b
Merge pull request #1484 from drummyfish/master
...
fix rain ripple bug
2017-09-29 22:53:48 +00:00
Andrei Kortunov
03daf2b9e3
Fix a failed assert in the getCell() check during a new game start
2017-09-29 22:28:09 +04:00
Miloslav Číž
4999c667b6
fix rain ripple bug
2017-09-29 19:56:16 +02:00
scrawl
5b10e3128e
Use first resolution in fullscreen if current is not supported ( Fixes #4113 )
2017-09-29 14:58:25 +00:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed
Merge pull request #1483 from drummyfish/master
...
water shader improvements plus rain ripple effect (#452 )
2017-09-28 22:31:13 +00:00
scrawl
7bb0a76df2
Fix tooltips showing when cursor isn't visible
2017-09-28 19:42:16 +02:00
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
2017-09-28 19:04:31 +02:00
scrawl
14c9e858c8
Check to make sure button is enabled
2017-09-28 17:00:07 +00:00
scrawl
6ec66fa95f
Restore keyfocus to goodbye when selecting a topic
2017-09-28 16:57:55 +00:00
David Cernat
44fb7518ee
Merge pull request #300 from OpenMW/master
...
Add OpenMW commits up to 28 Sep 2017
2017-09-28 11:09:14 +03:00
scrawl
e5d1fd022f
Merge pull request #1479 from akortunov/physics
...
Make physics framerate configurable
2017-09-27 22:31:00 +00:00
scrawl
0ae009eb21
Hide message box before deleting it
...
Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.
2017-09-27 22:19:42 +02:00
scrawl
d53e7f8a3c
Remove redundant code
...
Already worked around in WindowBase::setVisible
2017-09-27 22:07:49 +02:00
scrawl
0deda69a27
Fix wrong skin for levelup attribute values
2017-09-27 22:04:36 +02:00
scrawl
e9d81fdf5a
Fix being able to escape interactive messageboxes
2017-09-27 22:00:20 +02:00
scrawl
db650df416
Fix 'blocking' messageboxes not handling key focus properly
2017-09-27 21:41:22 +02:00
scrawl
a0f5e32113
Fix 'new game' from the main menu not removing menu afterwards
2017-09-27 21:38:15 +02:00
scrawl
0240a6c38b
Fix controls window regression
2017-09-27 21:30:12 +02:00
David Cernat
b1aacd5028
Merge pull request #299 from OpenMW/master
...
Add OpenMW commits up to 27 Sep 2017
2017-09-27 21:29:56 +03:00
Andrei Kortunov
668a947210
Inherit owner, if an item is in container (regression #4128 )
2017-09-27 20:00:41 +04:00
scrawl
2d873a13ac
Merge pull request #1469 from drummyfish/master
...
water shader improvements (partially fixes #3365 )
2017-09-27 13:14:22 +00:00
scrawl
0ee57effcc
Make 'Delete game' button not accept keyfocus, to prevent accidents
2017-09-27 12:56:12 +00:00
scrawl
c7a82704c6
Fix key focus resets in SaveGameDialog
2017-09-27 12:56:11 +00:00
scrawl
74e806d974
Additionally use movement keys (default WASD) to navigate GUI buttons
2017-09-27 12:56:10 +00:00
scrawl
3d2ad2d339
Include cleanup
2017-09-27 12:56:09 +00:00
scrawl
87311d86b5
Fix what looks like a copy/paste error
2017-09-27 12:56:08 +00:00
scrawl
7a3fbfb34a
Slightly improve journal window keyboard navigation
2017-09-27 12:56:05 +00:00
scrawl
05814c0929
Add key focus handling for WaitDialog
...
Default is 'until healed'. Up/Down arrows change the hour slider and implicitely change the button to 'Wait'.
2017-09-27 12:56:03 +00:00
scrawl
8964fc93d6
Fix dialogue window not being exited properly
2017-09-27 12:56:02 +00:00
scrawl
7a64098da3
Avoid rebuilding the dialogue topics pane unnecessarily
...
Also retaining key focus.
2017-09-27 12:56:02 +00:00
scrawl
22929e53fa
Don't ignore my own advice
...
Can't wait until MyGUI 3.2.2 is a build dependency, then we can use key focus events to handle the SDL text input.
2017-09-27 12:55:58 +00:00
scrawl
1714271a76
Improve KeyboardNavigation to better handle modal windows
...
It's no longer possible to cycle to widgets that aren't part of the current modal window.
The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
2017-09-27 12:55:58 +00:00
scrawl
41fe16013b
Select first widget if we can't find the current widget
2017-09-27 12:55:55 +00:00
scrawl
475ac46f3e
Workaround keyfocus issues in current versions of MyGUI
2017-09-27 12:55:54 +00:00
scrawl
010a7ea5b3
Fix tooltip widgets being set to accept key focus
2017-09-27 12:55:52 +00:00
scrawl
2514cc5cc8
Workaround key focus being reset in BookWindow when next/prev are hidden
2017-09-27 12:55:50 +00:00
scrawl
fce9a14986
Hide the mouse cursor until it's used
2017-09-27 12:55:48 +00:00
scrawl
09e93319f5
Restrict the 'fake mouse movement' workaround to where it's actually required ( Fixes #3978 )
2017-09-27 12:53:52 +00:00
David Cernat
ddf0dfed55
Merge pull request #298 from OpenMW/master
...
Add OpenMW commits up to 26 Sep 2017
2017-09-26 21:54:55 +03:00
Andrei Kortunov
62177ebb30
Move physics framerate from setting to environment variable
2017-09-26 21:23:15 +04:00
scrawl
9b91ea5d34
Exit drag-and-drop if dragged item is deleted ( Fixes #3097 )
2017-09-26 16:51:19 +02:00
Andrei Kortunov
6062cd4b9c
Make physics framerate configurable
2017-09-26 17:15:58 +04:00
Miloslav Číž
cde2c13900
make water depth independent of view frustum
2017-09-26 14:14:28 +02:00
scrawl
2ce79e07a4
Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
...
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
2017-09-25 23:38:28 +02:00
scrawl
476bec41c5
Remove redundant code
2017-09-25 23:27:01 +02:00
scrawl
c5613e384e
Remove duplicate disposition code
2017-09-25 21:30:03 +02:00
scrawl
e8c6a3b225
Fix crash in dialogue filter if local variables are not configured
...
This could happen e.g. by 'some_npc_in_remote_cell->forcegreeting'
2017-09-25 21:21:51 +02:00
scrawl
36c192a1dd
Undo the console portion of 84657271c7
because it results in the console forgetting its object on opening
2017-09-25 21:15:38 +02:00
scrawl
717e68fab2
Remove redundant resetHistory argument
2017-09-25 19:58:34 +02:00
scrawl
e14573fa8c
Add missing null check
2017-09-25 19:53:42 +02:00
scrawl
19e07fad30
Remove redundant Services enum
2017-09-25 19:52:20 +02:00
scrawl
f8ffd85146
Topic passed to keywordSelected() no longer has to be lower case
...
Remove redundant mDialogueMap
2017-09-25 19:03:38 +02:00
scrawl
b7752ec52d
Make TradeWindow not depend on DialogueWindow
2017-09-25 18:07:49 +02:00
scrawl
82a211ba03
Fix duplicate code
2017-09-25 17:47:30 +02:00
scrawl
d78e822833
Add 'delay' argument for screen fading operations
2017-09-25 00:47:10 +02:00
scrawl
c035548f37
Make Tab work if selected widget is marked as not needing keyfocus
2017-09-25 00:47:09 +02:00
scrawl
ad8d0c5302
Use keypad to control the camera
2017-09-25 00:47:09 +02:00
scrawl
94b538ac82
Fix crash due to not calling WindowModal::onClose()
2017-09-25 00:47:08 +02:00
scrawl
ca3b08b852
Make Activate key accept GUI buttons
2017-09-25 00:47:08 +02:00
scrawl
67dc4e019a
Make Enter on trade window price attempt the trade
2017-09-25 00:47:07 +02:00
scrawl
8ae7e4c958
Make Enter on a name edit accept the dialog
2017-09-25 00:47:07 +02:00
scrawl
843106fc61
Handle the wait progress bar as part of the GUI mode
2017-09-25 00:47:06 +02:00
scrawl
9ed1b16553
Extend code that detects whether a key was consumed by the GUI ( Fixes #4016 )
2017-09-25 00:47:05 +02:00
scrawl
0e57f1317b
Remove redundant setVisible(false)
2017-09-25 00:47:05 +02:00
scrawl
331192f2d6
Improve keyboard navigation of book/scroll windows
2017-09-25 00:47:04 +02:00
scrawl
d58ff4a736
Remove obsolete Container GUI keyboard handling
2017-09-24 19:08:16 +02:00
scrawl
c0d8bef82f
Call changeInputMode() from updateVisible()
2017-09-24 19:08:16 +02:00
scrawl
222defc6d8
Extend HUD::clear()
2017-09-24 19:08:16 +02:00
scrawl
f6c227b966
Reset screen faders in clear()
...
Fixes a black screen when loading a game while waiting/resting.
2017-09-24 19:08:15 +02:00
scrawl
d10985e481
Remove unneeded window pointers
2017-09-24 19:08:15 +02:00
scrawl
f67dbc8aa0
Remove redundant update function
2017-09-24 19:08:15 +02:00
scrawl
e7d2a8a4dc
Call clear() for every window
2017-09-24 19:08:15 +02:00
scrawl
c6c01870ec
Call onResChange for every window
2017-09-24 19:08:15 +02:00
scrawl
2b03bc0c56
Call WindowBase::onFrame() for every active window
2017-09-24 19:08:15 +02:00
scrawl
ba7ae2663f
Use a generic container to delete windows
2017-09-24 19:08:15 +02:00
scrawl
32f9c8058a
Remove redundant RestBed gui mode
2017-09-24 19:08:14 +02:00
scrawl
9ead331741
Fix pinned windows showing in other GUI modes
2017-09-24 19:08:14 +02:00
scrawl
65a707348c
Make Tab select the first widget if none is selected
2017-09-24 19:08:14 +02:00
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
Kyle Cooley
1fe1ec63c4
Fix Qt4 build
2017-09-22 23:33:50 -04:00
Kyle Cooley
3981f79d38
Change flag for base land textures
2017-09-22 22:59:50 -04:00
Kyle Cooley
054e6a780e
Use map for texture lookup.
2017-09-22 22:43:45 -04:00
Kyle Cooley
4921e7f5c1
Get rid of reinterpret cast.
2017-09-22 22:42:09 -04:00
David Cernat
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
2017-09-22 19:12:41 +03: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
David Cernat
7f0ea7d01f
Merge pull request #294 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/character.cpp
2017-09-20 16:52:44 +03: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
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
David Cernat
4d4eb1bb9f
Merge pull request #292 from OpenMW/master
...
Add OpenMW commits up to 18 Sep 2017
2017-09-19 09:40:45 +03: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
Marc Zinnschlag
e6caacec04
Merge remote-tracking branch 'plutonicoverkill/pref-pane-width'
2017-09-18 10:19:21 +02:00
Kyle Cooley
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
2017-09-17 20:29:51 -04: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
PlutonicOverkill
5e60fb7c10
Fix preferences pane width
2017-09-17 21:09:28 +12:00
David Cernat
960b91a53c
Merge pull request #290 from OpenMW/master
...
Add OpenMW commits up to 17 Sep 2017
2017-09-17 10:53:33 +03: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
820e0e9195
Merge pull request #1453 from MiroslavR/convertproj
...
ESS-Importer: Convert ballistic projectiles
2017-09-15 20:53:08 +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
David Cernat
c98e6dc833
Merge pull request #288 from OpenMW/master
...
Add OpenMW commits up to 14 Sep 2017
2017-09-15 03:30:20 +03: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
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
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2017-09-12 07:38:49 +03: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
David Cernat
b94c0a9991
[Client] Don't send Attribute & Skill packets as werewolf, part 2
2017-09-04 20:21:06 +03:00
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
2017-09-04 18:05:24 +03:00
David Cernat
8c9d6a0160
[Client] Ensure that LocalPlayer's isWerewolf starts out false
2017-09-04 15:44:10 +03:00
David Cernat
ccb15cc09e
[Client] When players die, make guards willing to arrest them again
2017-09-04 15:13:05 +03: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
Koncord
74c9a26d16
[Server] Fix "wrong packet with id: 14"
2017-09-02 14:01:11 +08: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
David Cernat
2e8718a0e0
Merge pull request #282 from OpenMW/master
...
Add OpenMW commits up to 31 Aug 2017, part 2
2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3
[Client] Shorten player names to 31 characters after they are inputted
2017-08-31 18:41:37 +03:00
David Cernat
ac3254d85f
[General] Don't send PlayerAttribute and PlayerSkill packets as werewolf
...
This will prevent the server from overwriting a player's human form stats with their werewolf form stats.
Additionally, share PlayerShapeshift packets last when exchanging data with another player.
2017-08-31 18:21:38 +03:00
David Cernat
93d1aa2e4a
[Client] Comment out the broken sending of custom spells until 0.7.0
2017-08-31 17:07:45 +03:00
David Cernat
98a7769b91
Merge branch 'master' into 0.6.0
2017-08-31 15:44:27 +03: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
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-08-31 15:14:13 +03:00
Koncord
54f5104345
[General] Escape format for strings
2017-08-31 20:09:05 +08:00
David Cernat
499c7db121
[Server] Initialize interiors correctly if exterior 0, 0 has been loaded
2017-08-31 14:48:23 +03: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
David Cernat
cca4991e74
[Utils] Use consistent names for utility functions added by tes3mp
2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5
[Client] Only add valid quests to journal
2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48
[Client] Only add valid inventory & equipment items to LocalPlayer
...
Also add related debug information.
2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89
[Client] Only add spells to players that are ensured to exist
2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80
[Client] Ensure that objects searched for have a valid reference number
2017-08-31 03:40:36 +03: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
David Cernat
833d2a5dbe
Merge pull request #277 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 29 Aug 2017, part 1
2017-08-29 19:32:21 +03:00
David Cernat
92553b8e29
[Server] Log startup errors by not deleting logger too early
2017-08-29 19:30:37 +03: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
David Cernat
2597f018d2
Merge pull request #272 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 23 Aug 2017
2017-08-23 07:22:29 +03:00
David Cernat
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
2017-08-23 07:14:45 +03:00
Kyle Cooley
157ecb166c
Fix wrong folder name
2017-08-23 00:02:02 -04:00
David Cernat
8f543fb34e
[Client] Use less exploitable way of disabling console
...
Previously, large framerate drops allowed players to open and use the console for short periods of time.
2017-08-23 04:58:07 +03:00
David Cernat
056d54e9f7
[Client] Only send ObjectScale packets for objects located in cells
2017-08-23 02:45:38 +03: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
David Cernat
ac27ca663b
[Client] Don't send ObjectState packets for items in containers
2017-08-20 06:58:39 +03: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
David Cernat
cffd985038
Merge pull request #266 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 18 Aug 2017
2017-08-18 07:45:36 +03:00
David Cernat
0820b7e92b
[Server] Add GetCaseInsensitiveFilename() script function
...
Additionally, make header order consistent in script function files.
2017-08-18 07:13:08 +03: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
David Cernat
d51736d68f
[Client] Fix crashes caused by inventory items with disabling scripts
2017-08-11 05:49:33 +03: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
David Cernat
77ce05b7d6
[Client] Fix spell casting probability synchronization
2017-08-06 00:11:54 +03: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
David Cernat
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
2017-08-05 00:09:34 +03:00
Jake Westrip
63343b6241
Ensure jail does not decrease a skill past zero
2017-08-05 06:15:15 +10:00
David Cernat
0e2038f045
[General] Record and get player positions before their last cell change
2017-08-04 21:45:52 +03:00
David Cernat
fbec0d9443
[Client] Remove inertia from players who are teleported via a packet
2017-08-04 21:43:01 +03: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
Koncord
d7cbfc98eb
[Browser] Fix crashing of browser (I hope)
2017-08-01 02:16:49 +08: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
Koncord
1f632d8bc9
[Master] Fix REST servers/info
2017-07-31 19:32:27 +08:00
Koncord
bca594150c
[Browser] Add debug info to QueryClient
2017-07-31 19:08:04 +08:00
Koncord
918658d383
[Master] Waiting ACK instead of immediately closing connection.
2017-07-31 19:08:04 +08: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
Unknown
bfbfbeac43
Added networking and saving for custom spells
2017-07-31 03:45:47 +10: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
David Cernat
4db64e1721
[Client] Synchronize spellcasting for non-bipedal creatures
2017-07-28 20:49:26 +03:00
Andrei Kortunov
920021c61b
Update effects during rest (bug #3679 )
2017-07-28 16:50:52 +04:00
David Cernat
c9550fc560
[Server] Use case-insensitive filename comparison for plugins
...
Additionally, clarify the comments related to plugin comparison.
2017-07-28 06:57:15 +03:00
David Cernat
690f7dc7df
Merge pull request #251 from OpenMW/master
...
Add OpenMW commits up to 27 Jul 2017, part 2
2017-07-27 20:55:56 +03:00
David Cernat
9d05063af4
[General] Add server script functions for banning & unbanning IPs
...
Additionally, use a more informative message for the client when trying to connecting to a server that it is banned from.
2017-07-27 19:29:17 +03: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
David Cernat
500bff9911
Merge pull request #250 from OpenMW/master
...
Add OpenMW commits up to 27 Jul 2017
2017-07-27 04:01:44 +03: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
David Cernat
2f551aba02
[Client] Don't start dialogue via client scripts if already in dialogue
...
This prevents infinite greeting spam in scripts such as hlormarScript.
2017-07-26 22:37:57 +03:00
David Cernat
e6e5d406b8
Merge pull request #248 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017, part 2
2017-07-26 20:31:39 +03:00
David Cernat
796118c266
[Client] Send StatsDynamic packets more often
2017-07-26 20:15:35 +03: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
David Cernat
d543edbd9a
[Server] Make sure players are initialized as non-werewolves
2017-07-26 06:01:48 +03:00
David Cernat
84662ed3fe
[Client] Add temporary warnings when creating custom spells and items
2017-07-26 05:36:12 +03: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
David Cernat
cd8d064761
[Server] Add PlayerShapeshift to PlayerCellChange's information exchange
2017-07-25 18:44:06 +03:00
David Cernat
8b79cdd4f4
[Server] Document script functions, part 3
...
Also reorder functions in Cells and CharClass so they are consistent with the rest.
2017-07-25 18:07:09 +03: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
David Cernat
3d1458b5a2
Merge pull request #246 from OpenMW/master
...
Add OpenMW commits up to 24 Jul 2017
2017-07-24 20:21:04 +03: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
David Cernat
2c1ece79fc
Merge pull request #245 from OpenMW/master
...
Add OpenMW commits up to 22 Jul 2017
2017-07-23 22:02:16 +03:00
David Cernat
5e5440b697
[Server] Document script functions, part 2
2017-07-23 21:59:33 +03: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
David Cernat
cc91b32b2f
[Server] Make spell script functions consistent with others
2017-07-20 17:58:00 +03:00
David Cernat
7173a48f4b
[Client] Prevent ObjectState packet spam
2017-07-20 17:01:04 +03:00
David Cernat
b8b3856c73
Merge pull request #244 from OpenMW/master
...
Add OpenMW commits up to 19 Jul 2017
2017-07-19 20:49:56 +03:00
David Cernat
8bd33e5fbb
[Server] Document script functions, part 1
2017-07-19 20:40:51 +03: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
David Cernat
fd046e42ef
Merge pull request #242 from OpenMW/master
...
Add OpenMW commits up to 16 Jul 2017
2017-07-17 21:34:44 +03: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
David Cernat
aeb1ec3394
[Client] Delimit and clarify changes made by tes3mp to engine and main
2017-07-15 12:44:00 +03:00
David Cernat
f65f996418
[Server] Add script functions for werewolf states
2017-07-15 11:09:28 +03: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
David Cernat
e3929df38a
Merge pull request #239 from OpenMW/master
...
Add OpenMW commits up to 14 Jul 2017
2017-07-15 09:13:04 +03:00
David Cernat
43a3daf0aa
[General] Add & implement PlayerShapeshift packet for werewolf states
2017-07-15 09:02:19 +03:00
scrawl
ada85aa1ee
Merge pull request #1331 from akortunov/guidistortionfix
...
Prevent GUI sounds distortion
2017-07-14 19:55:33 +02:00
David Cernat
ad9fa0631a
[General] Rename jailText to jailEndText and add jailProgressText in PlayerJail
2017-07-13 20:13:28 +03:00
David Cernat
708d3723eb
[Client] Fix client script messagebox buttons that had always broken in tes3mp
2017-07-13 18:58:48 +03:00
David Cernat
e36c0afc59
[General] Send faction reputation via PlayerFaction packets
2017-07-13 13:36:00 +03:00
David Cernat
be93ec8ef6
[General] Implement ObjectState packet
2017-07-13 09:46:30 +03:00
David Cernat
083b46394d
[General] Add ignoreJailSkillIncreases to PlayerJail packets
2017-07-12 18:24:37 +03:00
David Cernat
5962570c48
[General] Add jailText to PlayerJail packets
2017-07-12 16:39:31 +03:00
David Cernat
5774023f8b
[Client] Add missing processor initialization for ProcessorPlayerJail
2017-07-11 14:31:32 +03:00
David Cernat
3280f0c5ee
[General] Implement PlayerJail packet
...
Rework server's DeathFunctions into MechanicsFunctions
Remove connection between PlayerResurrect and jailing
2017-07-11 13:34:09 +03:00
David Cernat
b1b27728e2
[Server] Move functions dealing with PlayerKillCount to QuestFunctions
2017-07-11 07:15:06 +03:00
Koncord
9cc07f100c
[Server] Add OnObjectState callback
2017-07-11 02:21:19 +08:00
Andrei Kortunov
54b4d93f79
Added a special function for GUI sounds playing
2017-07-10 15:48:00 +04:00
David Cernat
3529f9b090
[General] Add placeholders for PlayerJail, ObjectState & ConsoleCommand
2017-07-10 12:33:53 +03:00
David Cernat
4e74910fdb
[General] Disable automatic sync for PlayerJournal and PlayerFaction
...
Simplify PlayerFaction packets by removing BOTH action
2017-07-08 12:27:48 +03:00
David Cernat
6dde0ca9c9
[Server] Rework script functons by removing unnecessary vector buffers
...
Add new initialization script functions to allow clearing all player changes vectors in a manner consistent with Actor and World functions
Add toOthers boolean to all methods that send packets with player changes vectors
2017-07-07 09:25:48 +03:00
David Cernat
2c05b7f747
[Server] Rename InitiateEvent() into InitializeEvent() for consistency
2017-07-07 08:12:48 +03:00
David Cernat
1d504a665f
[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets
2017-07-05 07:06:33 +03:00
Koncord
940ae5c2fb
[Server] Implement GetIP API function
2017-07-04 15:57:16 +08:00
Koncord
1f3cbb46e2
[Server] Use __ARM_ARCH definition for detecting ARM
2017-07-04 15:56:40 +08:00
Andrei Kortunov
37952c9a79
Added door detection based by ray casting
2017-07-03 22:08:29 +04:00
Koncord
768790e9b4
[Server] Move Base processors and Initializer to processors subdirectory
2017-07-04 01:13:10 +08:00
Koncord
60ac884d13
[Server] Delete commented line
2017-07-04 00:31:57 +08:00
Koncord
9bb586de77
[Client] Simplify setMapExplored()
2017-07-03 23:43:32 +08:00
Koncord
52349278e9
[Client] Fix warnings
2017-07-03 23:41:16 +08:00
Koncord
b2339f2f9a
[Client] Fix building
2017-07-03 23:40:38 +08:00
David Cernat
60574ae667
[General] Implement jail time as a death penalty
2017-07-03 15:45:21 +03:00
David Cernat
71313c5aa6
[General] Implement PlayerMap packet, part 1
2017-07-03 09:28:27 +03:00
David Cernat
ad4b1d05bb
[Client] Add comments for GUI additions made by tes3mp
2017-07-03 05:06:07 +03:00
David Cernat
b1fb9ba23e
[Browser] Remove Favorites tab while it remains broken
2017-07-03 02:32:32 +03:00
David Cernat
c899525e30
[General] Use address keys with clearer meaning in tes3mp config files
2017-07-03 01:31:48 +03:00
David Cernat
99640da111
Merge pull request #234 from OpenMW/master
...
Add OpenMW commits up to 30 Jun 2017
2017-07-02 14:22:06 +03:00
David Cernat
1f682749d6
[General] Add optional notes to PasswordDialogs
2017-07-02 13:07:36 +03:00
Koncord
9630f95335
[Server] Remove debug output
2017-07-02 11:12:41 +08:00
Koncord
73cf134107
[General] Fix incoming password string
2017-07-02 11:11:33 +08:00
Koncord
0cf09adb44
[General] Move AddProcessor to BasePacketProcessor
2017-06-30 20:09:05 +08:00
Koncord
d9e98ec771
[Server] Add expected ‘;’
2017-06-30 19:58:14 +08:00
Koncord
d14ad55a49
[Server] Fix compilation on arm
2017-06-30 19:46:27 +08:00
Koncord
f92117e73d
[Server] change "__arm__" to "__ARM_ARCH" in ARM detection
2017-06-30 19:31:07 +08:00
Koncord
15a197cb9a
[Server] Temporarily disable CallFF for ARM
2017-06-30 19:17:04 +08:00
Koncord
f015c3b2f6
[Server] Remove commented code
2017-06-30 18:03:01 +08:00
Koncord
653db9e266
[Server] Simplify native CallPublic & CreateTimerEx
2017-06-30 18:01:14 +08:00
Koncord
5292914325
[Server] Simplify native CallPublic & CreateTimerEx
2017-06-30 17:59:50 +08:00
Koncord
1c09e0c255
[Server] Add CallFF dependency
2017-06-30 17:58:41 +08:00
scrawl
951c4e12e0
Fix crash introduced by commit 1d8a9ff622
( Fixes #3940 )
2017-06-30 00:52:02 +02:00
David Cernat
0b68e59060
[Client] Send ObjectLock packets when using lock spells
2017-06-29 22:29:49 +03:00
Koncord
9519c467eb
[Client] Simplify updateEquipment for LocalPlayer & LocalActor
2017-06-29 14:52:23 +08:00
Koncord
596f42e408
[Client] Fix "invalid iterator" error
2017-06-29 14:36:56 +08:00
Andrei Kortunov
143fdae6fe
Make spell priority calculation close to vanilla (bug #3937 ).
2017-06-28 14:02:51 +04:00
David Cernat
685bf15d52
Merge pull request #231 from OpenMW/master
...
Add OpenMW commits up to 27 Jun 2017
2017-06-28 05:58:19 +03:00
Koncord
5b2cab4c6b
[General] Change NULL to nullptr
2017-06-27 22:49:28 +08:00
Koncord
0ed0d2417b
[Client] Make foreach style consistent with other
2017-06-27 22:27:02 +08:00
Koncord
2427a4f877
[Client] Update DedicatedActor to C++11
2017-06-27 22:25:39 +08:00
Koncord
8f7da49152
[Client] Update DedicatedPlayer to C++11
2017-06-27 22:25:29 +08:00
Koncord
08666cabdb
[Client] Update PlayerList to C++11
2017-06-27 22:24:34 +08:00
Koncord
a110ec1767
[Client] Update GUIController to C++11
2017-06-27 21:59:05 +08:00
Koncord
aa1f5c3cd3
[Client] Change pointer type to reference
2017-06-27 21:58:36 +08:00
Koncord
7499777b3a
[Client] Update CellController to C++11
2017-06-27 21:56:40 +08:00
Koncord
7d4dd2ad1c
[Client] Update Cell to C++11
2017-06-27 21:56:24 +08:00
Koncord
7918e887dd
[Client] Update ActorList to C++11
2017-06-27 21:56:14 +08:00