David Cernat
8aad93b904
Merge pull request #519 from TES3MP/0.7.0-alpha
...
[General] Update positions for dead players on other clients
2019-03-24 03:54:43 +02:00
David Cernat
3effd5f1ff
[General] Update positions for dead players on other clients
...
Dead players will now show up at the correct cell and position for living players, making server scripts that allow players to revive each other much more functional.
2019-03-24 03:52:05 +02:00
David Cernat
4692f29b9d
Merge pull request #517 from uramer/0.7.0markers
...
update player map markers when client changes cell
2019-03-22 21:39:06 +02:00
David Cernat
03d377ec54
Merge pull request #518 from TES3MP/0.7.0-alpha
...
[General] Rename CellReplace packet into CellReset
2019-03-22 21:36:07 +02:00
David Cernat
8ff2d1b829
[General] Rename CellReplace packet into CellReset
2019-03-22 21:33:34 +02:00
David Cernat
cb82318c36
[General] Fix problems with Utils::getArchitectureType()
2019-03-22 03:09:11 +02:00
uramer
3b2098382b
update player map markers when client changes cell
2019-03-21 16:27:15 +01:00
David Cernat
cb5e24e6c5
Merge pull request #516 from TES3MP/0.7.0-alpha
...
[Server] Add GetMillisecondsSinceServerStart() server function
2019-03-20 20:05:30 +02:00
David Cernat
91f82d845c
[Server] Add GetMillisecondsSinceServerStart() server function
2019-03-20 20:02:31 +02:00
David Cernat
d35026bbf5
Merge pull request #515 from TES3MP/0.7.0-alpha
...
0.7.0 alpha
2019-03-20 18:58:31 +02:00
David Cernat
bd677726bf
[Server] Add StatsFunctions that get/set damage to attributes/skills
2019-03-20 18:54:35 +02:00
David Cernat
9fc4c83858
[Client] Send skill/attribute packets when skills/attributes are damaged
2019-03-20 18:40:46 +02:00
David Cernat
ece39748de
[Server] Fix typo causing recursion in deprecated actor list function
2019-03-20 17:01:21 +02:00
David Cernat
5c4d3df551
[Server] Deprecate DoesFileExist(), add DoesFilePathExist()
2019-03-19 04:52:58 +02:00
David Cernat
2cdabddc0e
[Server] Move most MiscellaneousFunctions to ServerFunctions
2019-03-19 04:25:33 +02:00
David Cernat
b46767de6e
[Server] Clean up recent additions to ServerFunctions
2019-03-19 03:57:16 +02:00
David Cernat
911079e0bc
Merge pull request #512 from TES3MP/0.7.0-alpha
...
0.7.0 alpha
2019-03-12 05:38:36 +02:00
David Cernat
331fa86844
[Server] Call OnServerPostInit after OnRequestDataFileList
...
This allows different actions to be taken in OnServerPostInit based on what the data files being used are.
2019-03-12 05:36:33 +02:00
David Cernat
a0ec9dfd2e
[Server] Rename OnRequestPluginList into OnRequestDataFileList
2019-03-12 03:18:57 +02:00
David Cernat
986528c67d
[Server] Add error message as argument to OnServerScriptCrash
2019-03-12 02:15:20 +02:00
David Cernat
552a94a0ca
[Server] Add OnServerScriptCrash script event
2019-03-10 00:46:40 +02:00
David Cernat
a508a0faf8
[Server] Turn GetArguments() from ScriptFunctions into Utils function
2019-02-24 01:43:04 +02:00
David Cernat
dcbc9d1831
[Client] Print cells for actor deaths
2019-02-21 21:51:02 +02:00
David Cernat
828c52138f
[Documentation] Update readme and credits
...
According to some legal advice I've received, the "TES3MP Team" is too ambiguous of a legal entity, so – with Koncord's agreement – the copyright is now assigned specifically to us, the project's developers.
2019-02-19 17:29:29 +02:00
David Cernat
69e7d3f2a7
[Documentation] Update credits
2019-02-14 13:07:54 +02:00
David Cernat
f3b8a5b909
[General] Check integrity of credits only on Windows clients
...
This avoids the problems that were encountered in Linux and macOS builds regarding this check while also still addressing the scenario where official Windows builds had their credits modified by people unrelated to the project.
2019-02-14 00:29:55 +02:00
David Cernat
a0ad0b29bc
Merge branch '0.7.0' of https://github.com/TES3MP/openmw-tes3mp into 0.7.0
2019-02-13 21:57:24 +02:00
David Cernat
222837976c
[Server] Fix type name warning for Player
...
The warning in Visual Studio was: "'Player': type name first seen using 'class' now seen using 'struct'"
2019-02-13 21:56:47 +02:00
Koncord
77386525f2
[General] Update Travis CI
2019-02-14 01:56:10 +08:00
David Cernat
c058dce346
[General] Clarify meaning of commit hash displayed on start
2019-01-31 13:39:06 +02:00
David Cernat
1df1515c7e
[Client] Add logging for invalid enchantmentIds in RecordHelper
2019-01-23 01:04:59 +02:00
David Cernat
999ce857c7
[Client] Add logging for records ignored due to their invalid baseIds
2019-01-23 00:48:06 +02:00
David Cernat
db7e09f441
[Client] Use more consistent logging when reading dynamic record packets
2019-01-23 00:38:05 +02:00
David Cernat
0fa116b47d
[Client] Remove useless lines in RecordHelper
2019-01-23 00:20:51 +02:00
Koncord
0df32accca
[Server] Fix ARM build
2019-01-21 12:02:02 +08:00
David Cernat
fd40e8c971
[Client] Prevent ObjectState spam by not resending an already sent state
2019-01-15 14:26:00 +02:00
David Cernat
6e47b65205
[Client] Set attribute increases & level progress after correct packets
...
Originally, the PlayerSkill packet contained skills, attribute increases and level progress. In 78441c769a
, the attribute increases were moved to the PlayerAttribute packet and the level progress was moved to the PlayerLevel packet, but – due to an oversight – attribute increases and level progress were still being applied to the local player only when a PlayerSkill packet was received, based on whatever values were stored from the last PlayerAttribute and PlayerLevel packets.
2019-01-11 14:26:13 +02:00
David Cernat
f481c85e07
[Client] Use ADD before REMOVE for PlayerInventory in repair/recharge
...
Previously, when recharging or repairing an item, the client sent a PlayerInventory packet to the server with the old version of the item that was supposed to be removed and then it sent a PlayerInventory packet with the new version of the item that was supposed to be added.
Unfortunately, the current CoreScripts make it so custom items using generated IDs have their records deleted when they are completely removed from the world, however briefly, even if they are added back immediately afterwards. In practice, this meant that – before this commit – recharging or repairing a custom item led to its removal from the player inventory stored on the server, followed by the deletion of its record, followed by its readdition to the inventory (but with the record staying deleted). Logging out and logging back in immediately prevented the player from receiving the item anymore because of its now non-existent record.
2019-01-11 13:08:26 +02:00
David Cernat
8a99f215f6
[Client] Add LocalPlayer::sendItemChange() variant with mwmp::Item arg
2019-01-11 12:54:47 +02:00
David Cernat
db9c1b9882
[Client] Add MechanicsHelper::getItem() for getting mwmp::Item from Ptr
2019-01-11 12:53:26 +02:00
David Cernat
799241e8c6
[Client] Use informative error message for RefData::setCount() issue
2019-01-11 08:16:29 +02:00
David Cernat
43f195f0c7
[Client] Use clearer debug for actor initializations
2019-01-05 23:27:35 +02:00
David Cernat
2e1d4a9449
[Server] Fix non-Windows builds
2019-01-05 22:11:58 +02:00
David Cernat
81e2e48561
[Client] Fix item magic casting synchronization for spell scrolls
...
Previously, spell scrolls were used up before their IDs could be included in attacks packets supposed to be sent for them.
2018-12-31 13:24:32 +02:00
David Cernat
d83160523f
[Client] Add items required for item magic casting when they are missing
2018-12-31 06:55:35 +02:00
David Cernat
433a69a588
[Client] Send all data for newly initialized LocalActors at least once
2018-12-31 04:36:59 +02:00
David Cernat
e70fd2cf3a
[Server] Accept clients with wrong password on servers with no password
2018-12-31 03:52:25 +02:00
David Cernat
eb52babf29
[Server] Print IP instead of name or PID for players unable to connect
...
The player name was always blank in such situations, providing no useful information. The PID was not useful in any way either.
2018-12-30 18:02:26 +02:00
David Cernat
e96091fd6b
[General] Use more consistent variable names for password, address, etc.
2018-12-30 17:23:12 +02:00
David Cernat
906d2a837d
[Client] Send PlayerInventory packets when recharging items w/ soulgems
2018-12-30 11:58:33 +02:00
David Cernat
71679934a1
[Client] Send PlayerInventory packets when repairing items
2018-12-30 09:39:46 +02:00
David Cernat
5d9893ee92
[Client] Set actor killer correctly for spells that do damage over time
...
Additionally, clean up comments related to other code that sets actor killers.
2018-12-30 07:40:11 +02:00
David Cernat
6e1504f0a1
[Server] Use clearer variable & function names in TimerAPI
2018-12-30 04:15:53 +02:00
David Cernat
42b5a8054f
[Server] Remove unusable position functions for players
2018-12-30 03:17:37 +02:00
Koncord
4ce0331f1b
[Server] Fix GCC build
2018-12-29 15:54:08 +08:00
Koncord
9343b8af2f
[Server] Remove unused function
2018-12-29 14:02:08 +08:00
Koncord
c2230a8a21
[Server] Add MP flag to the server if enabled
2018-12-29 12:03:01 +08:00
Koncord
a0e89208a0
[General] Fix standalone server build
2018-12-29 11:58:49 +08:00
Koncord
55cea491ca
[Server] Introduce MS VC++ 2017 support
2018-12-29 11:57:26 +08:00
Koncord
6af2400752
[Server] Remove usages of get/set env. Add GetModDir function
2018-12-29 11:40:31 +08:00
Koncord
b3456a8841
[Server] Fix invalidation of iterators
2018-12-29 11:10:20 +08:00
David Cernat
343dd8b5ea
[Client] Fix addition of items to player inventories
...
Previously, multiple stacks of the same item ID could overwrite data in each other because of how the logic in ContainerStore::add() works. For example, a stack of 5 grand soul gems with no souls would get added to the player, then the attempt to add a grand soul gem with a particular soul would retrieve the previous stack first before setting all of it to that soul, resulting in 6 grand soul gems with that soul.
2018-12-26 13:41:19 +02:00
David Cernat
76ac905efc
[Client] Send PlayerInventory packets when trapping souls in soulgems
2018-12-26 12:25:00 +02:00
David Cernat
f853368641
[Client] Fix loss of player items in ContainerStore::unstack()
...
Previously, unstacking items for a player led to a PlayerInventory packet being sent about the items' removal.
This change makes it so both a packet about their re-addition and their removal are sent instead, cancelling each other out, which is inelegant, but arguably preferable to complicating the sending of PlayerInventory packets again.
2018-12-26 12:24:26 +02:00
David Cernat
5e38e8abdb
[Server] Add GetArchitectureType() script function
...
Additionally, bring GetOperatingSystem() up-to-date by making it use the renamed function in Utils.
2018-12-17 11:55:50 +02:00
David Cernat
9fe54aa8c6
[General] Add getArchitectureType() to multiplayer Utils
...
Additionally, rename getOperatingSystem() into getOperatingSystemType() for clarity.
2018-12-17 11:46:51 +02:00
David Cernat
fa1700e2ab
[Server] Add GetOperatingSystemType() script function
2018-12-17 11:32:31 +02:00
David Cernat
da6b89c185
[General] Add getOperatingSystem() to multiplayer Utils
2018-12-17 10:47:34 +02:00
David Cernat
50714599d9
[Client] Spawn at exterior 0, -7 by default
2018-12-17 08:25:22 +02:00
David Cernat
afd17e5a48
[Client] Don't finish drag & drop that is supposed to be unsuccessful
...
This prevents items from vanishing when your attempt to drop them in a full container is denied.
2018-12-06 18:11:52 +02:00
David Cernat
a6c6db89fc
[Client] Send object packets when scripts use PlaceItem/PlaceItemCell
2018-12-05 01:56:27 +02:00
David Cernat
d05a82a734
[Client] Avoid repetitive code when unequipping items in resurrection
2018-12-04 03:55:03 +02:00
David Cernat
b5b26c6685
Merge pull request #492 from terabyte25/patch-7
...
[Client] Disallow opening inventory menu when not logged in
2018-12-01 23:17:05 +02:00
terrabyte25
35755eb1f1
[Client] Disallow opening inventory menu when not logged in
2018-12-01 10:51:33 -06:00
David Cernat
b7090b2550
[Server] Add experimental option for not crashing from Lua script errors
...
Additionally, fix return type of GetPluginEnforcementState()
2018-12-01 03:03:39 +02:00
David Cernat
b39e3f518b
[Client] Use correct log levels for inventory and dynamic record packets
2018-11-30 23:38:16 +02:00
David Cernat
d8ca268067
[Server] Move plugin enforcement functions to ServerFunctions
2018-11-30 22:43:10 +02:00
David Cernat
2933526995
[Server] Include errors related to Lua calls in server logs
2018-11-30 22:01:02 +02:00
David Cernat
ef80894c5c
Merge pull request #486 from testman42/patch-2
...
Use more descriptive terminology for chat modes
2018-11-17 23:19:17 +02:00
Testman
6b3f598837
Use more descriptive terminology for chat modes
...
Changed "Chat disabled" to "Chat hidden", "Chat enabled" to "Chat visible" and "Chat in hidden mode" to "Chat appearing when needed".
2018-11-17 16:54:14 +01:00
David Cernat
eb3ae95f0e
[Documentation] Display build status for correct branch
2018-11-16 06:40:21 +02:00
David Cernat
d3eb106c3b
[Documentation] Update readme for current situation
2018-11-16 04:49:14 +02:00
David Cernat
e834a4ec74
[Client] Find closest enchantmentCharge in getItemPtrFromStore()
...
Enchanted inventory items continuously recharge their enchantment charges, which getItemPtrFromStore() should account for.
Additionally, prevent framelistener errors caused by PlayerItemUse packets about non-existent items.
2018-11-13 20:36:31 +02:00
David Cernat
bc7bcae190
Merge pull request #484 from GrimKriegor/0.7.0
...
[General] Change the default plugins home location
2018-11-12 07:11:37 +02:00
Grim Kriegor
8f90f8a3b8
[General] Change the default plugins home location
2018-11-12 01:10:10 +00:00
Koncord
e162af0003
[Server] Disallow non void callbacks
2018-10-30 15:32:52 +08:00
Koncord
07a5f5296c
[Server] Rework OnRequestPluginList callback. Add AddPluginHash function
2018-10-30 14:56:54 +08:00
Koncord
20a7619a4a
[Server] Remove result from the OnPlayerConnect callback
...
Now it's recommended to use tes3mp.Kick() function
2018-10-30 13:18:32 +08:00
Koncord
f1e8569291
[Server] Remove result from the OnPlayerSendMessage callback
2018-10-30 13:13:07 +08:00
Koncord
efa362031e
[Server] Remove unused Main callback
2018-10-30 13:03:37 +08:00
Koncord
b83e4056a8
[Server] Remove CallFF dependency as it not fully supported by Windows and MacOS
2018-10-30 12:59:47 +08:00
Koncord
585557ad8a
[Server] Remove argument cast in the Call with va_args
2018-10-30 12:58:15 +08:00
Koncord
3101de5f02
[Server] Add kicked load status
2018-10-30 12:56:50 +08:00
Koncord
e5e13b21ae
[Client] Fix crash on drag&drop
2018-10-28 16:56:04 +08:00
David Cernat
c65d6c1328
[Client] Disable mListener methods in mwworld/containerstore
...
This should put an end to frequent crashes until I can fix the problem properly.
2018-10-27 02:19:45 +03:00
David Cernat
1baf82db32
[Client] Avoid PlayerSpellbook packet spam in some mods
2018-10-26 19:07:35 +03:00
David Cernat
d9bc1abf48
[Client] Don't send ObjectScale packets if not logged in
2018-10-26 02:33:47 +03:00
David Cernat
a8cf1e02c4
[Client] Allow unilateral scripted container changes not from console
...
This prevents infinite loops in certain client scripts from mods that use while loops to determine that all items of a certain type have been removed from a container, such as in the script BCSwap2Arg from Better_Clothes.
2018-10-25 22:38:45 +03:00
David Cernat
99f8ef88a5
[Server] Add SetObjectActivatingPid() script function
2018-10-22 16:25:50 +03:00
David Cernat
17f13872aa
[Client] Use forceUpdate correctly in LocalPlayer::updateStatsDynamic()
...
Previously, the forceUpdate argument was useless, preventing dynamic stats from being sent by certain newly created characters.
2018-10-22 13:22:23 +03:00
David Cernat
bfd7c83c4d
[Client] Fix backwards logic when setting type for AI attacks
2018-10-16 21:18:41 +03:00
David Cernat
d9dd7073cf
[General] Send certain packets only when logged in
...
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.
To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
2018-10-13 15:36:13 +03:00
David Cernat
66d666d60c
[Client] Use less confusing terminology when displaying plugin mismatch
2018-10-13 14:40:49 +03:00
David Cernat
bb834748c5
[Server] Log player kicks
2018-10-13 09:34:29 +03:00
David Cernat
a3111fbcc1
[Server] Use clearer error message when failing to bind port
2018-10-13 08:35:07 +03:00
David Cernat
3d40a162bc
Merge pull request #476 from SamHellawell/0.7.0-fix-equipcrash-linux-cleanup
...
Cleanup fix for equip item crash on Linux
2018-10-11 22:52:24 +03:00
Sam Hellawell
df1667b6e4
Cleanup fix for equip item crash on Linux
...
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2018-10-11 21:49:24 +01:00
David Cernat
db2b3e95b8
Merge pull request #475 from SamHellawell/0.7.0-fix-equipcrash-linux
...
Fix crash when equipping item on linux
2018-10-11 22:40:09 +03:00
Sam Hellawell
1e171ad9fd
Fix crash when equipping item on linux
...
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2018-10-11 20:13:22 +01:00
David Cernat
e402a17757
[Client] Don't cast non-weapons to weapons in isUsingRangedWeapon()
...
This makes lockpicks and probes work again.
2018-10-09 09:54:13 +03:00
David Cernat
292536439e
[Server] Rename script functions for clearing packet vectors for players
2018-10-03 02:26:47 +03:00
David Cernat
c79660f721
[Server] Make inventory script functions consistent with others
...
Functions that add elements to a vector should not change the action. This fixes the last remaining oddity in Koncord's original implementation of inventory sync.
2018-10-01 18:29:50 +03:00
David Cernat
8c7e06293f
[Documentation] Update changelog with attack synchronization details
2018-09-26 02:48:52 +03:00
David Cernat
b76e00c66e
[Server] Call OnPlayerCellChange script event near start of cell change
...
This makes it possible to send custom records used by players for their equipment before the hardcoded exchange of equipment packets takes place.
Additionally, remove the check for dead players because it has no real use and can potentially cause problems.
2018-09-26 02:40:21 +03:00
David Cernat
f100a660d4
[General] Fix ranged attack sync when using last throwing weapon or ammo
2018-09-24 11:30:53 +03:00
David Cernat
3f304866fd
[Client] Use clearer variable names in DedicatedPlayer::setEquipment()
2018-09-24 10:11:42 +03:00
David Cernat
995d20348f
[General] Always use correct ranged weapon & ammo for ranged attack sync
...
Previously, the player's currently selected weapon was being used in ranged attacks as in the original melee-oriented attack sync, which meant that shooting one type of projectile and then equipping another while the old projectile was still in the air turned the old projectile into the new projectile upon impact.
Additionally, avoid running most of the code in MechanicsHelper::assignAttackTarget() for non-hitting melee and ranged attacks.
2018-09-23 02:30:31 +03:00
David Cernat
db39c62e89
[Documentation] Update credits
2018-09-21 10:23:54 +03:00
David Cernat
b04ca28ece
Merge pull request #471 from testman42/patch-1
...
Update credits
2018-09-21 09:35:14 +03:00
David Cernat
b5f46ada73
[General] Synchronize projectile speed for ranged attacks
...
This is done by including the final attackStrength used for ranged attacks in packets and then applying it in WeaponAnimation::releaseArrow() on other clients.
2018-09-18 01:13:48 +03:00
David Cernat
7281f9fc42
[Client] Prevent unilateral paralysis of dedicated players & actors
...
This is a temporary workaround until active effect synchronization is implemented.
2018-09-16 15:34:57 +03:00
Testman
770d36ef67
Update credits
...
Reflect recent role changes
2018-09-15 17:00:13 +02:00
David Cernat
33a0886790
[Client] Fix synchronization of knockdown states
2018-09-15 04:59:06 +03:00
David Cernat
490303dc0b
[Client] Clean up MechanicsHelper::processAttack() slightly
...
The debug is now more descriptive and some code is now skipped for non-ranged attacks.
2018-09-15 04:11:43 +03:00
David Cernat
9d2dc96a2e
[Client] Use RANGED type for ranged attacks that haven't hit a target
2018-09-14 13:23:43 +03:00
David Cernat
af49f711ca
[Client] Add isUsingRangedWeapon() method to MechanicsHelper
2018-09-14 13:21:45 +03:00
David Cernat
3f6ca6f22b
[Client] Bring drawState fallback for actors up-to-date w/ attack types
2018-09-11 15:12:11 +03:00
David Cernat
9d2cf6629b
[Client] Fix logic for hand-to-hand attack sync
2018-09-11 15:07:44 +03:00
David Cernat
fcd31bf4a6
[General] Fix problems with the synchronization of ranged attacks
...
Projectile hits now send Attack packets with RANGED attacks, and their success or failure is now synchronized.
Strike enchantments no longer require a valid victim to be synchronized.
Additional debug messages have been added for attacks.
2018-09-11 11:56:45 +03:00
David Cernat
31a9b77f34
[Client] Reset hitPosition in MechanicsHelper::resetAttack()
2018-09-10 12:34:33 +03:00
David Cernat
7d221509cd
[Client] Move item magic hook to correct location
...
Previously, synchronization for strike enchantments was partially broken because it triggered the sending of ITEM_MAGIC attack packets, which are only supposed to be sent when a spell is cast from a magical inventory item.
2018-09-10 12:02:21 +03:00
David Cernat
c9ad411dd3
[Client] Fix logic for setting applyProjectileEnchantment in attack sync
2018-09-09 22:33:48 +03:00
David Cernat
8012d0d7b7
[General] Include hit position in PlayerAttack and ActorAttack packets
2018-09-08 05:29:49 +03:00
David Cernat
dcd4478028
[Client] Always stop sending weather updates when moving to an interior
2018-09-07 08:37:22 +03:00
David Cernat
113002ca19
[Client] Return early when processing actors that can't be initialized
2018-09-05 20:03:35 +03:00
Koncord
48f4792bc1
[Server] Add GetMaxPlayers, GetPort and HasPassword functions to API
2018-09-05 18:19:34 +08:00
David Cernat
3bd8aa82fe
[General] Reduce inventory-sending hooks to just 2 in ContainerStore
...
Whenever an item is added to or removed from the player's ContainerStore, that player sends a PlayerInventory packet with just that addition or removal.
This eliminates all the unnecessary packet spam related to oversized PlayerInventory packets that had existed in one form or another since the initial implementation of inventory sync in 1b259e2d33
Additionally, move booleans from BasePlayer to LocalPlayer when they are only needed on the client, and make the usage of the isReceivingQuickKeys boolean consistent with the new isReceivingInventory boolean by having them both in the processors of their associated packets.
2018-08-28 05:01:52 +03:00
David Cernat
ee3fc4a303
[Documentation] Update changelog for 0.7.0
2018-08-25 16:04:22 +03:00
David Cernat
9e58cc82bd
[Server] Set minimum updateRate when communicating with master server
2018-08-23 00:10:49 +03:00
David Cernat
be448e5b8e
[General] Use more appropriate update rate in server config
2018-08-23 00:06:28 +03:00
David Cernat
d1fa57ac14
[General] Switch to new official master server port when using old one
2018-08-22 13:49:17 +03:00
David Cernat
0658d39eaa
[General] Update ports used for master server in client & server config
2018-08-22 13:47:46 +03:00
David Cernat
03832f933b
[Client] Send only individual items in PlayerInventory packets
...
For a long time, whenever a PlayerInventory packet was sent, it contained all the items in the player's inventory, because that's how Koncord originally implemented it and I always had too many other priorities to go back and rework it.
From now on, clients only send PlayerInventory packet with the one item added or removed, with the single exception being trading with merchants, where the entire inventory is still sent for the time being.
2018-08-21 10:10:06 +03:00
David Cernat
75a64a69c7
[Server] Add GetInventoryChangesAction() script function
...
Additionally, fix a typo in the description of GetSpellBookChangesAction()
2018-08-21 10:06:40 +03:00
David Cernat
45b011452e
[Client] Combine methods for sending spell packets into a single one
2018-08-21 01:20:30 +03:00
David Cernat
140e0ed52c
[Client] Also clear aiActors when clearing ActorList
2018-08-20 20:54:34 +03:00
David Cernat
aed4ca2fd2
[Client] Allow use of baseId for more record types
...
Additionally, don't allow new enchantment records to be created if they have no effects, to avoid a crash.
2018-08-20 15:24:20 +03:00
David Cernat
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
2018-08-20 14:08:44 +03:00
David Cernat
7efee0e968
[Client] Fix GCC build
2018-08-20 10:15:30 +03:00
David Cernat
5bd2244898
[Client] Uninitialize DedicatedActors instantly in some situations
...
When LocalActors briefly become DedicatedActors as the result of a server script, the DedicatedActors are immediately uninitialized to avoid bugs like them jumping in place or rotating slightly.
Additionally, the playing of animations and sounds received in packets for DedicatedActors is no longer done during their next update, but is instead done instantly when the packets are received.
2018-08-16 03:50:41 +03:00
David Cernat
5fd4113978
[General] Implement sending of ActorSpeech packets from server scripts
2018-08-13 20:39:03 +03:00
David Cernat
338efdb705
[General] Fix issues with MechanicsHelper::getItemPtrFromStore()
2018-08-11 19:00:02 +03:00
David Cernat
aec0c5bd49
[Server] Make capitalization consistent for AI-related script functions
2018-08-11 18:57:36 +03:00
David Cernat
9598212aad
[Client] Don't add bound items to inventory as a result of item packets
...
Additionally, don't include bound items when sending PlayerInventory packets.
2018-08-11 16:05:37 +03:00
David Cernat
a3b9274365
[Client] Make it possible to check if an item ID belongs to a bound item
2018-08-11 16:02:09 +03:00
David Cernat
a1933e7bc2
[Client] Don't declare variable twice in LocalPlayer's setEquipment()
...
The variable equipmentItem is identical to currentItem, so it should not have been added in commit 58a6a8c3bc
Addditionally, use a more descriptive variable name than "a" for item Ptrs.
2018-08-11 15:28:03 +03:00
Marc Zinnschlag
1cfc1f9bdb
Merged pull request #1666
2018-08-10 12:23:17 +02:00
Marc Zinnschlag
0aedb3aada
Merged puil request #1808
2018-08-10 12:22:13 +02:00
Marc Zinnschlag
b67b17010d
Merged pull request #1826
2018-08-10 12:21:49 +02:00
Marc Zinnschlag
24212d58e8
Merged pull request #1861
2018-08-10 12:21:05 +02:00
Andrei Kortunov
ec9a1b0d05
Handle RootCollisionNode, attached to non-root node (bug #4311 )
2018-08-10 11:11:40 +04:00
Andrei Kortunov
cde95979d0
Fix combat engagement for creatures
2018-08-10 09:29:01 +04:00
David Cernat
5d66a9bb66
[Client] Fix path to MechanicsHelper in ProcessorPlayerItemUse
2018-08-09 22:33:22 +03:00
David Cernat
8df08c7d10
[General] Implement PlayerItemUse packet
...
Players can no longer unilaterally use items on themselves in their inventory. When they try to use an item, they send a PlayerItemUse packet to the server with the item's details. A serverside script can then check the item and either send the packet back to make the item use go through or drop it.
2018-08-09 18:25:20 +03:00
Andrei Kortunov
780648b584
Do not reset idle animations if we do not have ammo
2018-08-09 16:39:46 +04:00
Andrei Kortunov
df577babe9
Increase priority of 1st-person weapon animations to avoid issues with animation blending
2018-08-09 16:39:20 +04:00
Andrei Kortunov
71bcc11ba5
Apply only crossbow reload animation to upper body
2018-08-09 16:37:08 +04:00
Andrei Kortunov
a0d0e5d2db
Give jumping animations higher priority than movement ones
2018-08-09 16:19:03 +04:00
Andrei Kortunov
6a03aa6fdb
Reduce jittering during turning animations for player
2018-08-09 16:19:00 +04:00
Andrei Kortunov
cd92014533
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-09 16:19:00 +04:00
Marc Zinnschlag
fe19d8ff35
Merged pull request #1857
2018-08-09 13:52:51 +02:00
Marc Zinnschlag
a2a57cf694
Merged pull request #1858
2018-08-09 13:51:31 +02:00
Marc Zinnschlag
0f510011b3
Merged pull request #1852
2018-08-09 13:49:50 +02:00
Marc Zinnschlag
cb62936949
Merged pull request #1853
2018-08-09 13:47:17 +02:00
Bret Curtis
03bf599426
Merge pull request #1856 from Capostrophic/hidden
...
Revert untextured shapes rendering changes
2018-08-09 12:36:03 +02:00
Bret Curtis
144f37f9b3
Merge pull request #1860 from akortunov/warningfix
...
Do not use fall-through to avoid GCC warnings
2018-08-09 10:00:09 +02:00
Andrei Kortunov
126b2fdd42
Use the isPlayer variable to do not check if the current actor is player every time
2018-08-09 11:16:19 +04:00
Bret Curtis
0d976f2c5e
Merge pull request #1859 from Capostrophic/debug
...
Fix a bunch of MSVC warnings
2018-08-09 09:12:41 +02:00
Andrei Kortunov
57e1462417
Do not use fall-through
2018-08-09 11:01:23 +04:00
Capostrophic
348c6f848e
Fix a bunch of MSVC warnings
2018-08-09 02:27:33 +03:00
Andrei Kortunov
51af729305
Do not use headtracking in the 1st-person view (bug #4573 )
2018-08-08 23:29:03 +04:00
Andrei Kortunov
6202b4eca9
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-08 22:10:53 +04:00
Capostrophic
85208eff7f
Revert untextured shapes rendering changes
2018-08-08 21:10:00 +03:00
Bret Curtis
0c0379c1ef
Merge pull request #1855 from OpenMW/allow_msvc2015_failure
...
Update appveyor.yml
2018-08-08 17:20:27 +02:00
Bret Curtis
97bc9954d0
Update appveyor.yml
...
allow msvc2015 to fail
2018-08-08 16:36:25 +02:00
Capostrophic
e9e9c0dd6b
Fix guild guide fast travelling to exteriors time
2018-08-08 12:46:36 +03:00
Andrei Kortunov
b7859b3fa9
Cap underwater view distance (bug #4565 )
2018-08-08 13:22:40 +04:00
Capostrophic
bcd9cc4baa
Check the actor cell instead of the destination cell in fast travel price logic
2018-08-08 02:07:48 +03:00
Bret Curtis
a19d55e035
Merge pull request #1850 from Capostrophic/nodemask
...
Fix untextured shapes nodemask
2018-08-07 21:20:53 +02:00
Capostrophic
bda23c6ad6
Fix nodemask
2018-08-07 20:49:10 +03:00
Bret Curtis
a9729878d7
Merge pull request #1848 from Capostrophic/texturing
...
Don't render NiTriShapes without NiTexturingProperty (bug #4483 )
2018-08-06 08:34:23 +02:00
Capostrophic
a1e3b2e586
Don't render NiTriShapes without NiTexturingProperty (bug #4483 )
2018-08-05 16:24:24 +03:00
Marc Zinnschlag
b75b5d139a
Merged pull request #1845
2018-08-05 12:28:38 +02:00
Marc Zinnschlag
7a93d118d2
Merged pull request #1846
2018-08-05 12:26:56 +02:00
Marc Zinnschlag
31491fdbde
Merged pull request #1844
2018-08-05 12:25:10 +02:00
Capostrophic
7087bad580
Use special behavior for all topics with reserved names (bug #4557 )
2018-08-05 12:39:53 +03:00
Andrei Kortunov
1f4dd3b393
Make partial binary search case insensitive, as it supposed to be (bug #4558 )
2018-08-05 13:26:12 +04:00
David Cernat
888e1dfff8
[General] Allow setting of AI fight & dynamic stats in record packets
...
Additionally, allow the setting of the Autocalc flag for an NPC record based on an existing record.
2018-08-05 11:00:25 +03:00
Andrei Kortunov
b0f2e00e7f
Make forcegreeting a non-op for non-actor objects (bug #4553 )
2018-08-05 09:31:45 +04:00
Koncord
d03722b3f4
[Browser] Rework browser for improved stability & clarity
...
(cherry picked from commits 5c79e7106f
, 57353cdfff
, 15723adb9a
, 01a5196a92
, ed75563a94
, 3839a2dcfd
, 1fd16ba69c
, 66283943c5
, ba8613a179
, 5b8f4f3e92
, 35b771b19e
, 043eb224e2
, 05fac2f67d
)
2018-08-05 07:20:12 +03:00
Marc Zinnschlag
452a706047
Merged pull request #1837
2018-08-04 10:26:44 +02:00
Marc Zinnschlag
b6a919a2d1
Merged pull request #1838
2018-08-04 10:26:18 +02:00
Marc Zinnschlag
99c03d55f0
Merged pull request #1841
2018-08-04 10:25:52 +02:00
Marc Zinnschlag
2a621fedd1
Merged pull request #1842
2018-08-04 10:08:11 +02:00
Capostrophic
d15dcaff68
Don't adjust weapon rating according to weapon condition twice
2018-08-03 19:22:58 +03:00
Andrei Kortunov
dd6cb85783
Remove redundant changelog entry
2018-08-03 19:31:10 +04:00
David Cernat
6498bcb22b
[Server] Add script functions for getting player draw & sneak states
2018-08-03 18:26:44 +03:00
Andrei Kortunov
e2519226aa
Move boost include
2018-08-03 17:04:07 +04:00
Andrei Kortunov
eeffe2e557
Check if item model exists inside drag and drop functions
2018-08-03 16:42:43 +04:00
Andrei Kortunov
e4f862c0b9
Check if next char exists
2018-08-03 16:42:43 +04:00
Andrei Kortunov
c2a175c2e0
Move crash catcher wrapper to separate file
2018-08-03 15:51:17 +04:00
Capostrophic
725a9323c4
Merge branch 'master' into sound
2018-08-03 14:16:51 +03:00
Capostrophic
1d1eedc001
Update changelog
2018-08-03 14:15:58 +03:00
Capostrophic
2f44acafe2
Fix changelog
2018-08-03 14:15:03 +03:00
Capostrophic
4c7f3cf626
Merge branch 'master' into weaponpriority
2018-08-03 14:07:11 +03:00
Capostrophic
433c24562e
Update changelog
2018-08-03 14:06:09 +03:00
Andrei Kortunov
ac98797999
Add missing file
2018-08-03 15:05:13 +04:00
Marc Zinnschlag
4d280add81
Merged pull request #1843
2018-08-03 12:56:17 +02:00
Marc Zinnschlag
d7718aae9b
Merged pull request #1840
2018-08-03 12:54:56 +02:00
Marc Zinnschlag
eb5f558f6f
Merged pull request #1839
2018-08-03 12:53:55 +02:00
Marc Zinnschlag
79aaf0163a
Merged pull request #1833
2018-08-03 12:39:04 +02:00
Andrei Kortunov
712c9995db
Rename mIsScripted variable because its name is ambiguous
2018-08-03 12:01:31 +04:00
Andrei Kortunov
c454f1bdad
Use log file for editor (feature #4012 )
2018-08-03 09:05:08 +04:00
Capostrophic
9d85b7c2d3
Use the actual damage for deducting weapon rating
2018-08-02 15:20:07 +03:00
Capostrophic
73d5496711
Revert addition change
2018-08-02 13:01:23 +03:00
Capostrophic
16af1a6c1c
Replace 0 sound range values separately
2018-08-02 12:40:53 +03:00
Capostrophic
3ac030d75a
Handle explicit calls before handling quotes
2018-08-02 09:49:53 +03:00
Capostrophic
80f3bd9f86
Don't apply iWereWolfFleeMod to creatures
2018-08-02 08:36:15 +03:00
Capostrophic
fa6c205e5d
Make tab autocompletion work with explicit reference calls
2018-08-02 03:24:31 +03:00
Capostrophic
bec47dfb7c
Make ranged weapon bonus a distance-dependent multiplier
2018-08-01 19:57:05 +03:00
Andrei Kortunov
369ea7e177
Check if a temporary file was successfully closed
2018-08-01 20:36:29 +04:00
Capostrophic
382b68a081
Combat AI: take the actual hit chance in account when rating weapon
2018-08-01 19:27:19 +03:00
Andrei Kortunov
12144de8ed
Initialize missing variables
2018-08-01 20:18:37 +04:00
Andrei Kortunov
c0bed0fde2
Handle case when index < 0
2018-08-01 20:17:59 +04:00
Andrei Kortunov
770d86f9bd
Initialize cubeSize variable for 360 degrees screenshots correctly
2018-08-01 19:36:55 +04:00
Andrei Kortunov
a08048da4e
Avoid dereference after null check
2018-08-01 19:30:30 +04:00
Capostrophic
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
2018-08-01 17:31:35 +03:00
Marc Zinnschlag
1c13256456
Merged pull request #1829
2018-08-01 16:17:37 +02:00
Marc Zinnschlag
0e75e3816a
Merged pull request #1830
2018-08-01 16:16:30 +02:00
Marc Zinnschlag
8812f9ddfa
Merged pull request #1831
2018-08-01 16:15:34 +02:00
Marc Zinnschlag
0c507b74bc
Merge pull request #1832
2018-08-01 16:13:59 +02:00
Marc Zinnschlag
7c7af1da61
Merged pull request #1834
2018-08-01 15:47:09 +02:00
Marc Zinnschlag
e8139a5cc7
Merged pull request #1835
2018-08-01 15:46:31 +02:00
AnyOldName3
66c241337d
Merge pull request #1836 from OpenMW/water-shader-tabs
...
Sort out some tabs which snuck into the water shader
2018-08-01 14:08:16 +01:00
AnyOldName3
f717c9e56d
Sort out some tabs which snuck into the water shader
2018-08-01 14:07:02 +01:00
Capostrophic
4d48ede6f1
Add two missing gameplay settings to Advanced tab
2018-08-01 13:36:31 +03:00
Capostrophic
be2e7e9e09
Make casting caster-linked on-self effects no-op (bug #4378 )
2018-08-01 02:41:57 +03:00
Andrei Kortunov
5b92910829
Limit difficulty scaling, as mentioned in docs
2018-07-31 21:14:16 +04:00
Marc Zinnschlag
aac580da6b
Merged pull request #1828
2018-07-31 11:10:48 +02:00
Marc Zinnschlag
20d4e27f82
Merged pull request #1821
2018-07-31 10:51:32 +02:00
Andrei Kortunov
c07cc0dc40
Reset animation state after weapon unequipping
2018-07-30 22:24:25 +04:00
Andrei Kortunov
469bb29621
Do not try to handle shape controllers as node controllers
2018-07-30 21:45:17 +04:00
Andrei Kortunov
0f2c3ecb17
Rescale player avatar (bug #4539 )
2018-07-30 17:41:43 +04:00
David Cernat
8c40010c87
[General] Add missing inventoryBaseId to creatures in RecordDynamic
2018-07-30 10:59:03 +03:00
David Cernat
b57807407a
[General] Implement RecordDynamic packet, part 1
...
Spell, potion, enchantment, creature, NPC, armor, book, clothing, miscellaneous and weapon record data can now be sent in a RecordDynamic packet. Additionally, the packets include data related to associated magical effects (for spells, potions and enchantments), data related to default inventory contents (for creatures and NPCs) and data related to body parts affected (for armor and clothing).
The server now has associated script functions for setting most of the details of the above, with the main exception being individual creature and NPC stats.
Records can either be created entirely from scratch or can use an existing record (set via the baseId variable) as a starting point for their values. In the latter case, only the values that are specifically set override the starting values. Creature and NPC records also have an inventoryBaseId that can be used on top of the baseId to base their inventories on another existing record.
The client's RecordHelper class has been heavily expanded to allow for the above mentioned functionality.
When players create spells, potions and enchantments as part of regular gameplay, they send RecordDynamic packets that provide the server with the complete details of the records that should be created. When they create enchantments, they also provide the server with armor, book, clothing and weapon records corresponding to the items they've enchanted.
This functionality added by this packet was originally supposed to be exclusive to the rewrite, but I've gone ahead and tried to provide it for the pre-rewrite in a way that can mostly be reused for the rewrite.
2018-07-30 10:56:26 +03:00
Capostrophic
c79f96d0d2
Implement ranged crits (feature #3703 )
2018-07-29 19:42:44 +03:00
Andrei Kortunov
1d463d129d
Finish AiTarget package, if destination is blocked by other actor
2018-07-29 19:41:31 +04:00
Andrei Kortunov
75835c8326
Prevent NPC from chosing farther pathgrid node
2018-07-29 18:18:05 +04:00
Marc Zinnschlag
9e6cba09a6
Merged pull request #1827
2018-07-29 12:52:51 +02:00
Marc Zinnschlag
84de55fb46
Merged puil request #1824
2018-07-29 12:52:01 +02:00
Marc Zinnschlag
78121c1774
Merged pull request #1823
2018-07-29 12:49:50 +02:00
Marc Zinnschlag
3ba9229f47
Merged pull request #1815
2018-07-29 12:48:20 +02:00
Capostrophic
9c8e284ead
Fix quick key activation delay code (regression #4536 )
2018-07-29 12:52:29 +03:00
Capostrophic
84a871cac7
Actually enable is_pod test
2018-07-28 23:56:42 +03:00
Andrei Kortunov
6d5d0039ec
Make sure we apply OT_Murder only once
2018-07-28 20:45:33 +04:00
Andrei Kortunov
bc82dbbd1b
Do not try to find missing animated collision shape again and again
2018-07-28 16:49:00 +04:00
Andrei Kortunov
7e0df01c83
Do not optimize animated shapes (bug #3950 )
2018-07-28 16:48:57 +04:00
Andrei Kortunov
2d4ec86b8d
Provide launcher icons
2018-07-28 13:18:38 +04:00
Marc Zinnschlag
29a1899045
Merged pull request #1819
2018-07-28 11:13:37 +02:00
David Cernat
2dbf3893c0
[General] Compress item refIds in PlayerEquipment packets
2018-07-28 01:50:44 +03:00
David Cernat
2332423527
[Client] Fix extra qualification error in CellRef when compiling w/ GCC
2018-07-27 21:56:45 +03:00
David Cernat
7136329a94
[Client] Add World::updatePtrsWithRefId() method
...
This makes it possible to "reload" the Ptrs in active cells when changes happen to the ESM record that they are based on. In practice, the old Ptrs are deleted, their RefNums and MpNums are blanked out, and new Ptrs are created that use the same RefNum and MpNum as before.
The above has required me to also add a method called setRefNum() to CellRef to allow setting a RefNum on the fly.
There may be a more elegant implementation available for updatePtrsWithRefIds(), but it requires additional research.
2018-07-27 21:42:08 +03:00
Andrei Kortunov
28a02ac93b
Use file selection dialogue result (bug #4524 )
2018-07-27 21:25:21 +04:00
Marc Zinnschlag
b7c159e5b6
Merged pull request #1816
2018-07-27 12:09:10 +02:00
Marc Zinnschlag
c508938674
Merged pull request #1817
2018-07-27 12:06:51 +02:00
Marc Zinnschlag
bbb22643e8
Merge remote-tracking branch 'capostrophic/warning'
2018-07-27 12:05:26 +02:00
David Cernat
9497c7f6f2
[Client] Add back mistakenly removed setting of mpNums for spawns
2018-07-27 00:36:05 +03:00
David Cernat
25fcd09780
[Client] Add doesNpcExist() method to RecordHelper
2018-07-26 23:57:42 +03:00
David Cernat
7995466e3c
[Client] Check validity of refIds in ObjectSpawn packets
...
This reverts c7bcf70c32
because it provides a better solution to the problem solved there, while solving another related problem as well.
2018-07-26 23:57:22 +03:00
David Cernat
8d286657d4
[Client] Update messages when unilaterally creating custom objects
2018-07-26 23:32:31 +03:00
Capostrophic
f7887ab05f
Fix MSVC C4456 warning: declaration of 'stats' hides previous local declaration
2018-07-26 23:24:26 +03:00
David Cernat
c7bcf70c32
[Client] Ignore ObjectSpawn packets trying to spawn non-actors
2018-07-26 22:41:04 +03:00
David Cernat
d93b67ef21
[General] Sync soul refIds for items and add related script functions
2018-07-26 22:37:04 +03:00
David Cernat
f52364e05c
[Client] Always create new references for new creature disguises
...
Previously, attempts to reuse the same reference for multiple creature disguises led to movement animation issues, as well as a dynamic_cast error in Creature::getInventoryStore() that made a DedicatedPlayer vanish completely when they first lost their creature disguise, then disguised themselves as a creature that could not hold weapons and then disguised themselves as a creature that could hold weapons.
2018-07-26 21:08:12 +03:00
David Cernat
60bc7447d9
[Client] Rework RecordHelper and add methods for other record types
...
The usage of const_cast has been replaced with usage of MWWorld::getModifiableStore() and ESMStore::overrideRecord()
Methods whose names started with "update" now start with "override", for consistency with ESMStore's overrideRecord()
New methods have been added for "overriding" enchantment, potion and spell records, which actually leads to them being created with their already set refIds if they haven't been created yet, as per the description of ESMStore::overrideRecord(): "Insert a record with set ID, and allow it to override a pre-existing static record."
Usage of RecordHelper methods has been updated in DedicatedPlayer.
2018-07-26 21:01:59 +03:00
Capostrophic
51d369d4da
Add resumeGame method
2018-07-26 20:35:34 +03:00
David Cernat
4e78642273
[Client] Add getModifiableStore() to MWWorld
2018-07-26 20:05:36 +03:00
David Cernat
d778bc3b8a
[Server] Turn readWorldstate and writeWorldstate into static variables
2018-07-26 20:03:42 +03:00
David Cernat
c3ff273a22
[General] Add getVectorSize() and resetVector() to Utils
2018-07-26 20:01:58 +03:00
David Cernat
b4802e4201
[General] Use Time struct for time in BaseWorldstate
2018-07-26 19:01:27 +03:00
Andrei Kortunov
23d917df9c
Do not use magic numbers in capacity calculations
2018-07-26 18:06:36 +04:00
David Cernat
a4b588d1b5
[General] Add optional timestamps to journal entries in PlayerJournal
2018-07-26 04:36:12 +03:00
Capostrophic
e55f49be45
Fix issue 4494 number
2018-07-25 12:51:15 +03:00
Capostrophic
cac2bc768e
Fix NPC "can't teach more" message (bug #4494 )
2018-07-25 12:34:33 +03:00
David Cernat
ea8a41160c
[General] Make ActorAttack packet consistent with PlayerAttack
...
Additionally, fix a typo in PlayerAttack where a boolean argument was outside of the parentheses it should have been in.
2018-07-24 22:43:00 +03:00
David Cernat
b79221efcc
[Server] Rename variable i into index in ActorFunctions
2018-07-24 21:29:40 +03:00
David Cernat
8fbed1f808
[General] Remove custom data from PlayerSpellbook packet
...
It has never made sense to have custom spell data in PlayerSpellbook packets, so it has been removed.
2018-07-24 20:58:55 +03:00
David Cernat
2e0b6e4e3e
[Server] Rename variable i into index in script function arguments
...
Additionally, rename i into index in LangLua.
2018-07-24 20:14:51 +03:00
David Cernat
65de028e0d
Merge pull request #462 from OpenMW/master
...
Add OpenMW commits up to 23 Jul 2018
2018-07-23 23:19:17 +03:00
David Cernat
74fa1d0f01
[Client] Fix manual setting of inertial force
...
Actors who are on the ground have their inertial force ignored, so they are now made to not be regarded as being on the ground in World::setInertialForce()
2018-07-23 23:04:41 +03:00
David Cernat
b69e6b96e6
[Client] Use verbose logging level for LocalActor debug
2018-07-23 22:11:59 +03:00
Bret Curtis
84b80ae405
no spaces in assignment
2018-07-22 23:12:37 +00:00
David Cernat
36ac2d9de4
[Client] Set packetOrigin for all ObjectList packets sent
2018-07-23 01:39:43 +03:00
David Cernat
692ee01340
[Client] Add ScriptController w/ contextType-to-packetOrigin method
2018-07-23 00:48:23 +03:00
David Cernat
63a86f145d
[Client] Record type of each InterpreterContext for later checking
2018-07-23 00:46:07 +03:00
David Cernat
d4a84ac34a
[Server] Update script function descriptions for ObjectList origin
2018-07-22 23:08:32 +03:00
David Cernat
3165c84db4
[General] Rework PACKET_ORIGIN enum
...
Additionally, comment out reading of originClientScript in ObjectPacket for now.
2018-07-22 22:43:40 +03:00
David Cernat
9e6459043b
[General] Fix typo related to originClientScript in ObjectPacket
2018-07-22 20:29:27 +03:00
David Cernat
3dc2d1b214
[General] Add packetOrigin and originClientScript to ObjectList packets
...
Additionally, add script functions for getting the packetOrigin and originClientScript of received ObjectList packets.
2018-07-22 18:38:05 +03:00
David Cernat
b891acd46e
[Client] Send Container packets when items are added/removed via scripts
...
Additionally, disable unilateral addition and removal of items on clients, and expect the server to reply back with an approved addition or removal.
2018-07-22 17:04:17 +03:00
David Cernat
2189ea1a63
[Client] Clean up sending of Container packets
2018-07-22 16:43:27 +03:00
David Cernat
8c0b75d9f4
[Client] Limit PlayerEquipment packets sent by recharging enchantments
2018-07-22 15:30:40 +03:00
David Cernat
715cac807d
[General] Add compareFloats to Utils
2018-07-22 15:23:23 +03:00
David Cernat
cb6c37a26d
[General] Replace doubles with floats in BaseStructs and BaseWorldstate
2018-07-22 14:20:20 +03:00
David Cernat
18f8725d33
[Client] Remove tab character that somehow made its way into a comment
2018-07-22 10:29:14 +03:00
Bret Curtis
b910106713
Catch an unbound variable before it happens.
2018-07-22 07:17:34 +00:00
Bret Curtis
c959bdcf32
Merge pull request #1813 from rhtucker/master
...
Added CSS to drop shadow of figure images
2018-07-22 08:51:30 +02:00
Ryan Tucker
9f2ef1e68a
Added CSS to drop shadow of figure images
2018-07-21 13:33:56 -07:00
David Cernat
038757b91a
[General] Temporarily revert to original rotation animation sync
...
I originally added rotation animation sync as part of commit 068a45be87
. Unfortunately, it meant the PlayerPosition packets were now twice as large as they had been before, which was less than ideal for such a frequently sent packet, which is why Koncord switched to a more optimized approach in commits 5f30dfd5db
and d67db1a9bd
.
Recently, there have since been some rotation animation problems in OpenMW, which have broken the way Koncord's approach looks. My original approach still looks somewhat okay, so I'm switching back to it until we can figure out how to reuse it under the current circumstances.
2018-07-21 19:27:36 +03:00
Marc Zinnschlag
8b2b37c270
Merged merge request !28
2018-07-21 17:47:19 +02:00
Marc Zinnschlag
ddd5cbd17c
Initialise lock state of newly opened subviews (fixes issue #4520 )
2018-07-21 17:38:11 +02:00
David Cernat
3944c8aec6
[Client] Ignore WorldRegionAuthority packets that have an empty region
2018-07-21 18:28:31 +03:00
David Cernat
99e64bdcd7
[Client] Remove unused localWeather variable from Worldstate
2018-07-21 16:25:49 +03:00
David Cernat
cd1fc590a7
[Client] Differentiate itemPtr from actor Ptr in DedicatedPlayer method
...
This fixes a mistake from 8f7da49152
2018-07-21 16:14:07 +03:00
David Cernat
5466092582
[Client] Reduce log level for actor cell changes
2018-07-21 14:41:48 +03:00
David Cernat
20e0100706
[General] Rework Attack packets and add synchronization for item magic
2018-07-21 14:41:27 +03:00
David Cernat
0f0e8b7c08
[Client] Adjust log levels used for weather and global map
2018-07-21 12:08:31 +03:00
David Cernat
f1315ef30d
[Cllient] Differentiate itemPtr from actor Ptr in DedicatedActor methods
...
2427a4f877
mistakenly used the variable name "ptr" for both the actor and the items in that actor's inventory.
2018-07-21 10:16:51 +03:00
David Cernat
b6324e3532
[Client] Clean up debug for spell usage
2018-07-21 09:41:36 +03:00
David Cernat
826e64b40e
[Server] Rename isPlayerExists() into doesPlayerExist()
2018-07-21 07:34:45 +03:00
David Cernat
21d5bb4d4e
Merge pull request #460 from OpenMW/master
...
Add 0.7.0 commits up to 20 Jul 2018
2018-07-21 05:59:57 +03:00
David Cernat
6c50d4199b
Merge branch '0.7.0' of https://github.com/TES3MP/openmw-tes3mp into 0.7.0
2018-07-21 05:21:44 +03:00
David Cernat
421d0e7a99
[Client] Make forceWeather false by default for client-sent weather
2018-07-21 05:21:26 +03:00
David Cernat
892d71ce71
[General] Reimplement weather synchronization to allow soft transitions
...
Although weather sync was added by Koncord to the rewrite in fd721143e2
in a way that used surprisingly few lines of code, it relied on the server requesting weather states every second from authority players and sending them to non-authority players, while also allowing only very sudden weather transitions across regions, i.e. if there was one player in the Ascadian Isles who had stormy weather, and another player with clear weather in the Bitter Coast Region walked across to the Ascadian Isles, that player was instantly made to have stormy weather with no kind of transition at all.
My approach solves both of those problems. It solves the packet spam by only sending weather updates to the server when weather changes happen or when there are new arrivals to a weather authority's region, and it allows for both sudden weather transitions when players teleport to a region and for soft, gradual transitions when players walk across to a region. It is inspired by my previous actor sync, and uses a WorldRegionAuthority packet to set players as region authorities in a similar way to how ActorAuthority sets players as cell AI authorities. Weather changes are created only by the region authority for a given region, and weather packets are also only sent by that authority.
However, it should be noted that gradual weather transitions are used by default in this implementation. To use sudden weather transitions, the serverside Lua scripts need to forward WorldWeather packets with the forceWeather boolean set to true. That is, however, already handled by our default Lua scripts in situations where it makes sense.
2018-07-21 05:20:26 +03:00
Bret Curtis
4c9e1295e8
Merge pull request #1811 from akortunov/fallfix
...
Set movement speed to 0 when unconscious
2018-07-20 09:30:45 +02:00
Bret Curtis
a54b779672
Revert "Revert "remove breath/doxygen autodoc""
...
This reverts commit 038d5a5566
.
2018-07-19 23:27:39 +02:00
Andrei Kortunov
8281fd903f
Set movement speed to 0 when unconscious (bug #4519 )
2018-07-19 20:17:32 +04:00
Bret Curtis
ee3aba149d
Force RTD to not build any other types of docs.
2018-07-19 14:34:06 +00:00
Bret Curtis
038d5a5566
Revert "remove breath/doxygen autodoc"
...
This reverts commit f2fc8351bb
.
small fixes
2018-07-19 15:51:29 +02:00
David Cernat
b6db570d9c
[Client] Display uniqueIndexes in a less confusing way in console
2018-07-19 11:57:06 +03:00
Bret Curtis
105b172fb5
Merge pull request #1809 from akortunov/enumfix
...
Sort icons in the DataDisplayDelegate
2018-07-17 23:05:18 +02:00
Andrei Kortunov
5c16ce1d36
Sort icons in the DataDisplayDelegate
2018-07-17 22:49:51 +04:00
Marc Zinnschlag
78a2725169
Merged pull request #1806
2018-07-17 12:42:41 +02:00
Marc Zinnschlag
326a3e61f4
Merged pull request #1807
2018-07-17 12:42:12 +02:00
Marc Zinnschlag
0142525ea2
Merged merge request !26
2018-07-17 12:39:14 +02:00
Marc Zinnschlag
111407c282
Merged merge request !24
2018-07-17 12:26:23 +02:00
Andrei Kortunov
38fa4e0a8a
Do not play un-equipping animation when we switch to hand-to-hand
2018-07-17 14:10:04 +04:00
David Cernat
9823a77bf2
[General] Turn PlayerRegionAuthority into WorldRegionAuthority
...
WorldRegionAuthority is a Worldstate packet.
2018-07-17 09:21:13 +03:00
Miloslav Číž
3ff2740e59
Update CHANGELOG
2018-07-16 20:29:00 +02:00
Koncord
2e227c7af5
[Server] Do not allow to connect with an empty plugin list
2018-07-17 01:08:23 +08:00
Koncord
b5c957c473
[Server] Move PreInit code to preInit method
2018-07-17 00:58:37 +08:00
Koncord
1a9bf253f6
[Server] Simplify getPlayer methods, add isPlayerExists method
2018-07-17 00:29:45 +08:00
Koncord
193034f09c
[Documentation] Add copyrigts
2018-07-16 21:07:59 +08:00
Bret Curtis
e7e3dab130
Merge pull request #1804 from akortunov/guifixes
...
Show magic items count in spells window (feature #4509 )
2018-07-16 14:16:35 +02:00
Andrei Kortunov
edd5769022
Show magic items count in spells window (feature #4509 )
2018-07-16 14:11:03 +04:00
Bret Curtis
1430b64aaa
Merge pull request #1805 from akortunov/editor_markers
...
Use editor markers for lights and creatures levelled lists
2018-07-16 12:05:42 +02:00
Andrei Kortunov
30716344f2
Fix possible division by zero in the fatigue calculation (bug #4510 )
2018-07-16 13:24:12 +04:00
David Cernat
d5d3c0937f
[Client] Adjust log level for actor transfers in CellStore
2018-07-16 03:53:09 +03:00
David Cernat
35fdb833df
[Client] Verify integrity of credits file
2018-07-16 03:25:01 +03:00
David Cernat
72d286473b
[General] Move credits integrity error message to new ErrorMessages file
...
Additionally, use correct log level for credit integrity message on server.
2018-07-16 03:21:14 +03:00
David Cernat
0b5cb15f71
[General] Turn GameWeather into WorldWeather, now a WorldstatePacket
2018-07-16 02:20:43 +03:00
David Cernat
646111d998
[General] Use correct credits checksum and move it to Version.hpp
2018-07-16 01:05:56 +03:00
David Cernat
0f36c3ea24
[Server] Verify integrity of credits file
2018-07-15 22:50:16 +03:00
David Cernat
22b2b7a9c6
[General] Add Utils methods for checksums
2018-07-15 22:39:57 +03:00
David Cernat
9445db61b4
[Documentation] Update credits
2018-07-15 20:16:22 +03:00
Andrei Kortunov
6ddf6eb885
Use editor markers for lights and creatures levelled lists
2018-07-15 17:25:18 +04:00
Nikolay Kasyanov
21f198af7a
Fix debugger detection on macOS ( #4511 )
2018-07-15 12:36:01 +02:00
David Cernat
4ac371d292
[Server] Delete duplicate WorldKillCount processor with old filename
2018-07-15 05:49:19 +03:00
David Cernat
3649cf553f
[General] Rename PlayerKillCount into WorldKillCount
...
This should clarify the real meaning of the packet and its associated event.
The event itself has been renamed from OnPlayerKillCount to OnWorldKillCount.
2018-07-15 05:34:59 +03:00
David Cernat
18a2d238ab
[Client] Don't pop up dialogue screen when an NPC activates another NPC
2018-07-15 04:36:42 +03:00
David Cernat
4ef2aff11e
[Client] Remove "Not implemented" message when activating other player
...
Serverside scripts can now make lots of different things happen as the result of such activation, which is why the message was no longer current.
2018-07-15 04:16:40 +03:00
David Cernat
f13705e8be
[Client] Improve debug for ObjectActivate and ConsoleCommand
2018-07-15 04:09:19 +03:00
David Cernat
6ebe09375f
[General] Implement ObjectActivate packet & associated script functions
2018-07-15 03:16:04 +03:00
David Cernat
81b160cae8
[General] Add placeholder for ObjectActivate packet
2018-07-15 01:08:31 +03:00
David Cernat
61da0d2475
[General] Turn PlayerInteraction into PlayerInput
2018-07-15 00:36:07 +03:00
David Cernat
32b6134fad
[General] Add placeholder for CellReplace packet
2018-07-15 00:17:13 +03:00
David Cernat
a471f5e452
[General] Turn CellCreate into a Worldstate packet
2018-07-14 23:51:49 +03:00
David Cernat
ae55ee7f0b
[General] Add getNumberOfDigits to Utils in components
2018-07-14 23:51:49 +03:00
David Cernat
f410cb90d8
Merge pull request #459 from GrimKriegor/bug/missing-luajit-on-pipeline
...
[Pipeline] Add missing LuaJIT dependency
2018-07-14 22:38:19 +03:00
David Cernat
98ff44172a
Merge pull request #458 from GrimKriegor/hotfix/crashcatcher-sdl-build-issue
...
[General] Temporarily disable the new OpenMW crash catcher
2018-07-14 22:37:36 +03:00
Grim Kriegor
2fcde5e8ba
[General] Temporarily disable the new OpenMW crash catcher
...
This new crash catcher is preventing TES3MP from building on GNU/Linux
`components/crashcatcher/crashcatcher.cpp:23:28: fatal error: SDL_messagebox.h: No such file or directory`
Disable it until the developers isolate the issue and patch it
2018-07-14 19:46:47 +01:00
Grim Kriegor
88e4927146
[Pipeline] Add missing LuaJIT dependency
2018-07-14 19:39:19 +01:00
David Cernat
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
2018-07-14 03:57:05 +03:00
David Cernat
6d43c8d63d
[Client] Send ActorAI with combat when an NPC's fight is set to 100
2018-07-14 02:55:38 +03:00
David Cernat
743933134d
[Client] Simplify sending of ActorAI packets for uninitialized actors
2018-07-14 01:00:27 +03:00
David Cernat
5f4ec1331f
[Client] Send ActorAI packet when combat is started via a client script
2018-07-14 00:07:15 +03:00
David Cernat
cc9e294cc0
[Client] Send ActorAI packet for new cell after being followed to it
2018-07-13 22:34:36 +03:00
David Cernat
528bd26a3b
[General] Allow followers to follow non-authority players through cells
2018-07-13 21:27:29 +03:00
David Cernat
ab5fd0aef8
[Server] Clean up descriptions for Object script functions
2018-07-13 04:55:05 +03:00
David Cernat
6c1173d598
[Client] Rename searchPtrViaRefIndex into searchPtrViaUniqueIndex
2018-07-13 04:33:54 +03:00
David Cernat
09da24f1ea
[General] Rename all instances of refNumIndex into refNum
...
This creates symmetry with mpNum and should cause less confusion in the future.
2018-07-13 04:12:03 +03:00
David Cernat
20296859ee
[Server] Clarify functions used for getting data in Networking
2018-07-13 02:40:24 +03:00
David Cernat
04dd59e638
[Server] Use clearer names for functions used to get last received data
...
Additionally, rename GetObjectChangesSize() into the less confusing GetObjectListSize()
2018-07-13 02:33:50 +03:00
David Cernat
aeb2e57444
[Server] Bring Actor functions in line with Object functions, part 2
...
The ActorPacket-sending functions now have sendToOtherVisitors and skipAttachedPlayer arguments, except for the ones for ActorList and ActorAuthority (because such arguments don't make sense for those).
2018-07-13 01:25:43 +03:00
David Cernat
837c5369c0
[Server] Add OnActorAI event and remove autosync for ActorAI packets
2018-07-13 01:05:27 +03:00
David Cernat
8f745df055
[Server] Bring Actor functions in line with Object functions, part 1
...
The last received ActorList can now be copied into the write-only ActorList that can be sent in packets. Changing the pid of the write-only ActorList can now be done separately from clearing its contents.
2018-07-13 01:04:41 +03:00
David Cernat
f0d4f1bbe5
[Client] Send ActorAI packets when followed by an NPC
...
The packet is sent regardless of whether we are the cell authority or not, so the server can decide what it wants to do with it.
2018-07-12 23:08:17 +03:00
David Cernat
6316f1e590
[Client] Add ActorList methods for sending ActorAI packets
...
Additionally, use consistent capitalization for AI-related methods.
2018-07-12 20:48:47 +03:00
David Cernat
0fd8f7660b
[Client] Replace LocalActor arg with BaseActor in ActorList functions
2018-07-12 20:15:04 +03:00
Marc Zinnschlag
0bd6078826
Merged pull request #1789
2018-07-12 18:56:59 +02:00
Andrei Kortunov
32bd294a8a
Add missing changelog entries
2018-07-12 16:39:46 +04:00
Andrei Kortunov
3d1daaebab
Rework manual spellcasting (e.g. via scripts)
2018-07-12 16:24:25 +04:00
David Cernat
bdf2f03c4f
[General] Remove unnecessary MapChanges struct from BaseWorldstate
2018-07-12 05:06:31 +03:00
David Cernat
59a56ca35e
[Client] Disallow clients from scaling their associated players
...
Additionally, display messages when trying to scale players.
2018-07-12 03:29:38 +03:00
David Cernat
8ca29dbaac
[Client] Fix remaining mistakes in debug for received ActorAI packets
2018-07-11 23:11:37 +03:00
David Cernat
5bb442bbd3
[Server] Add sendToOtherVisitors boolean to SendActorAI()
...
Additionally, avoid repetition in functions that send Actor packets.
2018-07-11 22:17:00 +03:00
David Cernat
25f7a55495
[Client] Improve debug for received ActorAI packets
2018-07-11 19:54:56 +03:00
David Cernat
ceea65f666
[General] Change pre-rewrite's version to 0.7.0-alpha
2018-07-11 19:35:28 +03:00
Miloslav Číž
4e3bc3e403
Change wave parameters based on weather
2018-07-11 17:03:59 +02:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
...
Use the DejaVuLGCSansMono.ttf for profiler output
2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d
Use the DejaVuLGCSansMono.ttf in profilier output
2018-07-11 14:41:49 +04:00
Marc Zinnschlag
2d919ba215
changelog cleanup
2018-07-11 10:10:38 +02:00
Marc Zinnschlag
232be000a2
Updated credits file
2018-07-11 10:09:31 +02:00
Marc Zinnschlag
5080a65910
Merged pull request #1796
2018-07-11 10:08:44 +02:00
Marc Zinnschlag
ee759effce
Merged pull request #1798
2018-07-11 10:06:30 +02:00
Marc Zinnschlag
fa96154edd
Merged pull request #1803
2018-07-11 10:04:59 +02:00
David Cernat
7a646494ee
[General] Point to serverCore.lua instead of server.lua in server config
2018-07-11 02:53:40 +03:00
elsid
686830a6e3
Update changelog
2018-07-10 23:52:51 +03:00
elsid
3f21c49479
Put check for nif file name into separate function
2018-07-10 23:46:06 +03:00
elsid
2599aba196
Fix check whether file name starts with x or X
...
If path doens't contains / or \, then slashpos will be 0.
Therefore slashpos + 1 = 1 doesn't point to first symbol.
xmesh.nif
^
slashpos + 1
2018-07-10 23:46:06 +03:00
David Cernat
bff6e9e235
[General] Implement ActorAI packet, part 5
...
Allow repetition for AiWander package to be turned on and off.
2018-07-10 23:18:32 +03:00
Andrei Kortunov
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
2018-07-11 00:06:21 +04:00
Capostrophic
3186edc630
Update changelog
2018-07-10 22:22:20 +03:00
Capostrophic
5cb9dc9d12
Use SpellTurnLeft/TurnRight animation groups
2018-07-10 22:19:56 +03:00
Bret Curtis
b390ce3002
Merge pull request #1776 from akortunov/crossbowfix
...
Apply weapon reload animations only for upper body
2018-07-10 19:16:23 +02:00
Bret Curtis
df1576fcf5
Merge branch 'master' into crossbowfix
2018-07-10 19:15:37 +02:00
Bret Curtis
fde46f03b3
Merge pull request #1801 from terabyte25/terabyte25-trainingskill
...
Update trainer skill cap based off modified skill instead of based skill
2018-07-10 16:54:28 +02:00
terrabyte25
76fa8a163d
Update CHANGELOG.md
2018-07-10 17:09:14 +04:00
Andrei Kortunov
1c35e20fcc
Use 1h animations as fallback for crossbows
2018-07-10 17:02:51 +04:00
Andrei Kortunov
75dcbea365
Apply weapon reload animations only for upper body
2018-07-10 17:00:48 +04:00
Bret Curtis
3f63e625cf
Merge pull request #1802 from Capostrophic/cmake
...
Update CMake lists for Windows (task #2490 )
2018-07-10 14:34:59 +02:00
Capostrophic
d000f2756e
Update disabled warnings
2018-07-10 14:20:26 +03:00
Capostrophic
21403f8920
Update changelog
2018-07-10 14:20:26 +03:00
Capostrophic
7fd66c77e6
Update CMake lists for Windows
...
Don't use the debug console on Release-mode builds
Disable spammy 4297 and 5032 warnings that are not specific to OpenMW
2018-07-10 14:20:25 +03:00
Bret Curtis
5a1dba6a09
Merge pull request #1800 from akortunov/buildfix
...
Fix build with MSVC
2018-07-10 13:13:13 +02:00
Andrei Kortunov
c921d1c7e9
Refactor NifStream class (eliminate LNK4221 MSVC warning)
2018-07-10 13:32:52 +04:00
David Cernat
2e31c212c0
[Client] Make any ActorAI packet override an actor's desire to fight
2018-07-10 11:33:07 +03:00
David Cernat
79ee976c95
[Client] Implement ACTIVATE action in DedicatedActor::setAI()
...
Additionally, clean up usage of CreatureStats in DedicatedActor.
2018-07-10 11:31:51 +03:00
David Cernat
0f30e21312
[Client] Add searchPtrViaRefIndex method to World to easily find objects
2018-07-10 11:30:32 +03:00
Andrei Kortunov
27a5da59ba
Fix MSVC warnings C4456
2018-07-10 11:29:39 +04:00
Andrei Kortunov
16a4df25d6
Make void function to do not return value
2018-07-10 09:36:39 +04:00
David Cernat
c984fc0881
[Client] Allow AiActivate to be used with specific Ptrs, not just refIds
2018-07-10 08:21:24 +03:00
David Cernat
00c13ae96c
[General] Implement ActorAI packet, part 4
...
The server can now make actors activate players and objects, at least in theory. In practice, OpenMW''s AiActivate package needs to be worked so it allows specific objects as targets instead of just refIds.
2018-07-10 07:07:37 +03:00
David Cernat
0e13207afe
[General] Implement ActorAI packet, part 3
...
The server can now cancel actor AI, make actors travel to a location, make actors wander, and make actors get escorted by a player or another actor.
2018-07-10 05:07:58 +03:00
David Cernat
5baef09f79
[General] Implement ActorAI packet, part 2
...
The server can now make actors start combat with players or other actors.
2018-07-10 02:47:52 +03:00
David Cernat
5628f3b977
[Client] Fix debug for DedicatedActor::setAI()
2018-07-10 02:05:10 +03:00
David Cernat
b86155dc11
[Client] Allow AiFollow package to have infinite distance when desired
2018-07-10 01:40:57 +03:00
David Cernat
864c66d1d4
[Client] Make sure hasAiTarget is set correctly for DedicatedActors
2018-07-10 01:35:38 +03:00
David Cernat
26ac29e8b1
[Client] Add disclaimer to save dialog about singleplayer-only saves
2018-07-09 22:55:11 +03:00
David Cernat
4d4bced929
[Client] Allow singleplayer-only saves in main menu during multiplayer
2018-07-09 22:53:18 +03:00
terrabyte25
48296a7452
Update trainingwindow.cpp
2018-07-09 23:13:52 +04:00
Marc Zinnschlag
0bdd8f7d03
Merged merge request !19
2018-07-09 17:43:22 +02:00
Marc Zinnschlag
34c7181afc
Merged merge request !21
2018-07-09 17:36:48 +02:00
Alexander Stillich
5abc3bd320
Merge branch 'opencs-crash-handler' of gitlab.com:docwest/openmw into opencs-crash-handler
2018-07-09 16:27:33 +02:00
Alexander Stillich
725cc94210
Renamed cc_install to something less cryptic (crashCatcherInstall)
2018-07-09 16:25:55 +02:00
Alex S
d4d2077174
Fixed changelog entry
2018-07-09 16:25:55 +02:00
Doc West
a6f962156c
Updated change log
2018-07-09 16:25:55 +02:00
Doc West
467989cdd5
Moved crashcatcher to a component and also use it in CS
...
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
2018-07-09 16:25:55 +02:00
Alexander Stillich
1786211b83
Merge branch 'revert-update-fix' of gitlab.com:docwest/openmw into revert-update-fix
2018-07-09 16:24:41 +02:00
Alexander Stillich
1177e5ac79
Issue a single dataChanged() when the modified column changes
2018-07-09 16:23:50 +02:00
Doc West
d26b5a13ef
Fixed comment
2018-07-09 16:23:50 +02:00
Doc West
01b8ce5f70
Notify views of changes in all columns when updating the ColumnId_Modification column
2018-07-09 16:23:50 +02:00
Doc West
4a6457c346
Changed the way the revert command works: it now clones the changed record and uses the new RecordBase::revert() method to restore the previous value
...
Added Flag_Dialogue_Refresh to var type and var value columns so that sub views update properly
2018-07-09 16:23:50 +02:00
Doc West
4222b44dbb
Updated change log
2018-07-09 16:23:50 +02:00
Doc West
143eadb58e
Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates.
2018-07-09 16:21:53 +02:00
Doc West
4780f1b2bd
Notify views of changes of all cells in a row to properly update the row after revert
2018-07-09 16:21:53 +02:00
Alexander Stillich
78a5799911
Issue a single dataChanged() when the modified column changes
2018-07-09 16:05:06 +02:00
Bret Curtis
8834396cdd
Merge branch 'patch-1' into 'master'
...
Update documentationHowTo.rst
See merge request OpenMW/openmw!22
2018-07-09 14:05:05 +00:00
Bret Curtis
13d8fba223
Merge pull request #1797 from Capostrophic/moveobject
...
Fix double call of addContainerScripts on player in moveObject (bug #4490 )
2018-07-09 15:16:04 +02:00
Bret Curtis
7f4320feb0
Merge pull request #1799 from lysol90/patch-1
...
Updates to the texture modding page
2018-07-09 15:14:43 +02:00
Joakim Berg
ba15d0a848
Fixed spelling error
2018-07-09 10:19:32 +00:00
Capostrophic
d09c327b20
Update changelog
2018-07-09 12:36:19 +03:00
Joakim Berg
efcad5e751
Updates to the texture modding page
...
There were some errors in the texture modding page about normal maps, so I did a quick change. Please do review if I made some errors, spelling or factual.
2018-07-09 08:58:01 +00:00
Capostrophic
14d3b213a1
Fix double call of addContainerScripts on player in moveObject ( fixes #4490 )
2018-07-08 23:08:57 +03:00
David Cernat
6ff7fa525e
[Client] Disable autosaving when waiting
2018-07-08 23:04:30 +03:00
Bret Curtis
a3a002e008
Merge pull request #1790 from rhtucker/master
...
Migrating necessary parts of Wiki over to RTD.
2018-07-08 20:59:08 +02:00
Marc Zinnschlag
caad14093e
Merged pull request #1795
2018-07-08 11:01:27 +02:00
David Cernat
04ba324290
[Client] Disable clientside disabling and enabling of objects
2018-07-08 03:31:48 +03:00
David Cernat
5043fb4246
[Client] Disable clientside disarming of traps
2018-07-08 02:38:10 +03:00
David Cernat
cbb9817913
[Server] Add missing descriptions for PlayAnimation() and PlaySpeech()
2018-07-08 02:03:33 +03:00
David Cernat
6ba9b1742b
[Server] Remove unused default parameters for script functions
2018-07-08 01:05:54 +03:00
David Cernat
acdaf1a282
[Client] Disable clientside deletion of objects through console/scripts
...
Unfortunately, disabling clientside deletion of summons and items that can be picked up requires extra work on actors and inventories respectively, to avoid buggy situations.
2018-07-08 00:39:07 +03:00
David Cernat
8d9fde810e
[Client] Disable clientside scaling of objects
2018-07-08 00:28:31 +03:00
David Cernat
f3892d697b
[Client] Disable clientside locking and unlocking of objects
2018-07-08 00:06:01 +03:00
David Cernat
563269d359
[Server] Bring comments up-to-date for packet-sending script functions
2018-07-07 20:16:36 +03:00
David Cernat
2f1ef049d2
[Server] Turn sendToAttachedPlayer into skipAttachedPlayer
...
Unfortunately, default values set in the C++ code for our script function parameters don't actually seem to work, and they always default to false because they receive a nil value from Lua. As a result, to not break compatibility with previous scripts, I've decided to use a skipAttachedPlayer argument instead so it can default to false while still providing the same benefits that sendToAttachedPlayer provided.
2018-07-07 20:08:59 +03:00
Ryan Tucker
380384ff39
Migrated textures section of wiki.
2018-07-07 10:08:13 -07:00
David Cernat
141e404ed9
[Server] Move server administration functions to ServerFunctions class
2018-07-07 19:40:22 +03:00
David Cernat
c0fde5ae97
[General] Add explanation about 0.0.0.0 to server config file
2018-07-07 19:33:54 +03:00
David Cernat
6041425122
[Server] Move Chat functions to new ChatFunctions class
2018-07-07 19:20:25 +03:00
David Cernat
6a3fbf4e98
[Server] Use consistent arguments for script functions that send packets
...
Previously, there was a confusing separation between script functions that had a "broadcast" argument and script functions that had a "toOthers" argument.
Those with broadcast sent the packet to all players on the server when broadcast was true. Those with toOthers sent the packet to all players other than the packet's attached player.
The former was based on the pattern of the original SendMessage() script function. The latter more closely resembled RakNet's own broadcast argument as seen here:
https://github.com/TES3MP/CrabNet/blob/master/include/raknet/RakPeer.h#L219
This commit makes it so all sending functions have a sendToOtherPlayers argument that is false by default and a sendToAttachedPlayer that is true by default. This should simultaneously allow sending to be more intuitive, while not breaking previous existing scripts to a significant degree.
Additionally, this commit also reduces some code repetition for all instances of packet-fetching in script functions.
2018-07-07 18:29:31 +03:00
David Cernat
14e4f64296
[Server] Add GetVideoFilename() and SendVideoPlay() script functions
2018-07-07 17:09:57 +03:00
David Cernat
3ed9d89280
[General] Use separate variables for video & music filenames in packets
2018-07-07 14:40:35 +03:00
David Cernat
509882b5f6
[Client] Rework MechanicsHelper::getTarget() to avoid crashes
2018-07-07 11:43:57 +03:00
David Cernat
7f0549fc4f
[Server] Remove hardcoded sync for VideoPlay and add OnVideoPlay event
2018-07-06 23:37:57 +03:00
David Cernat
ae8b5a0709
[Server] Remove hardcoded sync for Place, Spawn & other Object packets
2018-07-06 23:36:28 +03:00
David Walley
b5abe6a230
Update documentationHowTo.rst
...
Add a section, under the provisional name "Baby Steps" to describe a minimal process for editing/contributing. Basically just create an account on GitLab, fork openmw there, then edit the relevant document to create Merge Request
2018-07-06 19:06:32 +00:00
David Cernat
e3e1cfc549
[Client] Add forgotten comparison in crimeTime and deathTime check
2018-07-06 20:49:08 +03:00
Capostrophic
bded697f07
Make Goodbye block using hyperlinks
2018-07-06 19:38:36 +03:00
David Cernat
4eb72eecb1
[Client] Fix crash for invalid CellRefs in MechanicsHelper::getTarget()
2018-07-06 18:39:14 +03:00
Bret Curtis
f4146d0079
Merge branch 'patch-1' into 'master'
...
Update documentationHowTo.rst - extend to integrate GitLab into PyCharm
See merge request OpenMW/openmw!20
2018-07-06 14:50:12 +00:00
David Cernat
4b30a44816
[Client] Compare crimeTime and deathTime when NPCs forgive player crimes
...
Previously, all crime witnesses stopped being hostile to a respawning player for as long as the player's diedSinceArrestAttempt was true. That meant that, in an area with no guards to arrest the player, crime witnesses did not enage in combat with the player at all ever again until diedSinceArrestAttempt became false.
This commit makes it so the time of the last crime is recorded for each witness, and that is then compared with the time of the LocalPlayer's last death for a one-time crime forgiveness during that player's current life.
This is essentially a gameplay adjustment for "singleplayer with respawns," and will have to be reworked to make sense for every player in multiplayer, though that requires reworking the crime system as a whole and is thus on hold.
2018-07-06 14:17:54 +03:00
Marc Zinnschlag
d9de8ccb5b
Merged pull request #1781
2018-07-06 11:55:45 +02:00
Marc Zinnschlag
dd08194c75
Merged merge request !18
2018-07-06 11:37:15 +02:00
Marc Zinnschlag
7ba512b389
Merged merge request !17
2018-07-06 11:27:35 +02:00
Bret Curtis
94ea9e7dd0
Merge pull request #1793 from Capostrophic/death
...
Ensure forward-compatibility of death animations of pre-0.43.0 saves (bug #4274 )
2018-07-06 10:23:51 +02:00
Alex S
6a2b8f7e85
Fixed changelog entry
2018-07-06 08:14:26 +00:00
David Cernat
c23fc3446f
[Client] Avoid sending map tiles for Wilderness cells
2018-07-06 03:54:34 +03:00
David Cernat
17c234d9ca
[Client] Use initial values for LocalPlayer and LocalActor killers
2018-07-06 02:07:55 +03:00
David Cernat
3e52857e2b
[General] Fix build for client and construction set
2018-07-06 01:10:22 +03:00
David Cernat
97cd3effa7
[Client] Make actor debug consistent with object debug
2018-07-06 00:32:45 +03:00
Doc West
6a78379757
Updated change log
2018-07-05 22:59:29 +02:00
Doc West
03c75794c1
Moved crashcatcher to a component and also use it in CS
...
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
2018-07-05 22:55:19 +02:00
Capostrophic
33c462c3c2
Update changelog
2018-07-05 22:56:09 +03:00
Capostrophic
9abfabb065
Ensure forward-compatibility of death animations in old saves ( fixes #4274 )
2018-07-05 22:49:40 +03:00
David Cernat
b0bd12f9dd
Merge branch '0.6.3' of https://github.com/TES3MP/openmw-tes3mp into 0.6.3
2018-07-05 22:28:40 +03:00
David Cernat
c075496748
[General] Replace deathReason in death packets with a killer variable
...
Add serverside script functions for determining the killers of both players and actors.
Use unsigned ints for script functions returning an object or actor's refNumIndex or mpNum.
Remove updateDeadState() from LocalPlayer and make its code part of updateStatsDynamic() for simplicity.
2018-07-05 22:24:51 +03:00
David Cernat
934e592bdb
[Server] Make spacing in CharClass consistent with other categories
2018-07-05 20:27:42 +03:00
David Cernat
e8ce009521
[Server] Use regular int as return value for GetObjectSummonerPid()
...
Additionally, clarify descriptions of script functions for getting information about summoners.
2018-07-05 20:26:23 +03:00
David Cernat
f02492a593
[General] Temporarily include target names in mwmp::Target
...
These will be removed once the server can get the names matching refIds by reading content files.
2018-07-05 19:40:28 +03:00
Doc West
b8e53b5b81
Fixed comment
2018-07-05 18:10:43 +02:00
Doc West
e187733811
Notify views of changes in all columns when updating the ColumnId_Modification column
2018-07-05 18:03:55 +02:00
Doc West
f9b565a46e
Removed QDebug include, moved updateUndoRedoAction to an anonymous namespace
2018-07-05 17:29:58 +02:00
Doc West
61109d70b1
Removed invalid / unused signal / slot connection
2018-07-05 17:21:32 +02:00
David Cernat
691b332d03
[Client] Use MechanicsHelper::getTarget() for summoners in ObjectList
2018-07-05 16:38:03 +03:00
David Cernat
130a32ebb0
[Client] Add new methods for handling mwmp::Target in MechanicsHelper
2018-07-05 16:36:52 +03:00
Koncord
7a032baaa3
[General] Move OSG hack to ELSE branch
2018-07-05 21:08:41 +08:00
Koncord
533cd9cdec
[General] Fix FindRakNet
2018-07-05 19:49:33 +08:00
Koncord
470ea50b54
[General] Use LuaJit instead default Lua
2018-07-05 19:21:53 +08:00
David Walley
9ebcd65634
Update docs/source/reference/documentationHowTo.rst
2018-07-05 10:58:52 +00:00
Bret Curtis
b36bd75b59
Merge pull request #1792 from Capostrophic/character
...
Make spellcasting stance transition more smooth (bug #4358 )
2018-07-05 11:45:31 +02:00
David Walley
d03f9125e3
Update documentationHowTo.rst - extend to integrate GitLab into PyCharm
...
A subsequent MR will suggest moving most of this to a separate document for intermediate-level contributors, and replacing it with much simpler instructions for beginners - basically edit directly on GitLab as suggested by Psi29a on the forum here - https://forum.openmw.org/viewtopic.php?f=43&p=56458#p56457
2018-07-05 08:45:09 +00:00
David Cernat
32ad8ef2f0
[General] Fix incorrect capitalization in ObjectMove directives
2018-07-05 06:07:10 +03:00
David Cernat
bbb461a5e5
[General] Make sure data in guiMessageBox is compressed
2018-07-05 02:56:32 +03:00
David Cernat
7010575075
[Server] Return -1 in GetObjectSummonerPid() when the player is invalid
2018-07-05 02:05:10 +03:00
Capostrophic
5bc073603e
Update changelog
2018-07-05 01:59:14 +03:00
Capostrophic
faf3e9ba5a
Make spellcasting stance transition more smooth ( fixes #4358 )
...
If a movement animation was identical to the previous one that was played, restart it from the point the previous animation ended
2018-07-05 01:57:34 +03:00
Doc West
9bfa01c579
Changed the way the revert command works: it now clones the changed record and uses the new RecordBase::revert() method to restore the previous value
...
Added Flag_Dialogue_Refresh to var type and var value columns so that sub views update properly
2018-07-05 00:37:19 +02:00
David Cernat
76731f5def
[Client] Don't remove SummonKeys with actorIds of -1
...
This prevents summon duplication caused by a SummonKey sometimes being deleted immediately after being created, before the server can send back an ObjectSpawn packet spawning a creature that can be attached to the SummonKey.
2018-07-05 01:11:45 +03:00
Doc West
3cbbbeceb4
Updated change log
2018-07-04 23:25:24 +02:00
Doc West
bf49a3e760
Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates.
2018-07-04 23:22:15 +02:00
Doc West
96cf2cbd05
Notify views of changes of all cells in a row to properly update the row after revert
2018-07-04 22:37:10 +02:00
Doc West
1c1b5986e9
Updated change log
2018-07-04 22:05:07 +02:00
Doc West
5d38160239
Updated change log
2018-07-04 22:03:42 +02:00
Doc West
2c39dba83b
Updated change log
2018-07-04 22:01:45 +02:00
Doc West
baf21362e1
Fixed undo / redo actions losing their shortcuts
2018-07-04 21:47:16 +02:00
Doc West
414f626309
Implemented search case sensitivity
2018-07-04 21:03:54 +02:00
David Cernat
c2411982d2
[Client] Log object refNumIndexes and mpNums in a consistent way
2018-07-04 21:54:11 +03:00
Bret Curtis
2ff9dc34a4
Merge branch 'win10_ci' into 'master'
...
see if we can get win10 going
See merge request OpenMW/openmw!8
2018-07-04 16:54:28 +00:00
Bret Curtis
d4d46fc602
Build everything but branches until we can allow VM/CIs to run on forked projects.
2018-07-04 16:51:57 +00:00
Bret Curtis
739c49d59b
Merge branch 'master' into 'win10_ci'
...
# Conflicts:
# CI/before_script.msvc.sh
2018-07-04 15:21:45 +00:00
AnyOldName3
8c153d116b
Merge pull request #1786 from OpenMW/CI_before_script_msvc_fixes
...
Update before_script.msvc.sh to add GitLab CI support and update dependency links
2018-07-04 15:44:25 +01:00
David Cernat
7775780ad7
[Cllient] Update multiplayer code for handling quick keys
2018-07-04 05:56:10 +03:00
David Cernat
3438061b55
[Server] Add script function for getting a summoner's pid
...
Additionally, fix typos in the comments for other script functions relating to summoners.
2018-07-04 04:26:44 +03:00
David Cernat
8a23a96da4
[Client] Update initialization of AiFollow packages in multiplayer code
2018-07-04 04:00:12 +03:00
David Cernat
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
2018-07-04 01:52:29 +03:00
Koncord
79903c455c
[General] Allow different types for vectorContains
2018-07-04 01:31:45 +08:00
Bret Curtis
57e2573593
Update before_script.msvc.sh
...
check if temp directory exists, error out and warn user about it.
2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0
; it?
2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4
detect existing dir
2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6
Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv.
2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0
try just converting the \ to a /
2018-07-03 12:53:30 +00:00
Koncord
1f4e6e9114
[General] Add integrity checks to Handshake packet
2018-07-03 18:41:03 +08:00
Koncord
f9ff5f10df
[General] Reduce packets size and add integrity checks
2018-07-03 18:41:03 +08:00
Koncord
fa2bf0663e
[General] Simplify vectorContains
2018-07-03 18:41:03 +08:00
Marc Zinnschlag
908af3720f
Merged pull request #1791
2018-07-03 09:37:51 +02:00
Marc Zinnschlag
47d0321366
updated credits file
2018-07-03 09:09:48 +02:00
Marc Zinnschlag
2a367a0c35
updated changelog
2018-07-03 09:09:05 +02:00
Marc Zinnschlag
e50c3657b3
Merged merge request !16
2018-07-03 09:05:59 +02:00
Marc Zinnschlag
9a88f9147e
Merged merge request !15
2018-07-03 08:59:57 +02:00
Doc West
e9cc697b60
Sort EnumDelegate values by name
2018-07-03 00:52:23 +02:00
David Cernat
3aa125ceda
[Server] Add script functions for getting a summoner's refId and indexes
2018-07-03 00:54:08 +03:00
Koncord
53346e2663
[Client] Return 0 if effect not found
2018-07-03 03:43:38 +08:00
Koncord
c5c1a160b2
[Client] Comment out an unused variable
2018-07-03 03:35:48 +08:00
Koncord
c69819e0db
[General] Change type of refNumIndex & mpNum to unsigned
2018-07-03 03:34:30 +08:00
Koncord
99158beb2e
[General] Change effectCount type to unsigned
2018-07-03 03:32:46 +08:00
Koncord
895634cd16
[General] Change type of MpNum to "unsigned int"
2018-07-03 03:25:54 +08:00
Koncord
779f2a564d
[General] Change "unsigned long" to uint32_t for cross platform compatibility
2018-07-03 03:04:41 +08:00
Koncord
23684489da
[General] Fix clang-tidy warning
...
Converting integer literal to bool, use bool literal instead
2018-07-03 02:50:21 +08:00
Koncord
7639db02f3
[General] RW functions return true on success
2018-07-03 02:28:20 +08:00
Koncord
45c7c3a0b6
[General] Add integrity checks to PacketPreInit
2018-07-03 02:21:36 +08:00
Koncord
d999cc0d55
[General] Add packetValid flag to packets
2018-07-03 02:06:52 +08:00
Koncord
695fb7d4a7
[General] Reorder RW(string) arguments
...
Change limit of default max string size to 64 KiB
2018-07-03 01:12:59 +08:00
David Cernat
f9ebe400f7
[Server] Add script function for checking if object's summoner is player
2018-07-02 18:32:42 +03:00
Koncord
d162f6fd3a
[General] Explicitly use limitations of the master server
2018-07-02 23:29:07 +08:00
Koncord
a48d5b48ef
[General] Add maxSize parameter to RW(std::string)
...
Minor type changes
2018-07-02 23:19:39 +08:00
Koncord
62877f38b7
[General] Remove Terra support
...
Use LuaJIT instead.
2018-07-02 23:07:09 +08:00
Koncord
685a80887b
Remove Pawn support
2018-07-02 23:00:35 +08:00
Andrei Kortunov
f4330cf057
Editor: limit FPS in 3D preview windows (feature #3641 )
2018-07-02 12:20:34 +04:00
Thunderforge
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
2018-07-01 19:17:50 -05:00
David Cernat
bef53749ed
[General] Replace BaseObject's hasMaster variable with isSummon
...
Additionally, add a GetObjectSummonState() script function to the server.
2018-07-02 02:25:06 +03:00
David Cernat
8ce225b1cc
[Client] Use the casters of damage-dealing spells as death reasons
2018-07-02 00:42:32 +03:00
Marc Zinnschlag
aa5ddd6b28
Merged merge request livestreamer https://www.twitch.tv/vanguardlx best
2018-07-01 15:25:38 +02:00
Finbar Crago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
2018-07-01 13:46:23 +10:00
David Cernat
958b220835
[General] Send summon duration to server in ObjectSpawn packets
2018-07-01 00:43:29 +03:00
Marc Zinnschlag
3660d55adf
updated credits file
2018-06-30 10:21:10 +02:00
Marc Zinnschlag
362798bd90
updated changelog
2018-06-30 10:20:12 +02:00
Marc Zinnschlag
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
2018-06-30 10:17:05 +02:00
Bret Curtis
af75c1e909
Update before_script.msvc.sh
...
reverting back to what works
2018-06-30 08:40:21 +02:00
Bret Curtis
dcb2ab80f5
Merge pull request #1788 from Capostrophic/armorcond
...
Make unarmed creature attacks not affect armor condition (bug #2455 )
2018-06-30 08:39:06 +02:00
Bret Curtis
4d60fe5a76
reverting back
2018-06-30 06:10:26 +00:00
Finbar Crago
09c9bd34c3
cleanup more unnecessary struct keywords...
2018-06-30 12:43:50 +10:00
Bret Curtis
b8b07b52f0
try this...
2018-06-29 22:42:12 +00:00
Bret Curtis
4177fd04eb
Update before_script.msvc.sh
...
Does it blend?
2018-06-29 21:08:42 +02:00
Bret Curtis
209359bbc3
Try this on for size...
2018-06-29 19:07:39 +00:00
Bret Curtis
78a3f95ee4
Update before_script.msvc.sh
2018-06-29 18:03:25 +00:00
Bret Curtis
2bf0d598cf
Update before_script.msvc.sh
...
Wrap in quites
2018-06-29 20:01:35 +02:00
Capostrophic
6e9c08083d
Add missing empty attacker checks
2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
2018-06-29 20:18:28 +03:00
Bret Curtis
9b6ea0e89f
# because our CI VMs are not public, MRs can't use them and timeout
2018-06-29 15:15:29 +00:00
Bret Curtis
d3dfe17441
try limiting scope
2018-06-29 15:13:06 +00:00
Finbar Crago
69cd7031e7
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 23:46:36 +10:00
Finbar Crago
596be205c1
cleanup unnecessary struct keywords...
2018-06-29 23:43:51 +10:00
Bret Curtis
06216aa124
Update .gitlab-ci.yml
2018-06-29 13:36:00 +00:00
Finbar Crago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
2018-06-29 23:32:05 +10:00
Bret Curtis
c474709127
Update before_script.msvc.sh
2018-06-29 15:26:11 +02:00
Bret Curtis
ca0f6fff4a
Update before_script.msvc.sh
2018-06-29 13:25:36 +00:00
Bret Curtis
dc48a46e50
Update before_script.msvc.sh
2018-06-29 13:22:07 +00:00
Bret Curtis
a6d6dd5995
updating for the nits
2018-06-29 13:17:19 +00:00
Bret Curtis
8811c7141a
Update before_script.msvc.sh
...
taking nits into account :)
2018-06-29 15:14:23 +02:00
Marc Zinnschlag
a45d86bdf3
Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2'
2018-06-29 12:55:55 +02:00
Marc Zinnschlag
f06dd39892
Merge remote-tracking branch 'upstream/master'
2018-06-29 12:52:54 +02:00
Bret Curtis
c2ff30c4d7
correcting from GH/AV feedback, testing on GL.
2018-06-29 09:33:51 +00:00
Bret Curtis
a532aef935
Update before_script.msvc.sh
...
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
2018-06-29 11:31:37 +02:00
Bret Curtis
4c0e475092
Update before_script.msvc.sh
...
Use powershell trick with boost_temp so there is little chance of collision.
2018-06-29 10:16:28 +02:00
Bret Curtis
bccd83c656
Use 1.67
2018-06-29 08:09:41 +00:00
Bret Curtis
bc830a9c45
use boost_temp
2018-06-29 08:00:54 +00:00
Bret Curtis
63bbc77ee7
try using the powershell trick from AnyOldName3
2018-06-29 07:51:45 +00:00
Finbar Crago
7ae388086b
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 12:34:53 +10:00
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
2018-06-28 20:13:18 -05:00
Bret Curtis
3379eafd33
Update before_script.msvc.sh
2018-06-28 20:44:22 +00:00
Bret Curtis
3ceb9116de
Give pwd -W a try
2018-06-28 20:28:58 +00:00
Finbar Crago
ed71656ea6
fix updateActivatedQuickKey() crash
...
keyboard numbers don't start at zero...
2018-06-29 01:58:57 +10:00
Bret Curtis
c4a4111b2e
Update before_script.msvc.sh
2018-06-28 15:33:32 +00:00
Bret Curtis
fb6ad9faec
try %TMP% ?
2018-06-28 15:23:56 +00:00
Bret Curtis
4ad3d66629
try using just ${TMP}
2018-06-28 14:18:58 +00:00
Bret Curtis
8be52d228e
Update before_script.msvc.sh
...
small fixes
2018-06-28 15:12:26 +02:00
Finbar Crago
24d5fb09da
fix crash on simultaneous key presses
2018-06-28 22:55:02 +10:00
Bret Curtis
60ec340fa3
remove toolset_real, use just toolset, do proper comparison
2018-06-28 12:18:01 +00:00
Bret Curtis
71314f0c3a
Use boost 1.67 instead of 1.61
2018-06-28 12:03:52 +00:00
Bret Curtis
46575d8de7
Update before_script.msvc.sh
...
1.61 -> 1.67
2018-06-28 14:01:41 +02:00
Bret Curtis
660193ae1b
Update before_script.msvc.sh
...
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
2018-06-28 13:59:23 +02:00
Bret Curtis
1c4363eaa6
Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.
2018-06-28 11:22:54 +00:00
Bret Curtis
7bf502dd02
Bash it out!
2018-06-28 11:09:27 +00:00
Bret Curtis
1061270ac0
Try using @TEMP@ instead of hard coding it.
2018-06-28 11:05:10 +00:00
Bret Curtis
45d77372a0
with 260 char path fixed, this should work.
2018-06-28 10:41:12 +00:00
Bret Curtis
2d70c94733
gather up everything with 7zip
2018-06-28 09:05:39 +00:00
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix
...
Fix some GCC warnings
2018-06-28 10:33:51 +02:00
Bret Curtis
102266d08d
Merge pull request #1784 from nikolaykasyanov/revert-sdl-get-attribute
...
Revert "Retrieve SDL window settings instead of using magic numbers"
2018-06-28 10:28:49 +02:00
Bret Curtis
a8adb9374b
use quotes
2018-06-28 08:24:34 +00:00
Finbar Crago
d790a27060
Merge branch 'master' into fix_quickkey_segfalt
2018-06-28 18:16:00 +10:00
Bret Curtis
7cd0235fed
Try creating a zip and archiving it.
2018-06-28 07:56:40 +00:00
Andrei Kortunov
d9a1de0ec7
Do not use deprecated function
2018-06-28 11:13:32 +04:00
Andrei Kortunov
5455490ad2
Avoid fall-through in spell selection
2018-06-28 11:12:48 +04:00
Finbar Crago
80a3f0a0d4
switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers
2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897
add keyData struct + general cleanup
2018-06-28 13:27:08 +10:00
David Cernat
9102df7fde
[General] Make WorldCollisionOverride also work with specific refIds
...
For now, this only makes it possible to enforce collision for specific refIds for placed objects.
2018-06-28 04:53:00 +03:00
David Cernat
c7f10892a9
[General] Add vectorContains util for checking strings in vectors
2018-06-28 04:50:01 +03:00
David Cernat
84af9d9999
[Server] Reorder world map script functions
2018-06-28 03:48:16 +03:00
David Cernat
b81ca18316
[Client] Don't clear container Ptrs when disposing of corpses
...
The reason for this is that only the server should be determine whether a corpse can be disposed of or not.
2018-06-28 01:45:15 +03:00
Bret Curtis
83e23ee6fd
gather up artifacts and use all processors available
2018-06-27 20:45:51 +00:00
Nikolay Kasyanov
5fcb091127
Replace FIXME with a detailed explanation of the issue
2018-06-27 22:40:09 +02:00
Bret Curtis
f17426cbcd
give boost 1.67 a spin with msvc 14.1
2018-06-27 20:24:08 +00:00
Nikolay Kasyanov
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051c
, reversing
changes made to f52e06fc19
.
2018-06-27 22:19:09 +02:00
David Cernat
7ffdb18bf9
[General] Implement ActorDeath packet, part 1
...
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.
A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
2018-06-27 21:47:55 +03:00
Bret Curtis
8511f2398a
try a set and call?
2018-06-27 16:53:27 +00:00
Bret Curtis
df23e0f857
Try calling it directly
2018-06-27 16:39:45 +00:00
Bret Curtis
bd602847b5
fix broken QT 5.7.0 link
2018-06-27 15:07:53 +00:00
Bret Curtis
59a4251a6a
try to extract boost higher up in dir, then move.
2018-06-27 14:36:20 +00:00
Bret Curtis
609d6a1b29
bad syntax
2018-06-27 14:05:05 +00:00
Bret Curtis
b6fc204dd3
be more aggressive about suppressing message boxes
2018-06-27 14:02:30 +00:00
Bret Curtis
f7e1083ba4
get more output from boost
2018-06-27 13:34:37 +00:00
Bret Curtis
da5d7afe22
Update .gitlab-ci.yml
2018-06-27 13:25:23 +00:00
Bret Curtis
6751a7991d
Update .gitlab-ci.yml
2018-06-27 12:36:12 +00:00
Bret Curtis
2d5f71e5be
Update .gitlab-ci.yml
2018-06-27 12:35:02 +00:00
Bret Curtis
edd22342f2
Update .gitlab-ci.yml
2018-06-27 12:32:18 +00:00
Bret Curtis
218353e452
Update .gitlab-ci.yml
2018-06-27 12:19:03 +00:00
Bret Curtis
0105a48a4f
give %% a try
2018-06-27 12:15:29 +00:00
Bret Curtis
6d1a83e667
Update .gitlab-ci.yml
2018-06-27 12:10:09 +00:00
Bret Curtis
51179a2c38
try a wildcard?
2018-06-27 12:01:51 +00:00
Bret Curtis
1fdffd6ef9
see if we can get win10 going
2018-06-27 13:57:51 +02:00
Bret Curtis
87d9a4ff0b
Merge branch 'zini_updates' into 'master'
...
last minute updates from zini
See merge request OpenMW/openmw!7
2018-06-27 11:33:01 +00:00
Marc Zinnschlag
520e65f822
last minute updates from zini
2018-06-27 13:32:08 +02:00
Marc Zinnschlag
5ee731d86f
updated roadmap section
2018-06-27 12:33:23 +02:00
Marc Zinnschlag
8bc6c85396
last minute changes (this time for real; forgot to merge in the last update from the private repo)
2018-06-27 12:24:21 +02:00
Bret Curtis
f64d949169
Merge pull request #1780 from akortunov/persistanims
...
Ignore movement from scripted animations
2018-06-27 12:18:48 +02:00
Marc Zinnschlag
8cda355af6
last minute changes to design doc
2018-06-27 12:14:34 +02:00
Marc Zinnschlag
2afcea3870
added post-1.0 design document
2018-06-27 11:59:40 +02:00
Andrei Kortunov
ec73011617
Clean temporary storage if we assign new AI package (bug #4464 )
2018-06-27 12:52:43 +04:00
Andrei Kortunov
ee45f54b53
Refactor AiTemporaryStorage usage
2018-06-27 12:48:34 +04:00
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
2018-06-27 12:58:43 +10:00
David Cernat
15bfa30070
[Server] Make it possible to resend received worldstates
2018-06-27 02:00:16 +03:00
David Cernat
7060ff59c5
[Client] Enforce the default global map cell size in multiplayer
2018-06-27 01:23:48 +03:00
David Cernat
fec500c4b0
[Client] Reduce container debug spam by requiring VERBOSE logging for it
2018-06-26 23:40:19 +03:00
Bret Curtis
26615d588e
Merge branch 'multi_build' into 'master'
...
Multi build
See merge request OpenMW/openmw!4
2018-06-26 19:45:49 +00:00
Bret Curtis
4d6ca2c387
preserve dmg artifact
2018-06-26 17:45:20 +00:00
Bret Curtis
9e7731259d
what if we try make -j2 package ?
2018-06-26 15:40:06 +00:00
Bret Curtis
cfcd9c3fc6
What happens when we don't make install?
2018-06-26 15:36:53 +00:00
Bret Curtis
dd60b8f179
only delete files inside OpenMW.app dir
2018-06-26 15:18:18 +00:00
Bret Curtis
c1aee49b76
clean up after our previous build.
2018-06-26 15:09:51 +00:00
Bret Curtis
06eb9539bd
Let make install do it's thing, it's more reasonable on macos and let's only archive that.
2018-06-26 14:51:55 +00:00
Bret Curtis
e068ee3533
tell unzip to overwrite all files
2018-06-26 14:01:10 +00:00
Bret Curtis
9e2c6d9fe1
actually step into the build directory and build!
2018-06-26 13:57:13 +00:00
David Cernat
914b79fcc9
[General] Make it possible to check which placed objects have containers
2018-06-26 16:56:08 +03:00
Bret Curtis
308d78e3da
only download via curl if file on server is different than what is currently cached on VM.
2018-06-26 13:54:37 +00:00
Bret Curtis
ae4cb0c3ee
no need for macos_qt_formula since on osx there is no more qt4, just qt5
2018-06-26 13:50:45 +00:00
Finbar Crago
43c9fd4cec
check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips
2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f
rm ContainerStore/refItem
2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e
Merged pull request #1777
2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309
Merged pull request #1778
2018-06-25 11:57:45 +02:00
Bret Curtis
a0cae78cb2
Merge pull request #1779 from akortunov/coverity
...
Fix some code coverity issues
2018-06-25 10:33:07 +02:00
Andrei Kortunov
97d8cc0efe
Check if the local was not found, just for sure
2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2
Check cell for null
2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c
Validate map size
2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
David Cernat
f20f94a886
[Documentation] Update credits
2018-06-25 05:17:33 +03:00
David Cernat
deda6ec071
[Client] Don't send WorldMap packets for already explored map tiles
2018-06-25 02:34:11 +03:00
Bret Curtis
d008cd0c46
Update .gitlab-ci.yml
2018-06-24 21:26:53 +00:00
Bret Curtis
87f367ec11
Update .gitlab-ci.yml
2018-06-24 17:52:57 +00:00
Capostrophic
d6a170f848
Update changelog
2018-06-24 14:58:54 +03:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails
2018-06-24 14:39:48 +03:00
Bret Curtis
f1158e8129
Update .gitlab-ci.yml
2018-06-23 13:50:58 +00:00
Bret Curtis
55de1c1a72
Update .gitlab-ci.yml
2018-06-23 13:22:20 +00:00
David Cernat
d53bd05424
[General] Use slightly larger maximum imageData size in WorldMap packets
2018-06-23 14:37:47 +03:00
Capostrophic
afbe8f2161
Update changelog
2018-06-23 14:29:15 +03:00
Capostrophic
35b0546737
Consider <p> tag when discarding post-EOL tag text (regression #4473 )
2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad
prevent segfalt in QuickKeysMenu when item has been removed from player inventory
...
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().
(storing the RefId could be a better solution but would probably leave tooltips broken...)
2018-06-23 17:51:32 +10:00
Bret Curtis
40a9d8ac06
Update .gitlab-ci.yml
2018-06-23 07:19:05 +00:00
David Cernat
5bb2ba1e9e
[General] Limit maximum imageData size in WorldMap packets
2018-06-23 02:33:34 +03:00
Bret Curtis
c2826ca878
Update .gitlab-ci.yml
2018-06-22 16:41:20 +00:00
Bret Curtis
393ec99944
Update .gitlab-ci.yml
2018-06-22 15:29:27 +00:00
Bret Curtis
88555c0463
Update .gitlab-ci.yml
2018-06-22 15:20:38 +00:00
Bret Curtis
601b69b36c
Update .gitlab-ci.yml
2018-06-22 15:14:09 +00:00
Bret Curtis
dcba3a1058
Update .gitlab-ci.yml
2018-06-22 15:13:09 +00:00
Bret Curtis
516fc0283b
Update .gitlab-ci.yml
2018-06-22 15:07:39 +00:00
Bret Curtis
64cc3b3a6a
Merge pull request #1774 from nikolaykasyanov/ci-macos-1013
...
[macOS, CI] Build using macOS 10.13 SDK
2018-06-22 10:21:00 +02:00
David Cernat
9888316d8e
[Documentation] Update credits
2018-06-21 23:26:24 +03:00
Bret Curtis
9667dd051c
Merge pull request #1771 from Xenkhan/master
...
Retrieve SDL window settings instead of using magic numbers
2018-06-21 22:22:42 +02:00
Bret Curtis
a55583a395
Merge branch 'master' into master
2018-06-21 22:22:01 +02:00
Xenkhan
f0acc64544
Update changelog
2018-06-21 15:04:04 -05:00
Marc Zinnschlag
f52e06fc19
Merge branch 'glsl-editorconfig' into 'master'
...
Update .editorconfig to include GLSL
See merge request OpenMW/openmw!3
2018-06-21 18:29:31 +00:00
AnyOldName3
d1736ad0c8
Update .editorconfig to include GLSL
2018-06-21 14:23:30 +00:00
David Cernat
7e90d1f2a4
[Client] Fix interior-to-exterior and v.v. cell transitions for actors
...
Make sure only players who are cell authorities can get actors to teleport across cells for them, and display a message box for players who are not cell authorities.
2018-06-21 16:44:49 +03:00
Xenkhan
405a0caf29
Remove unneeded whitespace
2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<>
2018-06-20 13:33:59 -05:00
Nikolay Kasyanov
90ccf5b42b
[macOS, CI] Build using macOS 10.13 SDK
2018-06-20 19:59:55 +02:00
Marc Zinnschlag
22eb037c18
Merged pull request #1773
2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Bret Curtis
9cf815505b
formatting
2018-06-20 16:21:23 +02:00
Marc Zinnschlag
4e121a7434
updated credits file
2018-06-20 16:17:47 +02:00
Marc Zinnschlag
c90996f991
Merged merge request !1
2018-06-20 16:16:34 +02:00
Marc Zinnschlag
6315848620
Merged merge request !2
2018-06-20 16:02:54 +02:00
Nikolay Kasyanov
65ec58a669
Move the changelog entry to 0.44.0
2018-06-20 15:43:55 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim
...
Fast-forward death animation to end if death animation was finished earlier
2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17
Take transformation from first node with given name in file (bug #4469 )
2018-06-20 14:24:32 +04:00
Atahualpa
c0fc615cd6
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Improves previous commit:
1. Initialise mIgnoreBase boolean member with FALSE.
2. Remove isBaseOnly() function and replace with direct use of Record member.
2018-06-20 11:29:38 +02:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix
...
Handle exception when try to load non-music file
2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c
Fast-forward death animation to end if death animation was finished earlier (regression #4468 )
2018-06-20 12:37:58 +04:00
Bret Curtis
3ebebdf3c1
Merge pull request #1751 from wareya/terrainbleeding
...
Fix #4452
2018-06-20 10:20:11 +02:00
Bret Curtis
f3923a41c0
Merge pull request #1770 from Capostrophic/open
...
Make Open spells casted by anything trigger player crime event (bug #4461 )
2018-06-20 09:44:45 +02:00
David Cernat
fd05beef94
[Client] Don't delete disposed of corpses on client
...
Clients should instead await a server reply approving the deletion.
2018-06-20 02:01:19 +03:00
David Cernat
c3c7f2c8f9
[Server] Don't automatically synchronize ObjectDelete packets
2018-06-20 02:00:12 +03:00
Atahualpa
9d61d76e92
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Adds a boolean setting to the user preferences. This setting is locally saved to all OpenMW-CS check stages. When a verification is done, the setting is updated on setup for each check stage. If set to true, the boolean value is then used to skip the verification process for every base record - minus some special cases where, e.g., counters are to be set first.
Related issue:
- Fixes #4466 : Editor: Add option to ignore base records when running verifier (https://gitlab.com/OpenMW/openmw/issues/4466 )
Tests:
The changes were successfully tested in OpenMW-CS by creating faulty "Base" and "Modified" records for every record type (if possible) and, then, running the verifier with and without the option respectively.
2018-06-20 00:20:03 +02:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers
2018-06-19 15:03:30 -05:00
Capostrophic
6c23caadd7
Fix crash when a target in a different cell is (un)locked
2018-06-19 20:43:18 +03:00
Adam Bowen
0d70cb9473
Re-link bugtracker links to Gitlab
...
* Link "1.0" issues to the "1.0" tag
* Link "report a bug" to the issues page
* Link "known issues" to the "Bug" tag
2018-06-19 15:45:04 +00:00
Capostrophic
0731d79c09
Update changelog
2018-06-19 17:06:31 +03:00
Capostrophic
0c4fa55f16
Make Open spells casted by anything trigger player crime event ( fixes #4461 )
2018-06-19 17:04:38 +03:00
Marc Zinnschlag
101f0b1579
Merge remote-tracking branch 'upstream/master'
2018-06-19 13:46:03 +02:00
Bret Curtis
975597bac9
Merge pull request #1766 from rhtucker/master
...
Started migrating installation guide from the wiki.
2018-06-19 13:44:06 +02:00
Bret Curtis
c1eb9042b3
Merge branch 'master' into terrainbleeding
2018-06-19 13:40:14 +02:00
Marc Zinnschlag
7cfb7063c2
Merged pull request #1767
2018-06-19 13:30:10 +02:00
Marc Zinnschlag
7be069fcd2
Merged pull request #1743
2018-06-19 13:29:20 +02:00
Marc Zinnschlag
f275e657f6
Merged pull request #1761
2018-06-19 13:27:56 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Marc Zinnschlag
2a52ade219
Merged pull request #1760
2018-06-19 11:26:41 +02:00
David Cernat
aa3639f2da
Merge pull request #450 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 19 Jun 2018
2018-06-19 05:26:38 +03:00
David Cernat
5b461b09ca
[Client] Display error when receiving ID_INCOMPATIBLE_PROTOCOL_VERSION
2018-06-19 05:24:26 +03:00
David Cernat
29be79e852
[General] Switch RakNet enums to CrabNet enums
...
CrabNet is TES3MP's fork of RakNet that has deviated too far from RakNet to still be compatible with it.
2018-06-19 00:37:52 +03:00
rhtucker
fe86e7ffc7
Fixed inconsistent use of "since"
2018-06-18 12:49:48 -07:00
Bret Curtis
1c7d5c68c5
Update CHANGELOG.md, technically solved by moving from redmine over to gitlab.
2018-06-18 09:07:34 +00:00
Capostrophic
0cf2f6452b
Update changelog
2018-06-18 03:27:31 +03:00
Capostrophic
8376c8c68e
Allow partial matches in NotCell condition ( fixes #4459 )
2018-06-18 03:27:31 +03:00
Bret Curtis
e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot
...
Remove screenshot taken message again
2018-06-17 22:26:00 +02:00
Bret Curtis
70dec71c00
Merge pull request #1763 from akortunov/activatedoor
...
Forbid actors to use teleporting doors
2018-06-17 10:13:16 +02:00
Bret Curtis
3cc6da1db2
Update door.cpp
...
typo fix
2018-06-17 10:13:03 +02:00
Bret Curtis
88bf74b2a3
Merge pull request #1765 from akortunov/wanderfix
...
Fix arguments parsing for AiWander console command
2018-06-17 10:00:57 +02:00
Bret Curtis
3f2dbdc8a8
Merge branch 'master' into wanderfix
2018-06-17 10:00:38 +02:00
Bret Curtis
ecfc5fcd63
Merge pull request #1764 from akortunov/lightfix
...
Ignore lights without CanCarry flags when NPC selects torch
2018-06-17 08:40:50 +02:00
Ryan Tucker
7e23e6586b
Put together most of the informal guide on contributing to documentation.
2018-06-16 17:10:35 -07:00
Ryan Tucker
c5f5984c09
Started migrating installation guide from the wiki.
...
Fixed a bunch of errors that popped up on my local build.
2018-06-16 14:44:49 -07:00
Andrei Kortunov
f3f7487664
Fix arguments parsing for AiWander console command (bug #4458 )
2018-06-16 22:11:10 +04:00
Andrei Kortunov
e08b0d3070
Ignore lights without CanCarry flags when NPC selects torch (bug #4457 )
2018-06-16 17:34:49 +04:00
Nikolay Kasyanov
75d79e98b9
Force software decompression if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-16 12:38:16 +02:00
Andrei Kortunov
2a65aaf5ab
Forbid actors to use teleporting doors (bug #2562 )
2018-06-16 14:21:28 +04:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Bret Curtis
3f88aa46d0
Merge pull request #1759 from Thunderforge/refactor-launcher-sdl
...
Refactor SDL loading in Launcher to fix macOS errors
2018-06-15 12:58:44 +02:00
Andrei Kortunov
9c3da41130
Add murder bounty when a player follower commits murder (bug #2852 )
2018-06-15 14:31:09 +04:00
Marc Zinnschlag
5a9e382efe
Merged pull request #1421
2018-06-15 12:23:08 +02:00
Thunderforge
506d615acc
Moving csignal import from main to graphicspage
2018-06-14 22:16:35 -05:00
Thunderforge
e51bfb46c6
Adding Changelog records
2018-06-14 19:42:40 -05:00
Thunderforge
7615e78e52
Move SDL initialization from main.cpp to graphicspage.cpp
2018-06-14 19:39:24 -05:00
Capostrophic
1abf749f03
Remove screenshot taken message
2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83
Handle exception if we try to play non-music file (bug #4416 )
2018-06-14 21:32:40 +04:00
Miloslav Číž
2a23b53515
Merge branch 'drummyfish/openmw-toggleborders'
2018-06-14 15:33:08 +02:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec
Add NPC validation to esmstore (bug #2772 )
2018-06-14 16:48:16 +04:00
Miloslav Číž
34f8eca7bd
Fix indent
2018-06-14 13:43:32 +02:00
Miloslav Číž
31c68c534c
Merge branch 'drummyfish/openmw-toggleborders'
2018-06-14 13:23:23 +02:00
Miloslav Číž
24078d4a72
Update CHANGELOG
2018-06-14 13:22:12 +02:00
Miloslav Číž
ab8de9fa14
Set node mask to cell borders
2018-06-14 13:18:37 +02:00
Miloslav Číž
414e6caafe
Make tb work with distant terrain
2018-06-14 13:14:38 +02:00
Miloslav Číž
f18d57429e
Move cell border management to World
2018-06-14 12:27:22 +02:00
Miloslav Číž
1b8d500c07
Make tb command work again
2018-06-14 12:01:09 +02:00
Miloslav Číž
1fd5ad3e56
Use REAL_SIZE constant
2018-06-14 01:01:22 +02:00
Bret Curtis
ccfc07e7e3
Merge pull request #1548 from drummyfish/screenshot360
...
360° screenshots
2018-06-13 23:11:06 +02:00
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e
Add FIXME comment
2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Miloslav Číž
5387e3ba8f
Update CHANGELOG
2018-06-13 21:15:22 +02:00
Bret Curtis
60d2678cff
Merge pull request #1755 from akortunov/master
...
Add missing changelog entries
2018-06-13 20:58:17 +02:00
Andrei Kortunov
e814843cdb
Add missing changelog entries
2018-06-13 22:48:09 +04:00
Marc Zinnschlag
2b35c5efd7
Merge remote-tracking branch 'upstream/master'
2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb
Merged pull request #1753
2018-06-13 18:12:38 +02:00
Marc Zinnschlag
f62df90960
Merged pull request #1572
2018-06-13 18:11:31 +02:00
Marc Zinnschlag
17db4b4db3
Merged pull request 1754
2018-06-13 18:05:59 +02:00
Bret Curtis
48d74a8781
Disable testing for now, not yet necessary.
2018-06-13 15:34:13 +00:00
Bret Curtis
a275972361
Merge branch 'add_pipeline_badge' into 'master'
...
Update README.md to indicate that our gitlab pipeline is building
See merge request OpenMW/openmw!1734
2018-06-13 14:59:36 +00:00
Andrei Kortunov
61c968d550
Ignore broken items when search for replacement (bug #4453 )
2018-06-13 18:39:02 +04:00
Bret Curtis
45957dd707
Merge pull request #1647 from Capostrophic/fatigue
...
Improve the logic of trading formulae (bug #2222 )
2018-06-13 16:21:45 +02:00
Marc Zinnschlag
7ca56ccd29
set search status bar to 'no results' message when search yields no results
2018-06-13 15:48:24 +02:00
Andrei Kortunov
81b78a82e8
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454 )
2018-06-13 17:47:32 +04:00
Bret Curtis
9bd940e153
Update README.md to indicate that our gitlab pipeline is building
2018-06-13 13:06:37 +00:00
Marc Zinnschlag
7d2394273e
added statusbar to search window ( Fixes #3276 )
2018-06-13 14:55:03 +02:00
Bret Curtis
032768a505
try to use as many cores as possible
2018-06-13 12:38:03 +00:00
Bret Curtis
3f4d5598a5
Update README.md to be more generic about OpenMW
2018-06-13 11:55:33 +00:00
Bret Curtis
da37585a8e
Update .gitlab-ci.yml so that we only build with -j2
2018-06-13 10:15:07 +00:00
Bret Curtis
559754fa76
try this dance again
2018-06-13 09:31:39 +00:00
Bret Curtis
a49649c313
Try to get it to run and build on my docker instance.
2018-06-13 09:29:30 +00:00
Bret Curtis
674925dfb5
Merge branch 'psi29a-master-patch-17094' into 'master'
...
what does this give us from a CI perspective?
See merge request OpenMW/openmw!1732
2018-06-13 09:19:01 +00:00
Miloslav Číž
dcfbd554bb
Remove try catch block
2018-06-13 11:12:46 +02:00
Bret Curtis
2e2be76e3f
Update .gitlab-ci.yml
2018-06-13 08:20:31 +00:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
2018-06-13 10:04:32 +02:00
Bret Curtis
a747318c90
Merge branch 'master' into terrainbleeding
2018-06-13 09:20:49 +02:00
Marc Zinnschlag
4c4d4672d4
Merged pull request #1752
2018-06-13 09:06:20 +02:00
Marc Zinnschlag
1ba0317905
Merged pull request #1670
2018-06-13 09:02:31 +02:00
Marc Zinnschlag
48711bbdde
Merged pull request #1592
2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
Thunderforge
b37f325126
#4324/Updating Changelog.md
2018-06-12 22:20:16 -05:00
Thunderforge
058cfb553c
Adding CFBundleIdentifier to OpenMW's Info.plist file for Macs
2018-06-12 22:18:06 -05:00
wareya
bd4badc153
update changelog
2018-06-12 21:05:12 -04:00
wareya
94f695cffc
Fix #4452 and remove dead code
2018-06-12 21:04:27 -04:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Bret Curtis
3c933ebaad
Update .gitlab-ci.yml
2018-06-12 19:10:15 +00:00
Bret Curtis
cc396f4dfd
Update .gitlab-ci.yml
2018-06-12 19:06:59 +00:00
Nikolay Kasyanov
224b94c0ce
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8
2018-06-12 20:32:02 +02:00
Andrei Kortunov
9c45cc7e48
Use player reference instead of pointer
2018-06-12 22:05:00 +04:00
Marc Zinnschlag
a3911f52a0
Merged pull request #1750
2018-06-12 19:15:14 +02:00
Marc Zinnschlag
6114cff842
updated credits file
2018-06-12 19:14:32 +02:00
Marc Zinnschlag
97773697a9
Merge remote-tracking branch 'florianjw/precise-rotations'
2018-06-12 19:05:52 +02:00
Capostrophic
1c8a20a54a
Set ok button focus in settings window by default ( fixes #4368 )
2018-06-12 19:45:43 +03:00
Marc Zinnschlag
565922f9ad
naked expressions beginning with the member operator were allowed erroneously outside of the console (Fixes issue #2971 )
2018-06-12 17:52:16 +02:00
Marc Zinnschlag
296ad8424e
updated changelog
2018-06-12 17:06:09 +02:00
Marc Zinnschlag
8d0f717e72
Merged pull request #1739
2018-06-12 17:04:41 +02:00
Marc Zinnschlag
90febde783
Merged pull request #1742
2018-06-12 17:03:38 +02:00
Marc Zinnschlag
816a1733dc
Allow comma after Begin and End script instruction ( Fixes #4451 )
2018-06-12 15:29:28 +02:00
Bret Curtis
1c736ea064
Update .gitlab-ci.yml
2018-06-12 12:46:19 +00:00
Andrei Kortunov
bce6d79ad3
Add changelog entries, related to animations
2018-06-12 16:19:28 +04:00
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
2018-06-12 16:07:36 +04:00
Bret Curtis
a166534226
Update .gitlab-ci.yml
2018-06-12 11:41:19 +00:00
Bret Curtis
dddceba8f2
Update .gitlab-ci.yml
2018-06-12 11:32:37 +00:00
Bret Curtis
e3832cd2e2
Update .gitlab-ci.yml
2018-06-12 11:24:27 +00:00
Bret Curtis
bc0eb3349b
Update .gitlab-ci.yml
2018-06-12 10:33:35 +00:00
Andrei Kortunov
25bb7c1826
Make 'PlayGroup idle' to cancel scripted animations
2018-06-12 14:04:03 +04:00
Bret Curtis
e5dff83e38
Update .gitlab-ci.yml
2018-06-12 09:26:42 +00:00
Bret Curtis
a89441e879
Update .gitlab-ci.yml
2018-06-12 09:26:10 +00:00
Bret Curtis
20d8a424d6
Update .gitlab-ci.yml
2018-06-12 09:09:37 +00:00
Andrei Kortunov
0e441d48ac
Give scripted animations highest priority (bug #4286 )
2018-06-12 12:55:28 +04:00
Bret Curtis
8c4731728c
Update .gitlab-ci.yml
2018-06-12 08:41:07 +00:00
Bret Curtis
de1cad86ab
Update .gitlab-ci.yml
2018-06-12 08:37:26 +00:00
Bret Curtis
d986354d53
Update .gitlab-ci.yml
2018-06-12 08:30:18 +00:00
Bret Curtis
8714f48ce7
Update .gitlab-ci.yml
2018-06-12 08:22:44 +00:00
Bret Curtis
04dc74a1d6
Update .gitlab-ci.yml
2018-06-12 08:05:30 +00:00
Marc Zinnschlag
3af003d36b
Merge branch 'test_update_workflow' into 'master'
...
Update README.md with an important distinction.
See merge request OpenMW/openmw!1731
2018-06-12 07:57:55 +00:00
Bret Curtis
7502a7dc4d
what does this give us from a CI perspective?
2018-06-12 07:52:53 +00:00
Andrei Kortunov
0c92655250
Avoid code duplication in character manager
2018-06-12 11:51:54 +04:00
Andrei Kortunov
e3812f4075
Check creature stats only for actors
2018-06-12 11:27:18 +04:00
Andrei Kortunov
b0a140e714
Disable actor collision only after end of death animation
2018-06-12 10:00:38 +04:00
Andrei Kortunov
ebaa6fb5a2
Play death scream only once
2018-06-12 09:55:43 +04:00
Bret Curtis
5fba1c599b
Update README.md with an important distinction.
2018-06-12 05:52:19 +00:00
Andrei Kortunov
0d3f535590
Warn about mod conflicts
2018-06-12 08:57:24 +04:00
Andrei Kortunov
427be928d0
Do not update animation state for dead actors
2018-06-11 23:17:54 +04:00
Andrei Kortunov
977a27ecb7
Do not clear corpses until end of death animation (bug #4307 )
2018-06-11 22:29:32 +04:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
...
Do not show any book text after last <BR> tag
2018-06-11 17:08:26 +02:00
Andrei Kortunov
a42c663fd7
Do not interrupt scripted animations by death animation (bug #4286 )
2018-06-11 18:53:25 +04:00
Andrei Kortunov
d0619cfb35
Play death animation for non-persisting actors with 0 health (bug #4291 )
2018-06-11 18:52:20 +04:00
Andrei Kortunov
6099735c60
Early out only when scripted animation is playing
2018-06-11 17:52:58 +04:00
Bret Curtis
e53fb953bc
Merge pull request #1746 from Capostrophic/interrupt
...
Make WakeUpPC interrupt waiting if it was supposed to be (bug #3629 )
2018-06-11 15:20:36 +02:00
Andrei Kortunov
e234dd2a36
Do not interrupt scripted animations
2018-06-11 17:18:51 +04:00
Bret Curtis
23d16dc870
Merge pull request #1745 from Thunderforge/patch-1
...
Adding Feature #4345 to Changelog.md
2018-06-11 09:29:43 +02:00
Andrei Kortunov
66a46ff03c
Do not show any book text after last <BR> tag.
2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
2018-06-10 18:42:18 +03:00
Thunderforge
ab03d238bb
Adding Feature #4345
...
Implemented as part of #1623 , but not added.
2018-06-10 07:43:38 -05:00
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9fd2d57b86
Move previous items to player
2018-06-10 16:21:19 +04:00
Andrei Kortunov
f977c6876f
Bound items: store item ID instead of pointer
2018-06-10 16:21:19 +04:00
Andrei Kortunov
4de9d9fa77
Split adjustBoundItem()
2018-06-10 16:21:19 +04:00
Andrei Kortunov
d1b1cb748d
Reequip previous item only if the expired bound item was equipped
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9b72a6ac69
Use the MWWorld::Ptr() instead of string ID
2018-06-10 16:21:19 +04:00
Andrei Kortunov
0375bedab2
Equip previous item after a bound item expires (bug #2326 )
2018-06-10 16:21:19 +04:00
Bret Curtis
926ddcd47e
Merge pull request #1741 from akortunov/master
...
Do not reset mUpperBodyState for weapon->weapon switch
2018-06-10 11:56:54 +02:00
Marc Zinnschlag
dbc87e7c7d
updated changelog
2018-06-10 11:28:22 +02:00
Marc Zinnschlag
25e4c52adf
Merged pull request #1744
2018-06-10 11:26:54 +02:00
Thunderforge
a9ca528fb8
Adding version number of macOS build of OpenMW
2018-06-09 19:42:24 -05:00
wareya
7344323b9e
remove indentation from blank lines
2018-06-09 10:31:51 -04:00
wareya
8f45b0d53a
remove unnecessary conditions
2018-06-09 10:11:43 -04:00
Andrei Kortunov
fba0c155df
Fix assertion fail related to NiLookAtController
2018-06-09 17:07:38 +04:00
Andrei Kortunov
ae87e0d3fc
Do not reset mUpperBodyState for weapon->weapon switch (regression #4446 )
2018-06-09 15:34:08 +04:00
Andrei Kortunov
5ead6353ac
Add missing changelog entry
2018-06-09 13:10:44 +04:00
Andrei Kortunov
4ba361fea6
Unhardcode sunset and sunrise settings (bug #1990 )
2018-06-09 13:09:17 +04:00
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
2018-06-09 10:51:02 +02:00
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
2018-06-09 10:49:04 +02:00
Marc Zinnschlag
619110ca4c
Merged pull request #1737
2018-06-09 10:47:54 +02:00
Marc Zinnschlag
76972bb2f6
Merged pull request #1709
2018-06-09 10:46:02 +02:00
Marc Zinnschlag
6a4cd975b6
Merge remote-tracking branch 'capostrophic/goodbye'
2018-06-09 10:44:14 +02:00
Thunderforge
dfa9968565
Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged
2018-06-08 19:18:23 -05:00
Thunderforge
62c4eb8d6a
Explicitly flagging loaded cells changed as queued
2018-06-08 19:16:24 -05:00
wareya
6277f5511c
fix #3876 and #3993
2018-06-08 17:52:46 -04:00
Andrei Kortunov
2e6cf2a414
Add changelog entries
2018-06-08 21:54:24 +04:00
Andrei Kortunov
6ed2773299
Do not stack return packages
2018-06-08 21:53:47 +04:00
Andrei Kortunov
74a2cbe696
AI: return back after pursuit
2018-06-08 21:53:47 +04:00
Andrei Kortunov
3d0631cfcc
Store last AI package in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
3a0ee78d2b
AiTravel: store mHidden flag in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
2f5beb8853
Remove unnecessary hack
2018-06-08 21:53:47 +04:00
Andrei Kortunov
57d686131e
Remove redundant condition
2018-06-08 21:53:47 +04:00
Andrei Kortunov
5105c67642
Add mHidden field to AiTravel
2018-06-08 21:53:47 +04:00
Andrei Kortunov
81f29d8dcd
AiWander: resume moving to destination after combat
2018-06-08 21:53:47 +04:00
Andrei Kortunov
18ff097e4a
Add the parameter to AiSequence::stack() to control ability to cancel other AI packages
2018-06-08 21:53:47 +04:00
Andrei Kortunov
9d27eb197f
AiWander: return to initial position only after combat
2018-06-08 21:53:47 +04:00
Bret Curtis
3c2c0960d1
Merge pull request #1734 from MocquillonCedric/windows-cmake-pre3.9-support
...
Add support for msvc with cmake version pre 3.9 (fixes #4429 )
2018-06-08 19:14:01 +02:00
Bret Curtis
61c969e970
Merge branch 'master' into hitboxfix
2018-06-08 18:36:44 +02:00
Capostrophic
b274931165
Revert erroneous changes
2018-06-08 19:18:53 +03:00
Capostrophic
dd2a11b243
Merge branch 'master' into goodbye
2018-06-08 19:16:36 +03:00
Capostrophic
99781ab70c
Fix changelog
2018-06-08 19:15:31 +03:00
Capostrophic
01f12a6bd5
Update changelog
2018-06-08 19:01:48 +03:00
Capostrophic
24c1ee7744
Use relative stat difference for haggling
2018-06-08 19:00:45 +03:00
Capostrophic
b7026df551
Improve the offered price formula ( Fixes #2222 )
2018-06-08 19:00:45 +03:00
Andrei Kortunov
fed10e87aa
Store integer actor ID in AI packages (bug #4036 )
2018-06-08 19:57:41 +04:00
Marc Zinnschlag
9d0ce25052
Merged pull request #1738
2018-06-08 17:28:08 +02:00
Cédric
de5a3eaae9
Fix indentation issue: replace tab by spaces
2018-06-08 17:08:44 +02:00
Marc Zinnschlag
7899f44173
Merged pull request #1619
2018-06-08 17:07:38 +02:00
Bret Curtis
6c04cecab1
Merge pull request #1704 from akortunov/per_group_animation
...
[Feedback needed] Support for per-group KF-animation files
2018-06-08 15:06:43 +02:00
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
2018-06-08 17:04:15 +04:00
Capostrophic
0db702dfa7
Update changelog
2018-06-08 15:05:00 +03:00
Capostrophic
11103211c5
Make Goodbye and Choice choices mutually exclusive
2018-06-08 15:03:19 +03:00
Andrei Kortunov
2fada94879
Improve MRK NiStringExtraData handling (bug #4419 )
2018-06-08 15:44:35 +04:00
Marc Zinnschlag
53e8882366
updated changelog
2018-06-08 11:44:49 +02:00
Marc Zinnschlag
21ea49fe83
Merge remote-tracking branch 'capostrophic/physics'
2018-06-08 11:43:10 +02:00
Cédric
b784c7873d
Update authors
2018-06-08 06:36:43 +02:00
Cédric
4a9b790dbe
Update changelog
2018-06-08 06:36:11 +02:00
Cédric
7cafec9861
Add support for msvc with cmake version pre 3.9 ( fixes #4429 )
2018-06-08 06:34:40 +02:00
David Cernat
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-06-08 06:01:00 +03:00
Capostrophic
1a354f88ac
Make choices trigger goodbye if Goodbye is used ( fixes #3897 )
2018-06-07 22:09:55 +03:00
Bret Curtis
f8c2caf309
Merge pull request #1735 from akortunov/readmefix
...
Update AppVeyor build status link
2018-06-07 20:20:08 +02:00
Bret Curtis
c1b7fe4643
Merge pull request #1731 from AnyOldName3/windows-pre-build-error-messages
...
Add easily understood error messages to the prebuild script instead o…
2018-06-07 20:11:06 +02:00
Bret Curtis
30fd8a4914
Merge pull request #1732 from akortunov/docfix
...
Use link to OpenMW Wiki page instead of direct NifSkope page
2018-06-07 18:52:39 +02:00
Andrei Kortunov
05026b891e
Add changelog entries
2018-06-07 20:42:18 +04:00
Andrei Kortunov
57b2948ee1
Update AppVeyor build status link
2018-06-07 20:34:34 +04:00
Bret Curtis
937cbfa0a1
small commit to rigger AV
2018-06-07 17:09:39 +02:00
Andrei Kortunov
02f1f71221
Use link to OpenMW Wiki page instead of direct NifSkope page
2018-06-07 18:48:49 +04:00
AnyOldName3
a1ab1dc7fe
Add easily understood error messages to the prebuild script instead of vague/silent failures.
2018-06-07 15:28:45 +01:00
Andrei Kortunov
6eb531c6ac
Add missing changelog entries
2018-06-07 16:22:52 +04:00
Andrei Kortunov
1b9edbe119
Add unequip animation during stance switching (bug #4327 )
2018-06-07 16:20:17 +04:00
Andrei Kortunov
bde1d07d4e
Use hitboxes and focused object for touch spells (bug #3374 )
2018-06-07 16:12:27 +04:00
Andrei Kortunov
4666a6a0ab
Use default hit formula as fallback
2018-06-07 16:12:27 +04:00
Andrei Kortunov
9e5d577a71
Aim from center of attacker to center of target
2018-06-07 16:12:27 +04:00
Andrei Kortunov
f5dc9f0162
Use hitbox cone only as fallback
2018-06-07 16:12:27 +04:00
Andrei Kortunov
ab433102a4
Increase hit distance for player by halfExtents
2018-06-07 16:12:27 +04:00
Marc Zinnschlag
fb3facde54
updated changelog
2018-06-07 13:21:14 +02:00
Marc Zinnschlag
7b4a69ff2f
Merged pull request #1728
2018-06-07 13:14:53 +02:00
Marc Zinnschlag
362aa23546
Merged pull request #1724
2018-06-07 13:13:48 +02:00
Marc Zinnschlag
2ab31b0c18
Merged pull request #1723
2018-06-07 13:05:20 +02:00
David Cernat
2942bf6455
Merge pull request #445 from OpenMW/master
...
Add OpenMW commits up to 6 Jun 2018
2018-06-07 13:41:04 +03:00
David Cernat
72862dc255
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
2018-06-07 12:51:45 +03:00
Marc Zinnschlag
98063c5afc
updated changelog with last-minute crash-bug fix
2018-06-06 09:50:33 +02:00
David Cernat
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-06-05 20:57:50 +03:00
David Cernat
0d0c4ac235
[Client] Use REPLY_TO_REQUEST container sub-action for partial requests
2018-06-05 19:40:39 +03:00
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
2018-06-05 18:09:10 +03:00
David Cernat
83014d6381
[Client] Set actors as the owners of their items when editing containers
2018-06-05 14:55:57 +03:00
David Cernat
bacecc93e3
[Server] Make it possible to resend a received ObjectList of any kind
...
Additionally, make existing related functions less confusing.
2018-06-05 14:19:06 +03:00
David Cernat
494edbe5cb
[General] Add REPLY_TO_REQUEST container sub-action
2018-06-05 14:16:27 +03:00
David Cernat
c24157f6f9
[General] Fix CMakeLists in components for BaseObject
2018-06-05 13:14:52 +03:00
Marc Zinnschlag
7605d928db
added section for 0.45 to changelog
2018-06-05 11:03:04 +02:00
David Cernat
8ea9485e6b
[Client] Make container debug information more useful
2018-06-05 12:01:16 +03:00
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2018-06-04 19:34:26 +03:00
Marc Zinnschlag
13f7b53b1c
Revert "Don't force DDS file usage ( fixes #1392 )"
...
This reverts commit 90f3ff2da4
.
2018-06-04 17:08:09 +02:00
Marc Zinnschlag
cd7268e9af
Merge remote-tracking branch 'akortunov/effectResistFix' into openmw-44
2018-06-04 16:58:22 +02:00
Marc Zinnschlag
2193983a69
updated changelog
2018-06-04 15:14:35 +02:00
Marc Zinnschlag
cae744161b
increased version number
2018-06-04 15:08:22 +02:00
Thunderforge
d46590934a
Importing mutex
2018-06-03 16:59:27 -05:00
Thunderforge
e282ece3d1
Fixing bug with autocomplete not loading correctly during startup
2018-06-03 16:58:18 -05:00
Thunderforge
103a7ac628
Using a mutex lock to prevent race conditions
2018-06-03 16:32:12 -05:00
Capostrophic
c14536a399
Update faction-owned items confiscation
2018-06-03 20:28:53 +03:00
Bret Curtis
896825e71d
Merge pull request #1729 from elsid/fix_utf8_encoding
...
Fix UTF-8 econding
2018-06-03 18:29:54 +02:00
elsid
c71df7249d
Fix UTF-8 econding
...
To be able run gcovr
2018-06-03 13:46:10 +03:00
Capostrophic
3810ade67a
Don't make unnecessary faction ID searches
2018-06-03 12:38:53 +03:00
Capostrophic
191cc76378
Consider faction ownerships in item stolen checks ( fixes #4293 )
2018-06-03 10:22:20 +03:00
Thunderforge
e26c675829
Changing join to detach so that the thread will not block the UI
2018-06-02 17:29:35 -05:00
Bret Curtis
4a2b973052
Merge pull request #1726 from elsid/fix_catch_warnings
...
Fix warnings: catching polymorphic type by value
2018-06-02 19:36:04 +02:00
Bret Curtis
2810a87956
Merge pull request #1727 from Capostrophic/refloading
...
Make weapon durability short unsigned (bug #4435 )
2018-06-02 17:42:17 +02:00
Capostrophic
eecde340cf
Make weapon health short unsigned ( fixes #4435 )
2018-06-02 15:44:59 +03:00
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
2018-06-02 14:28:46 +03:00
Andrei Kortunov
be394870e4
Fix regressions in spell resistance
2018-06-01 20:08:53 +04:00
Andrei Kortunov
84c8fb9df7
Add pursue package only when crime was reported (bug #4433 )
2018-06-01 12:41:31 +04:00
Andrei Kortunov
24863f620b
RotateWorld: rotate around world axis (bug #4426 )
2018-05-30 16:35:52 +04:00
Bret Curtis
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
...
AppVeyor: build with Release configuration
2018-05-29 10:25:02 +02:00
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
2018-05-28 09:08:30 +04:00
Thunderforge
26dfef7970
Changing where we are loading cells to prevent Qt access issue
2018-05-27 17:15:36 -05:00
Thunderforge
78234e9468
Moving autocomplete code to thread
2018-05-27 16:47:09 -05:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
2018-05-27 16:10:16 +03:00
David Cernat
3efe05a88e
[General] Implement WorldCollisionOverride packet
2018-05-27 16:05:40 +03:00
David Cernat
5d30a884ba
[Client] Add Worldstate to CMakeLists
2018-05-27 16:00:14 +03:00
David Cernat
e8ec031a81
[Client] Create Worldstate class that inherits BaseWorldstate
2018-05-27 15:57:47 +03:00
scrawl
dbb7277544
Merge pull request #1722
2018-05-27 10:46:08 +00:00
scrawl
31ea7c8edd
Revert "set rebalance soul gem values to true by default"
...
This reverts commit 2963524a01
.
2018-05-27 10:43:31 +00:00
Thunderforge
c2fff61ccd
Changing so that data changes happen only after the addon is checked
2018-05-26 20:35:28 -05:00
Capostrophic
7e38bb8513
Verifier: improve handling of class name and description
2018-05-26 22:37:02 +03:00
scrawl
cfdf99f601
Revert "Merged pull request #1573 "
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
2018-05-26 11:39:30 +00:00
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
...
This reverts commit da47fc79f5
, reversing
changes made to 7324bd368f
.
2018-05-26 11:35:48 +00:00
Marc Zinnschlag
b151a89528
Merged pull request #1568
2018-05-26 12:17:07 +02:00
Marc Zinnschlag
bbc337a0af
code cleanup
2018-05-26 12:16:02 +02:00
Marc Zinnschlag
e76df5f4d3
minor tooltip fixes
2018-05-26 11:53:08 +02:00
Marc Zinnschlag
e30ade81be
Merged pull request #1680
2018-05-26 11:21:34 +02:00
David Cernat
f7a084c824
[Client] Use faster check for whether actors are DedicatedPlayers
2018-05-26 08:13:26 +03:00
David Cernat
c8ec77875c
[Client] Update old comments for changes made by tes3mp
2018-05-26 05:11:41 +03:00
Bret Curtis
13391e833d
Merge pull request #1718 from akortunov/appveyor
...
Preserve AppVeyor artifacts
2018-05-25 17:11:55 +02:00
Andrei Kortunov
48e15dabc3
Try to generate PDB for release builds
2018-05-25 14:25:04 +04:00
Marc Zinnschlag
832b4bb778
Merged pull request #1659
2018-05-25 11:32:08 +02:00
Bret Curtis
42ef4ed843
Merge pull request #1719 from nikolaykasyanov/deduplicate-nightlies
...
[macOS, CI] Do not upload a nightly if there's already one of the same commit
2018-05-25 07:40:19 +02:00
David Cernat
416ee77639
[General] Add placeholder for WorldCollisionOverride packet
2018-05-25 07:09:32 +03:00
David Cernat
2edb511a0b
[Client] Remove unnecessary condition from WorldTime processor
2018-05-25 07:08:51 +03:00
David Cernat
49ea76aa9d
[General] Add notes for InputDialogs in GUIBoxes packet
2018-05-25 05:28:22 +03:00
David Cernat
3b5fb9cd6b
[General] Make it possible to set year via WorldTime
2018-05-25 03:33:12 +03:00
Nikolay Kasyanov
ba3a02ad05
[macOS, CI] Do not upload a nightly if there's already one of the same commit
2018-05-24 23:00:59 +02:00
Andrei Kortunov
77c5e85e8d
Enable release builds
2018-05-24 22:53:29 +04:00
Andrei Kortunov
8c95676352
Preserve AppVeyor builds
2018-05-24 22:49:53 +04:00
David Cernat
4acf93b7db
[General] Make it possible to set days passed via WorldTime
2018-05-24 14:02:04 +03:00
David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
2018-05-24 12:16:11 +03:00
Andrei Kortunov
1abff5365b
Capitalize enchanted items names again in spells window
2018-05-24 13:03:47 +04:00
Andrei Kortunov
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
2018-05-24 12:53:06 +04:00
Andrei Kortunov
b5374029e5
Implement case-insensitive search in spell window
2018-05-24 12:39:00 +04:00
Marc Zinnschlag
1daf8474a4
Merged pull request #896
2018-05-24 09:50:22 +02:00
Andrei Kortunov
9ac752ea70
Implement filtering in the spells window
2018-05-24 10:48:46 +04:00
David Cernat
46744ee90f
[General] Make WorldTime script functions more consistent with others
2018-05-24 09:38:06 +03:00
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix
...
Do not apply queue movement for standing actors
2018-05-23 22:35:08 +02:00
Marc Zinnschlag
7324bd368f
Merged pull request #1573
2018-05-23 17:00:29 +02:00
Marc Zinnschlag
810e4416f6
Merged pull request #1691
2018-05-23 16:56:36 +02:00
Marc Zinnschlag
d92d754834
Merged pull request #1697
2018-05-23 16:01:11 +02:00
Marc Zinnschlag
1564a3f6aa
Merged pull request #1713
2018-05-23 13:51:32 +02:00
Marc Zinnschlag
2f958881b7
Merged pull request #4413
2018-05-23 13:45:35 +02:00
David Cernat
8d36d0d945
[General] Make it possible to change world's time scale via WorldTime
2018-05-23 08:31:25 +03:00
David Cernat
f01c761cb1
[General] Use correct orderChannel for WorldTime packets
2018-05-23 07:51:18 +03:00
David Cernat
0be6de6607
[General] Turn RecordDynamic into a Worldstate packet
2018-05-23 07:48:28 +03:00
David Cernat
031a80ed5a
[Client] Don't advance time when waiting, traveling, training or jailed
2018-05-23 05:49:51 +03:00
David Cernat
02ba641bef
[Server] Use correct index changes for dynamic stat script functions
2018-05-23 05:48:28 +03:00
Thunderforge
d58cce9c72
Adding WIP code to dynamically change the autocomplete fields
2018-05-22 20:50:31 -05:00
David Cernat
da66face25
[General] Rename GameTime packet into WorldTime
2018-05-23 00:41:29 +03:00
David Cernat
296c69d788
Merge pull request #436 from OpenMW/master
...
Add OpenMW commits up to 22 May 2018
2018-05-23 00:40:51 +03:00
Bret Curtis
3fa3fc9d85
Merge pull request #1716 from declan-millar/soulgem_value_rebalance
...
Soul gem value rebalance
2018-05-22 15:31:01 +02:00
declan-millar
2963524a01
set rebalance soul gem values to true by default
2018-05-22 12:59:27 +01:00
Nelsson Huotari
825c331764
Remove texture filtering, better ltex importing, reindexing duplicates
2018-05-22 14:55:09 +03:00
declan-millar
7092dc4f40
Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance
2018-05-22 12:46:06 +01:00
Bret Curtis
b4098b24b7
Merge pull request #1717 from akortunov/default_terrain
...
Render default land texture for Wilderness cells with distant terrain
2018-05-22 13:21:48 +02:00
Andrei Kortunov
888c2d9a33
Render default land texture for Wilderness cells with distant terrain
2018-05-22 12:40:01 +04:00
declan-millar
b8df4b7c5a
Tidy in-code comment
2018-05-21 22:14:23 +01:00
declan-millar
844aef85f3
Replace spelling: soulgem -> soul gem in code comment
2018-05-21 22:12:19 +01:00
declan-millar
9ed4f33048
Replace spelling: soulgem -> soul gem
2018-05-21 19:10:24 +01:00
declan-millar
028b528c0b
Get soul magnitude before checking the rebalance setting
2018-05-21 18:16:04 +01:00
declan-millar
9346a552fa
Use Rebalance soulgem values option to set soulgem value
2018-05-21 13:59:20 +01:00
declan-millar
0320f9a74d
Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance
2018-05-21 13:35:43 +01:00
declan-millar
78e79d5775
Add advanced option to Rebalance soulgem values to the launcher
2018-05-21 13:33:42 +01:00
David Cernat
5af1150ab2
[General] Turn GameTime into a Worldstate packet
2018-05-21 07:14:08 +03:00
David Cernat
e87e1dbb30
[General] Fix Worldstate packets by adding missing lines
2018-05-21 07:12:55 +03:00
David Cernat
815d17d9db
Merge pull request #433 from OpenMW/master
...
Add OpenMW commits up to 21 May 2018
2018-05-21 02:07:08 +03:00
Bret Curtis
5775f420e2
Merge pull request #1714 from ananace/patch-9
...
Switch Appveyor CI to x64 VS2015 / 2017
2018-05-21 00:03:07 +02:00
David Cernat
e690ff0e29
Merge pull request #432 from OpenMW/master
...
Add OpenMW commits up to 18 May 2018
2018-05-20 23:48:53 +03:00
Nelsson Huotari
8ae46519cf
Fix missed worldspacehits, add linebreak to tooltip
2018-05-20 21:58:40 +03:00
Nelsson Huotari
21e8d08e69
Handle invalid texture id's
2018-05-20 21:20:40 +03:00
Alexander "Ananace" Olofsson
d05de8e411
Give boost the correct toolset for 2017
2018-05-20 18:51:28 +02:00
Alexander "Ananace" Olofsson
4f758bdd48
Use different environments for 2015 and 2017
2018-05-20 18:24:06 +02:00
Alexander "Ananace" Olofsson
3bd8dc3ef6
Use the right boost version for Appveyor
2018-05-20 18:22:02 +02:00
Alexander "Ananace" Olofsson
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor
2018-05-20 18:09:31 +02:00
declan-millar
4b1247597e
Use soulgem value rebalance formula from morrowind code patch
2018-05-20 17:06:26 +01:00
Alexander "Ananace" Olofsson
e1e7a4b11a
Change Appveyor to use Visual Studio 2017
2018-05-20 18:04:59 +02:00
Alexander "Ananace" Olofsson
12b201348a
Switch to the supported VS versions on Appveyor
2018-05-20 17:17:04 +02:00
Alexander "Ananace" Olofsson
ea6c73333b
Bumping Qt to 5.10 for Appveyor
2018-05-20 17:14:32 +02:00
Alexander "Ananace" Olofsson
f8304a52c4
Enable verbose logging for CI
2018-05-20 17:04:52 +02:00
Capostrophic
867a5938ca
Don't reset sneaking camera offset while in GUI ( fixes #4420 )
2018-05-20 10:24:20 +03:00
Marc Zinnschlag
ec900ef4ad
Merged pull request #1710 )
2018-05-18 12:34:16 +02:00
Nelsson Huotari
c2cddc91e4
Brush maximum size to a custom setting
2018-05-18 11:32:42 +03:00
David Cernat
43a944ddaf
[General] Add and implement new Worldstate packet type
2018-05-18 06:40:28 +03:00
David Cernat
e8b22a2e5e
[Server] Use correct source group for ObjectProcessors
2018-05-18 05:06:19 +03:00
tri4ng1e
f2613a74b1
Write settings before invoking openmw-iniimporter
2018-05-17 21:20:04 +03:00
tri4ng1e
7e03dd0f12
Read data paths from data-local
section too
2018-05-17 21:07:20 +03:00
tri4ng1e
3b86f73ae7
Replace MwIniImporter::numberToString with std::to_string
2018-05-17 21:04:40 +03:00
David Cernat
18167a734e
Merge pull request #419 from Aesylwinn/Travis-0.6.3
...
Travis 0.6.3
2018-05-17 19:07:34 +03:00
Capostrophic
4e485dbd44
Rename Original Creature column to Parent Creature ( fixes #2897 )
2018-05-17 13:00:48 +03:00
David Cernat
049d0d9ba7
[General] Fix remaining references to world packets/events
2018-05-17 00:08:37 +03:00
David Cernat
dc9a3bf73f
Merge pull request #429 from OpenMW/master
...
Add OpenMW commits up to 16 May 2018
2018-05-16 19:20:01 +03:00
Bret Curtis
67c381df4e
Merge pull request #1708 from akortunov/refidfix
...
fix GCC warnings
2018-05-16 15:59:31 +02:00
Andrei Kortunov
a68de93308
Initialize srate variable in openal_output
2018-05-16 16:34:58 +04:00
Andrei Kortunov
e5db5e2651
Fix 'maybe-uninitialized' warning in openal_output
2018-05-16 16:13:22 +04:00
Andrei Kortunov
df459199dd
Avoid left shift of negative value
2018-05-16 12:59:05 +04:00
Nelsson Huotari
17e01ca336
Setting "Scene Drops" rename "3D Scene Editing"
2018-05-16 11:41:37 +03:00
Nelsson Huotari
758ccac75a
Show texture id + filename
2018-05-16 11:34:58 +03:00
Bret Curtis
caf1760251
Merge pull request #1707 from akortunov/weaponreach
...
Display weapon reach on tooltips in feet
2018-05-16 10:27:53 +02:00
Andrei Kortunov
164e3d12fe
Display weapon reach on tooltips in feet.
2018-05-16 11:18:22 +04:00
Bret Curtis
e410c47660
Merge pull request #1706 from akortunov/refidfix
...
Fix compiler warning in getNestedData()
2018-05-16 09:00:25 +02:00
Andrei Kortunov
6a3ff5ed81
Fix compiler warning in getNestedData
2018-05-16 10:10:42 +04:00
David Cernat
2ac334664b
[Server] Add deprecated alternatives for ObjectList functions
...
This will avoid server crashes in older scripts.
2018-05-16 02:16:27 +03:00
David Cernat
51698bed48
[Client] Rename WorldProcessor into ObjectProcessor
2018-05-15 22:56:47 +03:00
David Cernat
02d8e08c58
[Server] Rename WorldProcessor into ObjectProcessor
2018-05-15 22:07:06 +03:00
David Cernat
1e749938fb
Merge pull request #426 from OpenMW/master
...
Add OpenMW commits up to 15 May 2018
2018-05-15 21:01:33 +03:00
David Cernat
bef36f77ca
[Server] Create WorldstateFunctions and move GameTime functions there
2018-05-15 20:58:09 +03:00
Bret Curtis
c75d774356
Merge pull request #1692 from akortunov/playsound
...
Prevent PlaySound overlapping
2018-05-15 19:03:01 +02:00
Andrei Kortunov
f8655d2425
Use actor's physics position as a ray origin in tracer
2018-05-14 20:38:53 +04:00
David Cernat
9b9dd4abaf
Merge pull request #425 from OpenMW/master
...
Add OpenMW commits up to 13 May 2018
2018-05-13 19:27:34 +03:00
Capostrophic
e32f38b939
Allow jumping when you're stuck on a slope ( fixes #4221 )
2018-05-13 17:19:33 +03:00
Capostrophic
409d466e42
Make 0/0 encumbrance 0% encumbrance
2018-05-13 17:18:45 +03:00
Capostrophic
ba077e7291
Fix movement fatigue loss encumbrance calculation ( fixes #4413 )
2018-05-13 17:18:45 +03:00
Capostrophic
1c9fba9a8c
Fix jumping encumbrance calculation
2018-05-13 17:18:45 +03:00
Marc Zinnschlag
bdfa430857
updated credits file
2018-05-13 09:24:24 +02:00
Marc Zinnschlag
0f22600a98
Merged pull request #1703
2018-05-13 09:08:40 +02:00
David Cernat
d4f7936a76
[Server] Rename WorldFunctions into ObjectFunctions
2018-05-13 04:11:05 +03:00
David Cernat
78234f9071
[General] Rename Event into ObjectList & WorldObject into BaseObject
2018-05-13 00:42:24 +03:00
David Cernat
6bf3a0be1e
[General] Rename WorldPackets into ObjectPackets for clarity
2018-05-12 19:40:00 +03:00
David Cernat
5458e09c8a
Merge pull request #420 from OpenMW/master
...
Add OpenMW commits up to 11 May 2018
2018-05-12 06:32:01 +03:00
David Cernat
77389538e8
[General] Implement ActorAI packet, part 1
...
The server can now make actors become followers of players or other actors.
2018-05-12 06:29:11 +03:00
tri4ng1e
9126e844bf
Use data paths from config (bug #4412 )
2018-05-11 17:24:36 +03:00
Marc Zinnschlag
b7cce1a665
Merged pull request #1702
2018-05-11 10:11:17 +02:00
Marc Zinnschlag
6630a02c3f
updated credits file
2018-05-11 09:56:44 +02:00
Kyle Cooley
d78ae4bab4
Allow the clang build to fail for now
2018-05-10 21:19:41 -04:00
Kyle Cooley
6c7d73af7f
Bump c++ standard version to 14
2018-05-10 19:01:22 -04:00
David Cernat
c00b3bbe97
[Documentation] Update credits
2018-05-11 01:10:53 +03:00
Kyle Cooley
cf5bd0dca7
Travis: use qt5, newer boost libraries, callff, gcc/clang builds...
2018-05-10 18:02:45 -04:00
David Cernat
57b791ea2a
[Client] Show selected object's refNum & mpNum in console window title
...
This allows for much easier debugging of all objects and actors.
2018-05-11 00:46:24 +03:00
Nelsson Huotari
49ae5bc75c
List initialization -> initialization in constructor
2018-05-10 22:57:48 +03:00
Nelsson Huotari
1c79d5311c
Brush history menu
2018-05-10 21:58:36 +03:00
Nelsson Huotari
d2cf764a46
Tooltips, fixes
2018-05-10 15:01:53 +03:00
Nelsson Huotari
62066f01bd
clean-up
2018-05-10 11:18:54 +03:00
Nelsson Huotari
d33c98c68d
Revert unintended changes
2018-05-10 11:18:54 +03:00
Nelsson Huotari
5656745445
Select dragged texture-assets, add brush settings widget-type, fixes.
2018-05-10 11:18:54 +03:00
Nelsson Huotari
baa707b5e3
User setting for selective cell editing or new land creation
2018-05-10 11:18:54 +03:00
Nelsson Huotari
24977fcc0f
improve hit calculation accuracy for texture editing
2018-05-10 11:18:54 +03:00
Nelsson Huotari
e8a9bff85c
Drop textures to landtextures from assets (try-method)
2018-05-10 11:18:54 +03:00
Nelsson Huotari
7139889566
Brush button window opens at modebutton, slider 1-50, doxygen comments
2018-05-10 11:18:54 +03:00
Nelsson Huotari
20d1d8ac89
Fixed brush calculations, implement undostack macro when clicked.
2018-05-10 11:18:54 +03:00
Nelsson Huotari
5f3c8b2b99
c_str -> fromStdString, remove TextureBrushButton class
2018-05-10 11:18:54 +03:00
Nelsson Huotari
cf7a0f715e
Command macro for complete drag-editing operations.
2018-05-10 11:18:54 +03:00
Nelsson Huotari
9f742d5b1f
Brush affects adjancent cells
2018-05-10 11:18:54 +03:00
Nelsson Huotari
1ca2710a2a
Formatting, fixes
2018-05-10 11:18:54 +03:00
Nelsson Huotari
1c113eca9c
15 to landTextureSize-1
2018-05-10 11:18:54 +03:00
Nelsson Huotari
3327d6f7c4
Drag terrain painting, code cleanup
2018-05-10 11:18:54 +03:00
Nelsson Huotari
a54a1b9940
Command system and undo
2018-05-10 11:18:54 +03:00
Nelsson Huotari
cc415526b0
fix texture index +1, better icons
2018-05-10 11:18:54 +03:00
Nelsson Huotari
316d05bdc4
{} to ()
2018-05-10 11:18:54 +03:00
Nelsson Huotari
4649d1258c
Direct data terrain editing
2018-05-10 11:18:54 +03:00
Nelsson Huotari
4ae75d1d20
Terrain texture brush frame
2018-05-10 11:18:54 +03:00
David Cernat
12727b66ea
[Server] Use consistent variable names in map tile script functions
2018-05-10 07:44:08 +03:00
David Cernat
7f00005f04
[Client] Fix GCC build
...
Based on 71040659ac39dc1236af654b5c3177d015e749e5
2018-05-10 07:16:33 +03:00
Alf Henrik Sauge
d4f278a113
Replacing tab with spaces
2018-05-09 18:02:02 +02:00
David Cernat
32d71de2f5
Update MapWindow every frame, not just when it's open (bug #4279 )
2018-05-09 07:33:45 +03:00
Alf Henrik Sauge
feeee50a88
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
...
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
2018-05-09 00:25:07 +02:00
tri4ng1e
103a07b744
Less cryptic abbreviations
2018-05-08 18:32:06 +03:00
Marc Zinnschlag
3197ebd8e7
Merged pull request #1694
2018-05-08 12:19:14 +02:00
David Cernat
715012f087
[General] Implement sending of image data for map tiles in PlayerMap
2018-05-08 05:57:04 +03:00
Andrei Kortunov
2f89080b36
Load default markers definitions in editor
2018-05-07 22:32:04 +04:00
Andrei Kortunov
b15bed8e22
Avoid excessive loadSound calls
2018-05-07 20:40:53 +04:00
tri4ng1e
905cde10db
Smart-sorting in iniimporter (time + dependency)
2018-05-07 15:51:46 +03:00
Marc Zinnschlag
53b6ef6f8c
minor code cleanup
2018-05-07 09:54:42 +02:00
Marc Zinnschlag
57ee5f9b53
updated credits file
2018-05-07 09:51:09 +02:00
Marc Zinnschlag
e661e3cf74
Merged pull request #1677
2018-05-07 09:42:41 +02:00
Marc Zinnschlag
f5f8f62e8e
updated credits file
2018-05-07 09:34:46 +02:00
Marc Zinnschlag
a255bdebd4
Merged pull request #1700
2018-05-07 09:33:44 +02:00
Nelsson Huotari
a2745683e6
new run icon
2018-05-06 22:30:01 +03:00
Alf Henrik Sauge
9b971caddc
CSVTools::ReportTable should now have case insensitive sorting
2018-05-06 16:49:23 +02:00
Andrei Kortunov
17222eb821
Get rid of unnecessary find
2018-05-06 16:42:05 +04:00
Bret Curtis
c44f87afd1
Merge pull request #1699 from Capostrophic/editorwarnings
...
Editor verifier updates
2018-05-06 10:57:24 +02:00
Bret Curtis
0fc198be52
Merge pull request #1698 from Capostrophic/c++11
...
A bunch of C++11-related updates
2018-05-06 10:44:11 +02:00
Capostrophic
2502d53816
Object record verifier updates
...
Removed light 0 duration warning
Spelling fixes
2018-05-06 00:23:05 +03:00
Capostrophic
91b97a27ea
Remove empty class description warning
2018-05-06 00:14:14 +03:00
Capostrophic
e22409c266
Fix sound range warning message
2018-05-06 00:13:09 +03:00
Andrei Kortunov
3636cf2015
Do not apply queue movement for standing actors
2018-05-05 22:41:26 +04:00
Capostrophic
3d3bef94cd
Use range-based for loop
2018-05-05 16:29:01 +03:00
Andrei Kortunov
1dd36329a3
Load default markers definitions (bug #4410 )
2018-05-05 17:14:33 +04:00
tri4ng1e
f5b7a230fc
ESMReader::close now clears mHeader
2018-05-05 14:40:58 +03:00
Bret Curtis
c219c89603
Merge pull request #1696 from Capostrophic/feature-2694
...
Rename "Model" column to "Model/Animation" (feature #2694 )
2018-05-05 08:14:03 +02:00
Capostrophic
9ac9f94638
Rename "Model" column to "Model/Animation" (feature #2694 )
2018-05-04 20:00:58 +03:00
David Cernat
980ddcb114
[Server] Add DoesFileExist() script function
2018-05-04 03:09:54 +03:00
Capostrophic
8be93b4a12
Initialize mandatoryIds vector C++11-way
2018-05-03 19:56:01 +03:00
Capostrophic
85b7aa4f09
Uncomment is_pod test in fixed string tests
2018-05-03 19:47:39 +03:00
Nelsson Huotari
e4e225f4e7
Add topic, journal and related -info icons.
2018-05-03 14:32:15 +03:00
Marc Zinnschlag
69c659852d
Merge pull request #1689 )
2018-05-03 13:03:42 +02:00
David Cernat
51fd937250
[Server] Remove hardcoded debug messages when using script callbacks
2018-05-01 20:39:43 +03:00
David Cernat
df0f9b0f5e
[Client] Require a certain Skill progress amount before sending packet
2018-05-01 19:34:21 +03:00
David Cernat
1b1e5e86d1
[Client] Avoid sending CellStates to server after initialization
...
Although b4e8560698
made players instantly able to see each other on minimalist servers that did not change their cells from the default, it created problems with the default CoreScripts where players need to be logged in before receipt of a CellStates packet from them is taken into account, with the result being that a player was recorded as having loaded their initial cells on the server's C++ side but not on the Lua side.
It may simply be best to expect servers to set player cells.
2018-05-01 18:19:52 +03:00
Andrei Kortunov
4872edc5ed
Prevent PlaySound overlapping
2018-05-01 16:24:32 +04:00
Andrei Kortunov
6cc7405194
Remove unnecessary command from QuadTreeWorld destructor (bug #4408 )
2018-04-30 18:29:26 +04:00
Andrei Kortunov
22fb1f3403
Play spellcasting effects from objects
2018-04-30 17:12:06 +04:00
David Cernat
099f85be0a
[General] Implement PlayerMomentum packet & associated script functions
2018-04-29 23:47:17 +03:00
David Cernat
273179fd5a
Merge pull request #414 from OpenMW/master
...
Add OpenMW commits up to 29 Apr 2018
2018-04-29 22:35:05 +03:00
David Cernat
4b501a39f4
[General] Implement DoorDestination packet & associated script functions
2018-04-29 22:32:22 +03:00
David Cernat
d47b06fe7a
[Server] Prevent SetGameMode() and SetHostname() from crashing server
...
Previously, turning off communication with the MasterServer from the server config and then attempting to use SetGameMode() or SetHostname() led to a server crash.
2018-04-29 19:50:39 +03:00
scrawl
b995584ad2
Merge pull request #1688
2018-04-29 14:27:55 +00:00
scrawl
f4cd7ff5b2
Merge pull request #1690
2018-04-29 14:24:56 +00:00
Capostrophic
d967983f5c
Assume Morrowind.esm dependency for dependency-less content addons ( fixes #2829 )
2018-04-29 14:56:38 +03:00
Andrei Kortunov
5afcc56860
Handle NiLookAtController (feature #4407 )
2018-04-29 09:24:13 +04:00
David Cernat
3b07dc4b42
[Client] Send equipment packets whenever an item charge or count changes
...
Since the beginnings of TES3MP, equipment packets have only been sent whenever an item has been replaced by an item with a different refId, with changes in an item's charge or count not sending a packet (but being included in the next packet sent as a result of a refId change). The reason for this was ostensibly the fact that every single equipment packet always included the details for all 19 equipment items (as per Koncord's original design decision), which would have led to massive packet spam if such a packet was sent every time you shot an arrow or lost a little bit of your armor's condition.
With minimalist equipment packets, it is now viable to send equipment packets whenever any item changes in some way, by having the equipment packet contain only that one item.
2018-04-29 05:40:42 +03:00
David Cernat
399e049d87
[Client] Fix logic for minimal size packets in LocalPlayer
...
Previously, the index changes were not cleared at the start of their corresponding update functions, which in turn meant that an Attribute/Skill/StatsDynamic/Equipment packet received by a player from the server made that player send back the same packet, as the index changes from it were retained.
Additionally, exchangeFullInfo was not set to false, thus sometimes leading to constant full exchanges of information.
2018-04-27 03:45:17 +03:00
David Cernat
66d5109509
[General] Fix information exchange for players sharing a cell
...
Previously, two players entering the same cell only sent and received their latest changes for dynamic stats, attributes, skills and equipment when they started sharing that cell.
2018-04-26 21:56:14 +03:00
David Cernat
7db74509e0
Merge pull request #412 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwscript/transformationextensions.cpp
2018-04-25 21:55:32 +03:00
Capostrophic
6b47f72959
Set character preview scene ambient to 0, 0, 0
2018-04-25 15:31:49 +03:00
scrawl
bdf1070852
Merge pull request #1688
2018-04-25 11:54:26 +00:00
scrawl
f0507e6b46
Merge pull request #1686
2018-04-25 10:27:38 +00:00
scrawl
4cc65239ff
Add section on dealing with regressions
2018-04-25 10:21:58 +00:00
Capostrophic
bfcdf660f2
Utilize inventory character preview lighting rotation fallback settings
2018-04-23 22:48:15 +03:00
Capostrophic
9073e4d4ba
Initialize playlist file list in playPlaylist ( fixes #4134 )
2018-04-22 23:21:29 +03:00
Capostrophic
b69e812a52
Utilize inventory character preview lighting color fallback settings
2018-04-22 22:37:27 +03:00
scrawl
55a6344fb0
Revert log spam
2018-04-22 15:41:25 +00:00
scrawl
d8d26f1de8
Merge pull request #1685
2018-04-22 15:34:31 +00:00
scrawl
ec4e2f0064
Merge pull request #1684
2018-04-22 15:27:31 +00:00
scrawl
063c5b6fd6
Merge pull request #1687
2018-04-22 15:26:41 +00:00
Alexander Olofsson
f0288282be
Slight appdata cleanup and improvement
2018-04-22 12:40:22 +02:00
David Cernat
608dcbafe6
[Client] Fix skill updates for LocalPlayer partially broken by 78441c769a
2018-04-22 11:22:36 +03:00
Evgeny Kurnevsky
c025b8f8f3
Remove useless comparison.
2018-04-21 17:10:49 +03:00
David Cernat
02eef933fd
Merge pull request #411 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2018
2018-04-21 17:00:55 +03:00
Evgeny Kurnevsky
48fb6bb9e8
Fix crash when rollDice is called with 0.
2018-04-21 16:46:36 +03:00
David Cernat
a541d7df3c
[General] Rework PlayerStatsDynamic packets so they are of minimal size
...
(cherry picked from commit fc5e883160
)
2018-04-21 00:43:49 +03:00
David Cernat
b9520c11da
[General] Rework PlayerEquipment packets so they are of minimal size
...
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
(cherry picked from commit d1ad0c91f8
)
2018-04-20 22:46:16 +03:00
Capostrophic
37dc3200d1
Inherit the calling object scale in PlaceAt ( fixes #4308 )
2018-04-20 00:15:26 +03:00
David Cernat
c5b08d6109
[General] Simplify storing of attribute and skill index changes
...
(cherry picked from commit bd9e8bd10f
)
2018-04-19 23:28:03 +03:00
David Cernat
2c77d5f498
[General] Set enforcedLogLevel to -1 when initializing BasePlayer
2018-04-19 20:42:27 +03:00
David Cernat
7b702bf8c2
[General] Add and use utility function for int value checks in vectors
...
(cherry picked from commit a796f81444
)
2018-04-19 18:16:10 +03:00
David Cernat
b6099024df
[General] Rework PlayerAttribute packets so they are of minimal size
...
Previously, whenever a single attribute value changed for a player, that player then sent a PlayerAttribute packet with all values for all 8 attributes.
This did not cause anywhere as much packet spam as PlayerSkill used to, but there was no good reason not to fix it as well.
(cherry picked from commit b0965f094a
)
2018-04-19 17:26:20 +03:00
scrawl
1f1f47431f
Merge pull request #1672
2018-04-19 13:36:40 +00:00
Capostrophic
48467814d4
Improve random number generation
2018-04-19 15:55:26 +03:00
David Cernat
78441c769a
[General] Rework PlayerSkill packets so they are of minimal size
...
Previously, whenever a single skill value changed for a player, that player then sent a PlayerSkill packet with all values for all 27 skills, plus the player's progress towards the next level and the bonuses to each attribute on the next level up as the result of sklll increases thus far.
This commit makes PlayerSkill contain only the values of specific skills, moves the player's progress towards the next level to PlayerLevel packets, and moves the bonuses to each attribute on the next level up to PlayerAttribute packets.
Players now also send a PlayerSkill packet whenever their progress towards a new point in a skill changes. This was previously avoided so as to not have massive packet spam.
(cherry picked from commit ef79a98544
)
2018-04-19 15:18:38 +03:00
scrawl
5d1b40c5ea
Merge pull request #1678
2018-04-19 12:18:24 +00:00
David Cernat
af4fcb7261
[Client] Don't force skill update on cell change
...
Previously, an attempt by the server to simultaneously change a player's cell and skills (as you'd expect when a player file is loaded) led to:
1) The server sending the cell packet first and the skill packet afterwards
2) The player receiving the cell packet and sending their own skill packet as part of the client's forced skill update
3) The player receiving the skill packet from the server
4) The server receiving the skill packet from the player
The result was that, if the player then left the server without sending another skill packet, the server's memory retained the skills the player had sent instead of the skills it had sent to the player.
This is the first step in a solution to that situation and similar ones.
(cherry picked from commit cac4684986
)
Note: In 0.6.x, this was only a problem if a player's cell was set by the server first and their skills were set next, i.e. this was not a problem in the default CoreScripts because the opposite order used there masked the problem. It was a more significant problem in 0.7 because all packets were queued for a player and sent in a specific hardcoded order.
2018-04-19 14:22:14 +03:00
David Cernat
57070b7f5c
[Client] Disable automatic transition to other chargen menus from OpenMW
...
Previously, after finishing the TES3MP chargen once, mCreationStage was set to 4 in OpenMW, which in turn made it impossible to go through only specific chargen menus again as the result of the relevant TES3MP script function (tes3mp.SetCharGenStage(pid, startStage, endStage) in 0.6.3, player:setCharGenStages(startStage, endStage) in 0.7). In other words, trying to allow a player to just choose their class again made it so the player started at that menu and went through all the other subsequent menus as well, i.e. the player went through the class, birthsign and review menus.
2018-04-19 13:47:42 +03:00
David Cernat
28f1c1b0d3
[General] Rework CharGen slightly for clarity purposes
...
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
(cherry picked from commit 926106cf8c
)
2018-04-19 13:25:29 +03:00
David Cernat
9d46de88e0
[Client] Send cell states correctly after inputting name
...
Previously, initial cell states were sent in LocalPlayer::processCharGen() and were ignored by the server because the player was not yet regarded as loaded. The result was that existing players logging in could not see each other until they went through at least one cell change.
(cherry picked from commit b4e8560698
)
# Conflicts:
# apps/openmw/mwmp/LocalPlayer.cpp
2018-04-18 20:30:48 +03:00
David Cernat
306252ecdc
[Server] Fix confusing script function names
2018-04-18 19:10:58 +03:00
Capostrophic
8617d0603b
Display a message if a spell the player tries to use via a quick key is missing ( fixes #4391 )
2018-04-18 19:10:46 +03:00
scrawl
ce1b2a612c
Merge pull request #1674
2018-04-18 15:56:22 +00:00
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
2018-04-18 18:05:09 +03:00
Capostrophic
90f3ff2da4
Don't force DDS file usage ( fixes #1392 )
...
Fallback to a DDS file if the requested texture path doesn't point to an existing file, not vice versa
2018-04-18 17:55:12 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes
2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
...
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.
PVS-Studio:
apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true.
apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.
apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.
components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
scrawl
789f552ad4
Delete old mygui_resource_plugin which is unlikely to be brought back in its current form because resources can't be accessed by MyGUI's editor if not using the Ogre resources system.
2018-04-18 12:36:09 +00:00
scrawl
6c79c0fb35
Add an empty compileGLObjects implementation to Rig/MorphGeometry to avoid unnecessary creation of display list done by osg
2018-04-18 12:36:08 +00:00
scrawl
40f6497f40
Clarify how to link bugs
2018-04-18 12:36:07 +00:00
Bret Curtis
1427648d64
Merge pull request #1682 from a17r/qt-5.11
...
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-18 11:00:23 +02:00
David Cernat
311f770de7
[Server] Document script functions, part 4
...
Additionally, clean up some variable names.
2018-04-18 11:02:18 +03:00
David Cernat
76e7392a84
[Server] Create ShapeshiftFunctions and move relevant functions there
2018-04-18 10:45:39 +03:00
David Cernat
2bb7a4253e
[Server] Forcibly kick players after too many handshake attempts
2018-04-18 10:16:38 +03:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-17 23:03:56 +02:00
David Cernat
17678ee60f
Merge pull request #407 from OpenMW/master
...
Add OpenMW commits up to 17 Apr 2018
2018-04-17 15:25:28 +03:00
David Cernat
50fe54af5d
[Client] Update DedicatedPlayer creature if displayCreatureName changes
2018-04-17 15:23:10 +03:00
David Cernat
36e0f0471a
[Server] Add SetCreatureNameDisplayState script function
2018-04-17 15:04:18 +03:00
Nelsson Huotari
af558e07a3
implement +6 icons
2018-04-15 12:47:52 +03:00
Nelsson Huotari
69aacdff17
Lamoot's new icon set
2018-04-15 12:35:45 +03:00
scrawl
fc72483ddf
Merge pull request #1673
2018-04-14 19:53:20 +00:00
scrawl
985ae12767
Merge pull request #1676
2018-04-14 19:53:01 +00:00
Capostrophic
b08d7b4a3b
Use centroid interpolation for shader lighting ( fixes #4143 )
2018-04-14 00:30:28 +03:00
David Cernat
db41704e52
[Server] Use clearer function name for checking creature name display
2018-04-13 17:28:28 +03:00
David Cernat
a01fc577f1
[Client] Add setAttributes() and setSkills() methods to DedicatedPlayer
2018-04-13 16:59:48 +03:00
David Cernat
716809f2db
[Client] Prevent errors from NPC-only packets for DedicatedPlayers
2018-04-13 16:23:42 +03:00
David Cernat
68ee64902d
[Client] Track & use previous race & creatureRefId for DedicatedPlayers
2018-04-13 16:16:43 +03:00
David Cernat
acb1335d78
[Client] Make creature disguises update correctly
2018-04-13 11:30:38 +03:00
David Cernat
9bd79ba498
Merge pull request #405 from OpenMW/master
...
Add OpenMW commits up to 12 Apr 2018
2018-04-13 11:30:30 +03:00
David Cernat
70f9cb535e
[General] Use RecordHelper methods to create and update DedicatedPlayers
2018-04-13 08:37:06 +03:00
Andrei Kortunov
174b3d2249
Reset an inventory filter after reload or a new game start (bug #4392 )
2018-04-13 09:19:49 +04:00
scrawl
a70e14e282
Add guidelines for pull request reviews
2018-04-12 15:16:52 +00:00
David Cernat
49e94725aa
[Client] Prevent MechanicsManager::playerLoaded() from enabling AI
2018-04-12 17:18:06 +03:00
David Cernat
9d27f5f154
[Client] Create RecordHelper class with initial NPC and creature methods
2018-04-12 14:18:19 +03:00
David Cernat
9697595857
[Client] Don't equip already equipped items in local setEquipment()
...
This avoids the following error when receiving repeated PlayerBaseInfo packets: "Error in frame: Invalid slot, make sure you are not calling RefData::setCount for a container object"
Additionally, only re-equip items as the result of a PlayerBaseInfo packet if resetStats is true (because of its side effect of auto-equipping items for the player).
2018-04-10 19:02:55 +03:00
David Cernat
72463cfdb6
[Client] Refresh equipment for DedicatedPlayers when setting base info
...
Additionally, move default fatigue value to DedicatedPlayer initialization.
2018-04-10 19:02:55 +03:00
David Cernat
fa652964fd
Merge pull request #403 from OpenMW/master
...
Add OpenMW commits up to 9 Apr 2018
2018-04-10 06:43:24 +03:00
Capostrophic
d9acd19dc0
Merge branch 'master' into illusion
2018-04-09 23:33:11 +03:00
scrawl
0982d2175a
Merge pull request #1473
2018-04-09 20:23:43 +00:00
scrawl
92d0fb2981
Merge pull request #1667
2018-04-09 20:23:38 +00:00
scrawl
35300c04cd
Merge pull request #1671
2018-04-09 20:23:35 +00:00
scrawl
ef050d7869
Merge pull request #1660
2018-04-09 20:23:27 +00:00
scrawl
308551ad49
Merge pull request #1644
2018-04-09 20:23:24 +00:00
scrawl
cbddb4a0a9
Merge pull request #1638
2018-04-09 20:23:20 +00:00
David Cernat
bdc9132e7c
[General] Add SetResetStats server script function
...
Add reading and writing of resetStats variable to PlayerBaseInfo Packet
Fix typos in various server script function descriptions
2018-04-09 19:24:24 +03:00
David Cernat
73dea494c4
[General] Allow changes from PlayerBaseInfo without player stat reset
2018-04-09 19:21:19 +03:00
Capostrophic
cddc0914c8
Option to charge for all companions travelling ( fixes #4064 )
2018-04-09 19:19:50 +03:00
David Cernat
34893ff631
[Server] Split up handshake handling into multiple functions for debug
...
Unfortunately, the handshake attempt limit implemented in 4ebfcc4a21
for 0.7 and then ported over to 0.6 in a3a341fee6
does not appear to work properly, which is why gathering more information on it is important.
2018-04-09 15:25:50 +03:00
David Cernat
c132dc70d2
[Client] Make PlayerShapeshift turn DedicatedPlayers into creatures
2018-04-09 15:23:05 +03:00
David Cernat
141eb8b7c2
[Client] Streamline creation of references for DedicatedPlayers
...
Additionally, delete DedicatedPlayers who disconnect.
Previously, all disconnected DedicatedPlayers were still kept in memory, but never used again. There was code that suggested they were meant to be reused upon reconnecting, but that reuse had never actually been implemented, and would probably not be that useful anyway.
2018-04-08 15:02:43 +03:00
David Cernat
14f90e773d
[Client] Split up creation of DedicatedPlayers into multiple methods
...
Additionally, print player guids using their string representations for consistency.
The creation and updating of DedicatedPlayer references remains very inelegant, but this commit is the first step towards fixing that.
2018-04-08 10:56:33 +03:00
Thunderforge
fb27f34a32
Add autocomplete to the "Start default character at" field
2018-04-07 21:27:36 -05:00
Capostrophic
77467f17c9
Fix a typo
2018-04-06 00:10:48 +03:00
David Cernat
c8abd11f5d
[General] Move creature disguises for players to PlayerShapeshift packet
...
Additionally, make associated variables clearer, and move associated server script functions next to other shapeshifting functions.
2018-04-05 15:42:06 +03:00
David Cernat
34be9383e5
[General] Add isPlayer boolean to targets in packets
2018-04-05 12:48:53 +03:00
David Cernat
0eed05610b
[Client] Fix autoequipping for creatures in WorldEvent::editContainers()
2018-04-03 15:22:51 +03:00
David Cernat
a86c68c5a1
[General] Add sync for ranged weapon & projectile strike enchantments
2018-04-03 14:12:27 +03:00
David Cernat
3f8d94b030
[General] Synchronize strike enchantments in combat
2018-04-03 10:27:02 +03:00
Andrei Kortunov
27c831959e
Handle OnPCHitMe variable (bug #2703 )
2018-04-03 07:38:19 +04:00
David Cernat
76468dc8c6
[Server] Remove remnant of hardcoded container sync
2018-04-03 01:35:07 +03:00
David Cernat
e3c43c6af7
Merge pull request #400 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2018-04-03 01:25:17 +03:00
Capostrophic
4f64ba7b7f
Implement sBookSkillMessage GMST
2018-04-02 21:12:38 +03:00
scrawl
c6abec1e51
Merge pull request #1641
2018-04-02 17:53:30 +00:00
scrawl
0071878106
Merge pull request #1642
2018-04-02 17:45:54 +00:00
scrawl
d935e78f93
Merge pull request #1645
2018-04-02 17:39:23 +00:00
scrawl
c610b8acc8
Merge pull request #1649
2018-04-02 17:37:31 +00:00
scrawl
cd9f767e29
Merge pull request #1650
2018-04-02 17:32:40 +00:00
scrawl
9e176aba9f
Merge pull request #1652
2018-04-02 17:29:40 +00:00
scrawl
e73af18824
Merge pull request #1653
2018-04-02 17:29:04 +00:00
scrawl
8e37f6bf3e
Merge pull request #1656
2018-04-02 17:28:46 +00:00
scrawl
f36adfec5f
Merge pull request #1657
2018-04-02 17:28:12 +00:00
scrawl
80a8ef6d49
Merge pull request #1661
2018-04-02 17:18:39 +00:00
scrawl
0065f277ef
Merge pull request #1664
2018-04-02 17:17:37 +00:00
elsid
14daadded7
Add virtual destructors
...
To fix warnings:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:588:8: warning: delete called on non-final 'NifOsg::ControllerFunction' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __p;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:595:4: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: __shared_count(__p)
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:1079:17: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: _M_ptr(__p), _M_refcount(__p, typename is_array<_Tp>::type())
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr.h:129:25: note: in instantiation of function template specialization 'std::__shared_ptr<NifOsg::ControllerFunction,
__gnu_cxx::_S_atomic>::__shared_ptr<NifOsg::ControllerFunction, void>' requested here
shared_ptr(_Yp* __p) : __shared_ptr<_Tp>(__p) { }
^
/home/elsid/dev/openmw/components/nifosg/nifloader.cpp:242:39: note: in instantiation of function template specialization 'std::shared_ptr<NifOsg::ControllerFunction>::shared_ptr<NifOsg::ControllerFunction, void>' requested here
callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:78:2: warning: delete called on non-final 'MWGui::ResponseCallback' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __ptr;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<MWGui::ResponseCallback>::operator()' requested here
get_deleter()(__ptr);
^
/home/elsid/dev/openmw/apps/openmw/mwgui/dialogue.cpp:58:23: note: in instantiation of member function 'std::unique_ptr<MWGui::ResponseCallback, std::default_delete<MWGui::ResponseCallback> >::~unique_ptr' requested here
PersuasionDialog::PersuasionDialog(ResponseCallback* callback)
^
2018-04-01 21:51:59 +03:00
David Cernat
26a56d6a02
[Client] Include NPC/creature containers when adding all cell containers
2018-04-01 14:58:04 +03:00
David Cernat
1e3c4fd488
[Client] Fix ProcessorContainer typos caused by careless copy-pasting
2018-04-01 10:47:57 +03:00
David Cernat
7b97e8671d
Merge pull request #398 from OpenMW/master
...
Add OpenMW commits up to 30 March 2018
2018-04-01 10:04:04 +03:00
David Cernat
f80f3bd484
[Client] Make it possible to reply to requests about specific containers
...
Previously, a Container packet with a REQUEST action always made the client respond with the contents of all the containers in that cell.
The previous behavior now only happens for requests that have no WorldObjects attached, while requests that have WorldObjects attached get a reply with the contents of those specific containers.
2018-04-01 10:00:39 +03:00
David Cernat
ec1311fcb7
[Client] Make it possible to check whether a class has a ContainerStore
2018-04-01 09:33:07 +03:00
David Cernat
258e319acb
[Client] Require InventoryStore for autoequipping actors
2018-04-01 09:02:26 +03:00
David Cernat
afe8c97cb9
[Client] Require InventoryStore for unequipping actors in editContainers
2018-04-01 08:41:57 +03:00
David Cernat
d8b48f6cf4
[Client] Remove redundant container methods from CellController
2018-04-01 07:11:43 +03:00
Capostrophic
1aa3ed0c18
Font loader fallback character reorganization ( fixes #1987 )
2018-03-31 20:16:44 +03:00
Capostrophic
baaf65bc2c
Add vanilla enchanted weaponry behavior option, on by default ( fixes #4136 )
2018-03-31 11:46:23 +03:00
Bret Curtis
f97d094aa5
Merge pull request #1658 from xyzz/android-sdl-2.0.8
...
android: Update for sdl 2.0.8
2018-03-30 22:14:53 +02:00
Capostrophic
2dca389a3b
Extend magic resistance/weakness to all effects that can be resisted ( fixes #4309 )
2018-03-30 21:18:29 +03:00
Ilya Zhuravlev
fdcfbdbdd1
android: Update for sdl 2.0.8
2018-03-30 12:44:38 -04:00
Capostrophic
e6d9bce519
Implement fWerewolfHealth GMST ( fixes #4142 )
2018-03-30 19:27:18 +03:00
David Cernat
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
2018-03-30 10:28:52 +03:00
Capostrophic
76f50312f2
Remove a redundant check
2018-03-30 00:02:52 +03:00
Bret Curtis
5e6be0307e
Merge pull request #1651 from psi29a/remove_gles_but_keep_android
...
remove native GLESv* support, as it never worked; make things less co…
2018-03-29 20:39:51 +02:00
David Cernat
ac82124a5d
Merge pull request #395 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
2018-03-29 07:28:30 +03:00
David Cernat
1c340568d2
[Client] Disallow resting if player has not finished chargen
...
Previously, players pressing T rapidly before logging in had the Wait screen show up for them.
2018-03-29 06:04:20 +03:00
Capostrophic
be542507f8
Make hasMaster() behavior consistent with isGameFile() ( fixes #3618 )
2018-03-28 15:43:51 +03:00
Simon
9193ff4d15
Reworded one of the descriptions
2018-03-28 13:59:05 +02:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
Capostrophic
2d119e834a
Add vanilla absorb attribute behavior option, on by default ( Fixes #4135 )
2018-03-27 14:27:23 +03:00
Capostrophic
b6a2589e7b
Don't apply harmful spell effects on the player in god mode ( fixes #4264 )
2018-03-27 14:02:14 +03:00
David Cernat
5f6ddcfc59
[General] Rework container sync to prevent item duping
...
A main priority in TES3MP development is to avoid making major changes to OpenMW code, so as to avoid merge conflicts in the future. Whenever avoiding potential conflicts seems especially difficult for the proper implementation of a particular multiplayer feature, that multiplayer feature is often put off until later or partially implemented with the intent of being revisited in the future.
Container sync is the perfect example. Previously, the OpenMW code for container actions was kept exactly as it was, with clients unilaterally accepting their own container changes as per singleplayer-specific code, with only the addition that clients sent container packets every time they made a change in a container, packets which were then forwarded unquestioningly by the server to other players. This meant that two players clicking on the same item in a container at the same time both managed to take it, thus duplicating the item.
Immediately after the packets were already forwarded, server scripts were able to check for incorrect changes, such as the removal of more items than should have existed in a container, but they had to send their own packets that attempted to fix what had already been accepted on the initial client and then forwarded to all clients, which was quite onerous in some scenarios, such as when a player on a slow connection immediately dropped items in the world after taking them from a container (which is why the default TES3MP serverside scripts made no attempt at sending corrective packets at all, preferring to expect the matter to be solved in a later C++ implementation).
This commit fixes item duping in containers by preventing container actions from initially running on clients and by ending the automatic forwarding of container packets by the server. Instead, clients now send container packets that act as requests for container actions, and serverside scripts have to forward these requests themselves. In other words, without a matching Container event in the server's Lua scripts, players are completely unable to affect containers for themselves or for others.
To forward a received Container packet, the following line must be used in a Container event in the Lua scripts:
tes3mp.SendContainer(true, true)
When an invalid action count is used in a container request, the serverside scripts can amend it using the following new function:
tes3mp.SetReceivedContainerItemActionCount(objectIndex, itemIndex, actionCount)
Thus, the serverside scripts are able to allow only container actions that are correct based on their own recorded contents for that container.
The OpenMW code allowing unilateral container actions in mwgui/container.cpp is now prevented from executing. When a player's container request is returned to them, code in mwmp/WorldEvent.cpp simulates those container actions instead.
2018-03-26 19:27:36 +03:00
David Cernat
9165b12d78
[Client] Update inventory views when receiving inventory or equipment
2018-03-26 10:01:26 +03:00
Capostrophic
41f89c84f8
Don't move the player if opposite direction keys are held down at the same time ( Fixes #4233 )
2018-03-25 12:20:48 +03:00
David Cernat
bb15ee9215
[Client] Make it possible to get ContainerWindow from elsewhere in code
2018-03-24 09:00:15 +02:00
Bret Curtis
1e600de44e
Merge pull request #1640 from unelsson/typofix_updatecrimepersuit
...
Typofix: updateCrimePersuit -> updateCrimePursuit
2018-03-23 22:13:22 +01:00
Capostrophic
5a3086b0c6
Auto-detect the actual Morrowind assets path ( Fixes #4336 )
2018-03-23 23:52:08 +03:00
Capostrophic
42b7846f81
Replace a redundant playerAllies check with a boolean ( Fixes #4229 )
2018-03-23 18:45:39 +03:00
Nelsson Huotari
63e34a5575
Typofix: updateCrimePersuit -> ...Pursuit
2018-03-23 14:10:43 +02:00
David Cernat
bbdc30628b
[Client] Use the correct guid for a received WorldEvent or ActorList
2018-03-21 06:08:04 +02:00
scrawl
c02920bcd1
Merge pull request #1634
...
Conflicts:
apps/openmw/mwworld/worldimp.hpp
2018-03-20 22:48:20 +00:00
scrawl
f47429d575
Merge pull request #1635
2018-03-20 22:47:36 +00:00
scrawl
ff7f964643
Merge pull request #1636
2018-03-20 22:47:31 +00:00
scrawl
5c1551d1ac
Merge pull request #1637
2018-03-20 22:47:08 +00:00
David Cernat
14f0299322
[Client] Don't log InputBox inputs for client
2018-03-20 06:41:04 +02:00
Andrei Kortunov
fed3e56fc1
Weather manager: get rid of World dependency
2018-03-19 23:08:15 +04:00
Andrei Kortunov
53ef345680
Update magic effect particles after building new animation (bug #2254 )
2018-03-19 10:43:22 +04:00
Andrei Kortunov
a0a30cdbf5
AI: hide torches during bad weather (bug #4334 )
2018-03-19 08:03:53 +04:00
Andrei Kortunov
bd6c7de579
Do not unequip two-handed weapon when equipping torch
2018-03-19 08:03:53 +04:00
RoadTrain
d626d89c49
OpenMW-CS: Fix a typo in startup warning.
2018-03-19 00:50:50 +03:00
Capostrophic
5b49248d6e
Restrict opening doors to bipedal actors ( Fixes #4313 )
2018-03-18 17:24:27 +03:00
scrawl
eb723f5ae6
Merge pull request #1629
2018-03-16 23:26:50 +00:00
scrawl
edb57306b6
Merge pull request #1628
2018-03-16 23:25:29 +00:00
scrawl
17fa1a4d51
Merge pull request #1630
2018-03-16 23:24:19 +00:00
scrawl
7a5748a9f1
Merge pull request #1632
2018-03-16 23:24:05 +00:00
Thunderforge
d42791e260
Moving testing options to Advanced page
2018-03-15 22:11:54 -05:00
Bret Curtis
9b93741c7b
Merge pull request #1631 from elsid/rm_duplicate_includes
...
Remove duplicated include
2018-03-14 07:42:38 +01:00
Capostrophic
002ad9ae1b
Print a warning in case a fallback value wasn't found
2018-03-14 00:25:56 +03:00
elsid
a26483ab26
Fix memory leak
...
There is no delete for TextFormat objects in PageDisplay destructor.
2018-03-13 21:32:59 +03:00
elsid
26df0e6ebd
Remove duplicated include
2018-03-13 21:28:38 +03:00
elsid
2f9b6b536b
Label gtest directories as system
...
To hide all warnings when use custom GTEST_ROOT.
2018-03-13 21:27:14 +03:00
David Cernat
20caea083a
[Client] Use correct count for items in equipment packets
...
Previously, throwing weapon sync was completely broken for players, as the count for their equipped throwing weapons was never set and – as a result – defaulted to a count of 1 on other clients. As a result, any time a player threw a dart, they would then appear as having switched to hand-to-hand for other players.
Moreover, the count of equipped items was mistakenly based on the total count of items with that refId in the inventory. As a result, if – for example – I equipped 1 Daedric Longsword and had 4 others in my inventory, my DedicatedPlayer on other clients would equip a Daedric Longsword with a count of 5. If I was overencumbered by having that many Daedric Longswords on me and then dropped 4 of them, allowing myself to move again, my DedicatedPlayer would still walk around with 5 Daedric Longswords and lack animations due to still being overencumbered on the other clients.
These problems were less prevalent for actors, but their equipment updating code has also been changed to match that of players.
2018-03-12 23:31:37 +02:00
Capostrophic
e4531a6910
Use middle gray instead of pure black as default fallback color ( Fixes #2841 )
2018-03-12 23:38:59 +03:00
Andrei Kortunov
e0aa5e8e79
Prevent overlapping for journal and books scrolling
2018-03-11 16:19:37 +04:00
David Cernat
b249162ca1
[General] Implement setting of enforced client log level in GameSettings
...
Certain servers do not want the players to have debug information about the locations and actions of other players, so a client's log level can now be enforced by the server via the GameSettings packet.
2018-03-11 04:50:59 +02:00
David Cernat
a3a341fee6
[Server] Reimplement 4ebfcc4a21
for 0.6
2018-03-10 22:19:44 +02:00
David Cernat
bf906b3f0a
Merge pull request #393 from OpenMW/master
...
Add OpenMW commits up to 10 March 2018
2018-03-10 18:37:51 +02:00
scrawl
27610a85ac
Merge pull request #1627
2018-03-10 00:08:52 +00:00
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-03-09 21:07:46 +02:00
Andrei Kortunov
62c04c6758
Unstack soulgem, added via AddSoulGem console command (bug #4351 )
2018-03-09 21:49:27 +04:00
Thunderforge
f07a12af73
Changing label "and may cause issues" to "and will cause issues"
2018-03-08 18:09:18 -06:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
2018-03-08 23:39:35 +00:00
scrawl
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
2018-03-08 23:38:04 +00:00
scrawl
7f39dbb129
Merge pull request #1626
2018-03-08 20:52:37 +00:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
Thunderforge
dfcd243150
Remove the word "interior" from cell not found message
2018-03-07 19:57:54 -06:00
Thunderforge
6931f6cadc
Adding message indicating the purpose of the "Testing" block
2018-03-07 18:37:43 -06:00
scrawl
96c2b9374f
Merge pull request #1621
2018-03-07 18:12:43 +00:00
scrawl
bf78c18296
Merge pull request #1624
2018-03-07 18:12:32 +00:00
scrawl
148cda254d
Merge pull request #1617
2018-03-07 18:12:26 +00:00
Capostrophic
3b922d810a
Don't use floating point arithmetics for formatted count (Bug #4346 )
2018-03-07 15:36:10 +03:00
Capostrophic
60a663ef58
Account for all possible count values in getCountString (Bug #4346 )
2018-03-06 16:50:38 +03:00
Thunderforge
dcc262ed91
Fixing Skip Menu checkbox not working correctly
2018-03-05 23:10:08 -06:00
Thunderforge
082e166fae
Making "start default character at" field enabled or disabled by the previous checkbox
2018-03-05 21:41:29 -06:00
Thunderforge
da74ca5ce0
Add testing options to the Settings page
2018-03-05 21:26:59 -06:00
Thunderforge
6c3ac834c4
Preventing max quicksaves from being saved to settings.cfg if it is unchanged.
2018-03-05 19:57:19 -06:00
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
scrawl
29101607c6
Merge pull request #1618
2018-02-28 18:06:29 +00: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
4a2e9f2e3d
Update AUTHORS.md
2018-02-27 23:52:12 +00:00
scrawl
9e9c278527
Merge pull request #1597
2018-02-27 23:48:45 +00:00
bret curtis
81d90d7fb7
break for all errors that would raise when checking for version, make them UNRELEASED
2018-02-27 18:57:37 +01:00
bret curtis
3393ad623f
fix rtd
2018-02-27 16:15:43 +01: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
scrawl
dd3d3f5a8b
Merge pull request #1610
2018-02-24 16:41:02 +00:00
Capostrophic
089666dd68
Round up displayed encumbrance
2018-02-24 15:13:14 +03:00
Capostrophic
46377fa348
Update [Windows] documentation
2018-02-24 12:25:11 +03:00
Capostrophic
534f3ef094
Bring UI dimensions and positions more in line with Morrowind UI
2018-02-24 12:23:44 +03:00
scrawl
ea028a2076
Improve settings documentation
2018-02-22 18:50:07 +00:00
scrawl
95a07bdc77
Merge pull request #1609
2018-02-22 18:49:32 +00: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
104495a9a4
Set default number of quicksaves to 1
2018-02-13 21:05:24 -05: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
65c3472772
Merge pull request #386 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018, part 2
2018-02-13 22:22:22 +02: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
scrawl
9b8c56761b
Fix timing error
2018-02-13 18:25:28 +00:00
scrawl
79e9876a24
Merge pull request #1606
2018-02-13 18:24:11 +00:00
Alexander "Ananace" Olofsson
145b47a550
Fix Windows builds
...
`std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds
2018-02-13 17:47:38 +01: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
ac1609c433
Merge pull request #1604
2018-02-13 00:56:06 +00: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
uramer
5502790ed9
removed the unnecessary comment
2018-02-09 16:34:55 +01:00
uramer
86c25f5dba
Removed NIF flag handling to replicate vanilla engine behaviour
2018-02-09 01:53:52 +01: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
Thunderforge
a78acbac85
Changing page description to address Zini's concerns
2018-02-04 13:38:11 -06:00
Thunderforge
cc0f7d19dc
Removing "Use these settings at your own risk"
2018-02-02 12:09:25 -06: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
273a1f50af
Merge pull request #377 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
2018-01-29 22:38:39 +02:00
David Cernat
02af7f6ba1
[General] Add placeholders for new packet types
2018-01-29 22:32:51 +02:00
scrawl
25a6a67508
Fix the optimizer messing up LOD node's children ( Fixes #4301 )
2018-01-29 19:44:12 +00:00
Thunderforge
04f79c34a2
Fixing typo "Tooltip" -> "Tool Tip"
2018-01-28 23:31:40 -06: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
613adf6b30
[General] Update version to 0.6.3
2018-01-27 23:36:25 +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
Ilya Zhuravlev
9e9f6f3132
loadtes3: don't pack() non-POD structs
2018-01-26 21:35:51 -05: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
b4ec8aaf5e
VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale
2018-01-21 12:21:22 -05:00
Ilya Zhuravlev
8d44d3124e
Android: Add callbacks for basic cursor handling.
2018-01-18 21:18:31 -05:00
Ilya Zhuravlev
359910762d
GraphicsWindowSDL2: support setting up GLESv2 context for android
2018-01-18 17:11:22 -05:00
Ilya Zhuravlev
455f718394
Android: register a virtual controller definition
2018-01-17 23:14:23 -05:00
Ilya Zhuravlev
a038327521
SDLCursorManager: fix possibly invalid read when no cursor present
...
On android we have no cursor so I moved the check closer to usage
2018-01-17 23:03:11 -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
28f47c4f81
[General] Update version to 0.6.2-hotfixed
2018-01-17 08:10:49 +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
Thunderforge
36843ed31e
Adding a tutorial for placing the ring in plain sight ( #1598 )
...
* Rearranging sections
* Adding instructions to place the ring in plain sight
2018-01-15 07:51:57 +01: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
047c44f265
Ignore duplicate data directories to work around the fallout of ( Fixes #3557 )
2018-01-14 00:25:20 +00:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557 )
2018-01-14 00:24:30 +00:00
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found
2018-01-14 00:23:29 +00:00
scrawl
4a96934f56
Merge pull request #1596
2018-01-14 00:22:56 +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
Marc Zinnschlag
2dff3aab22
allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061
2018-01-12 16:37:06 +01: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
b86118f76f
Merge pull request #1593 from psi29a/fix_mips_builds
...
fix building on mips machines
2018-01-02 11:45:42 +01: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
096e734df6
Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore
2018-01-01 22:42:45 -06:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
Thunderforge
a5e4f95ed4
Updating controller mappings to latest version
2018-01-01 22:16:54 -06:00
Bret Curtis
7367899634
update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html
2018-01-01 19:47:36 +01:00
Bret Curtis
93f14c219c
camelCase
2018-01-01 16:32:20 +01:00
Bret Curtis
7a7b040216
fix building on mips machines
2018-01-01 14:10:23 +01:00
Miloslav Číž
a73ab39fdd
Update refraction scaling docs
2018-01-01 13:42:16 +01: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
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
2017-12-31 23:49:43 +00: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
4f1df7c0c5
[Documentation] Update credits
2017-12-25 03:25:33 +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
06daddbd27
[Documentation] Update changelog for 0.6.2
2017-12-24 21:39:38 +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
Bret Curtis
1c25b7ca57
Merge pull request #1589 from Thunderforge/build/setting-cmake-cxx-standard
...
Explicitly setting CMAKE_CXX_STANDARD to C++11
2017-12-17 09:29:39 +01:00
David Cernat
fef6bddc68
[Client] Fix typo related to drag and dropping
2017-12-16 23:19:54 +02:00
Thunderforge
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
2017-12-16 14:36:27 -06: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
scrawl
ccd8ca2e69
Merge pull request #1586
2017-12-13 10:58:34 +00:00
scrawl
b6ac1c5697
Merge pull request #1587
2017-12-13 10:58:25 +00:00
scrawl
269c3227ea
Make sure we have cmake for the before_install step
2017-12-13 10:44:32 +00: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
scrawl
70661a4b1c
Merge pull request #1585
2017-12-12 20:10:45 +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
Miloslav Číž
d13fc06baf
Add basic refraction scale documentation
2017-12-09 12:52:28 +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 Číž
c979a9e34f
Merge branch 'master' into cs-cam
2017-12-08 20:57:52 +01: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
scrawl
d2b3f902c7
Merge pull request #1576
2017-12-04 21:19:49 +00: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
scrawl
441420225f
Contributing.md: referencing issues in commit messages
2017-12-04 17:00:02 +00: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
58de366c21
Merge pull request #1574
2017-12-03 22:22:48 +00: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
Alexander "Ace" Olofsson
50deed126b
Update SDL to 2.0.7
2017-12-02 21:48:57 +01: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
Miloslav Číž
390838e084
Replace switch with ifs in shader
2017-12-01 21:03:29 +01:00
Miloslav Číž
ea5e078526
Update shaders in CMakeLists
2017-12-01 19:54:48 +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
bb7ca055d0
Update AUTHORS.md
2017-11-29 22:13:42 +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
scrawl
3984dc8f16
Merge pull request #1570
2017-11-28 21:39:04 +00: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
scrawl
02b37dc036
Merge pull request #1562 from akortunov/carriage
...
Do not show carriage return characters
2017-11-23 15:56:12 +00: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
scrawl
2136003e1c
Reapply commit a3f821cdc
which got lost in a merge
2017-11-21 22:43:56 +00:00
scrawl
cd4f71d5cd
Merge pull request #1555 from akortunov/guifixes
...
Reworked trade window
2017-11-21 22:40:16 +00:00
Andrei Kortunov
67acb83b62
Add missing include
2017-11-21 13:27:33 +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
ea36956ff1
Reworked trade window
2017-11-21 10:00:53 +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
e840c4352f
Merge pull request #1556 from jbo-85/master
...
Fix search paths in FindSDL2.cmake to find SDL2 built from source
2017-11-20 23:27:51 +00:00
scrawl
cc3c27f241
Clean up layout files to use Spacer class
2017-11-20 23:20:04 +00:00
scrawl
a3f821cdcd
Disable keyboard for trade +/- buttons
...
For one, because their RepeatClick handler breaks the keyboard function, and because its redundant anyway (just press Up/Down arrow with the edit box focused to do the same thing)
2017-11-20 23:20:04 +00:00
scrawl
9fda3b6db4
Fix NumericEditBox behavior broken by switch to std::stoi
...
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.
Now the edit box flat out rejects any non-digit key events.
2017-11-20 23:20:03 +00: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
scrawl
39a9e90b1d
Merge pull request #1553 from drummyfish/leakfix
...
Fix memory leak in WindowManager
2017-11-20 20:39:38 +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
jbo-85
f896c9acb6
Fix search paths in FindSDL2.cmake to find SDL2 built from source
2017-11-19 11:56:24 +01:00
Miloslav Číž
ea2bbce68a
Fix memory leak in WindowManager
2017-11-18 19:27:09 +01:00
David Cernat
b2536d5296
Merge pull request #341 from testman42/patch-1
...
Update scripts repo link
2017-11-17 18:48:06 +02:00
Testman
7e0662cf81
Update scripts repo link
...
Change repo name from PluginExamples to CoreScripts.
2017-11-17 11:14:33 +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
scrawl
5a93b6a324
Enable word-wrapping for the console history
2017-11-15 17:20:05 +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
Alexander Stillich
93e9df15c9
Fixed parameter naming
2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782
Added StringUtil::replaceAll()
2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78
Fixed escaping @ in boost program options filter
2017-11-11 22:57:59 +00: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
ae9f79c192
Merge pull request #1550 from akortunov/trackingfix
...
Do not track a nearest actor during combat and pursue
2017-11-11 22:10:33 +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
scrawl
b7eda61f7a
Fix overlapping widgets in trade window layout ( Fixes #4205 )
2017-11-11 21:59:21 +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 Číž
e804c4a011
remove no longer used method
2017-11-11 13:54:14 +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
a5ba1caed1
Merge pull request #1541 from astillich/4189
...
Fixed escaping @ in boost program options filter
2017-11-10 23:08:54 +00:00
scrawl
f1aeb416ec
Disable Activate key when textinput is active (Bug #4151 )
2017-11-10 22:54:53 +00:00
scrawl
a5adc5b018
Add NPC base skeleton files to the optimizer blacklist ( Fixes #4159 )
2017-11-10 22:51:32 +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
scrawl
b9baee51d5
Fix overlapping widgets in trade window layout ( Fixes #4205 )
2017-11-10 22:51:29 +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
scrawl
244cc5b861
Reduce error spam
2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4
Fall back to non-shader material if creating the shader fails
...
Also fixes an uncaught exception that will break the whole game.
2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b
Fixed parameter naming
2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec
Added StringUtil::replaceAll()
2017-11-07 23:06:23 +01: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
Alexander Stillich
7d39c5450c
Fixed escaping @ in boost program options filter
2017-11-05 22:14:16 +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
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
2017-11-05 16:18:34 +00:00
Miloslav Číž
282800b5b2
Create LICENSE ( #1532 )
...
* Create LICENSE
Let's add the license file so that GitHub officially registers it and displays it next to the project.
* move license files
* update licenses in cmakelists.txt
* fix link in README
2017-11-05 15:37:38 +00:00
scrawl
e3c42251f9
Update AUTHORS.md
2017-11-05 15:36:26 +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
scrawl
5e69f6033f
Merge pull request #1531 from drummyfish/cyclefix
...
Don't switch weapon when cycling to the same weapon (issue #4180 )
2017-10-31 00:28:15 +00: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
David Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
2017-10-28 16:05:30 +00:00
scrawl
9c9da7b49f
Merge pull request #1527 from drummyfish/master
...
Remove redundant condition
2017-10-28 15:59:35 +00:00
scrawl
d61fc6e8f0
Merge pull request #1528 from ace13/downgrade-mygui
...
Downgrade MyGUI to 3.2.2 for Windows builds
2017-10-28 15:59:10 +00:00
Miloslav Číž
f9c396e0ea
stop landing animation when turning
2017-10-28 15:48:07 +02:00
Alexander "Ace" Olofsson
04af200ae8
Downgrade MyGUI to 3.2.2 for Windows builds
2017-10-28 13:37:41 +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
Bret Curtis
d19839a666
standerdise on 3.1.0
2017-10-25 21:55:58 +02:00
scrawl
f9397ce933
Merge branch 'master' into openmw-43
2017-10-25 14:17:06 +00:00
scrawl
ae14aa0c84
Merge pull request #1522 from AnyOldName3/yet-another-cmake-fix
...
Ensure the git-version target puts the version file in the appropriate directory/ies
2017-10-25 13:58:04 +00:00
scrawl
9f5e49f726
Merge pull request #1521 from ace13/fix-cpack-nsis
...
Windows: Update CPack configuration for NSIS packages
2017-10-25 13:55:54 +00:00
scrawl
90f4e9530a
Merge pull request #1517 from ace13/update-osg
...
Updating OSG packages to 3.4.1
2017-10-25 13:49:55 +00:00
David Cernat
50d5fffb7f
[General] Add and implement PlayerQuickKeys packet
2017-10-25 07:21:00 +03:00
AnyOldName3
c1a871ff1f
Make indentation consistent.
2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643
Add missing variables to those forwarded to the git-version target
2017-10-24 23:10:50 +01:00
Alexander "Ace" Olofsson
3e51c9e6b3
Missed the OpenCS config file
2017-10-24 23:23:55 +02:00
Alexander "Ace" Olofsson
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
2017-10-24 23:05:56 +02:00
scrawl
4a7be0ffda
Don't reset journal index to a lower value ( Fixes #4172 )
2017-10-24 20:02:35 +00:00
scrawl
954475f61f
Merge branch 'master' into openmw-43
2017-10-24 17:05:09 +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
8c47d63b08
[General] Update version to 0.6.2
2017-10-23 20:22:29 +03:00
David Cernat
3aedc2e5bc
[Server] Don't automatically share PlayerTopic packets between players
2017-10-23 19:39:35 +03:00
Marc Zinnschlag
dcd08e6329
updated changelog
2017-10-23 14:28:21 +02:00
Marc Zinnschlag
0153b54c3f
increased version number
2017-10-23 14:08:08 +02: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
Alexander "Ace" Olofsson
32bdd500af
Updating OSG packages to 3.4.1
2017-10-22 23:13:01 +02: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
scrawl
f3be39660b
Merge pull request #1516 from baszczewski/patch-1
...
Fix assert with empty setting value
2017-10-22 16:31:42 +00:00
Marcin Baszczewski
46b015d3d9
Fix assert with empty setting value
...
Local value could be empty, so it's important to check it size before read first char.
2017-10-22 10:10:04 +02: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
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
2017-10-19 00:50:57 +01: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
scrawl
a3a7b5b357
Merge pull request #1504 from AnyOldName3/escape-hash-oversight-fix-two-electric-boogaloo
...
Switch openmw-cs to the escape versions of option types
2017-10-16 21:09:47 +00:00
scrawl
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
2017-10-16 21:09:04 +00: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
136ef1f738
Fix incomplete settings in recreateShaders()
2017-10-15 17:24:23 +02: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
50d7eb8e54
Fix crash when adding a NULL object to the cache
2017-10-15 17:06:58 +02:00
scrawl
4c174ecd12
Merge changes to coverity scan script
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
AnyOldName3
49dbb4a9ca
Add a third copy of a comment where I felt clarification was missing
2017-10-15 02:05:22 +01:00
AnyOldName3
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
2017-10-15 01:59:21 +01:00
AnyOldName3
28ff677337
Save 'data=...' lines correctly when exiting the wizard
2017-10-15 00:07:46 +01: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
scrawl
5fbdb64bb9
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
...
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
2017-10-14 18:28:46 +00: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
a5b39e0842
Update AUTHORS.md
2017-10-13 19:35:49 +00: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
scrawl
cf1106f3eb
Merge pull request #1498 from AnyOldName3/cmake-resource-handling
...
Make CMake copy the runtime resources to the correct location
2017-10-13 19:32:53 +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
AnyOldName3
c9e86a8ebc
Remove superfluous argument
2017-10-12 18:16:44 +01:00
AnyOldName3
a52c485090
Fix list length error
2017-10-12 18:16:10 +01:00
AnyOldName3
6af8ad70a5
Remove superfluous copy_all_files macro
2017-10-12 17:50:20 +01:00
AnyOldName3
76c4ff983a
Fix getting cmake property as variable
2017-10-12 17:17:25 +01:00
AnyOldName3
1f86fa3c31
Fix resource copying on non-MSVC targets
2017-10-12 17:09:01 +01:00
AnyOldName3
b00b94f0db
Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types.
2017-10-12 15:40:37 +01:00
AnyOldName3
f9a3562ccd
Remove duplicate macro definition and fix warning
2017-10-12 02:45:50 +01:00
AnyOldName3
2652a89df4
Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically
2017-10-11 22:10:52 +01:00
AnyOldName3
5ceaaabeb2
Remove MESSAGE calls I accidentally left in
2017-10-11 22:08:49 +01:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01: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
scrawl
75c8628613
Merge pull request #1496 from ace13/add-nsis-autolaunch
...
Add a checkbox for launching OpenMW in the Windows installer
2017-10-08 14:09:42 +00:00
Alexander "Ace" Olofsson
dc127fbb93
Add a launch checkbox to the OpenMW installer
2017-10-08 11:58:38 +02: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
David Cernat
13e7504348
[Documentation] Update information
2017-10-04 15:44:33 +03: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
Nikolay Kasyanov
a795aa7685
Merge pull request #1490 from nikolaykasyanov/ci-dependency-update
...
[macOS, CI] Update dependencies
2017-10-03 21:46:16 +02:00
Nikolay Kasyanov
c598f1313c
[macOS, CI] Update dependencies
...
The following changes are included:
- https://github.com/OpenMW/openmw-deps-mac/pull/37
- https://github.com/OpenMW/openmw-deps-mac/pull/38
2017-10-03 17:34:45 +02:00
Marc Zinnschlag
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
2017-10-03 13:32:02 +02:00
scrawl
d7a5622485
Fix book window buttons overlap
2017-10-03 09:16:46 +00: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
scrawl
841990fcdb
Merge pull request #1485 from akortunov/master
...
Fix a failed assert in the getCell() check during a new game start
2017-09-29 22:53:10 +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
Miloslav Číž
64793a55dc
get rid of buggy shader trick
2017-09-28 20:44:43 +02:00
scrawl
7bb0a76df2
Fix tooltips showing when cursor isn't visible
2017-09-28 19:42:16 +02:00
Miloslav Číž
c9c6326d87
fix non-refraction water rain ripples
2017-09-28 19:23:37 +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
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
fb8306b61f
Disable keyfocus for world map button
...
Fixes 'Tab' no longer working as a keybinding for closing the inventory window.
2017-09-27 21:30:31 +02:00
scrawl
0240a6c38b
Fix controls window regression
2017-09-27 21:30:12 +02:00
Miloslav Číž
4a332a1807
improve rain ripples
2017-09-27 21:25:14 +02:00
Miloslav Číž
5c50506c83
water shader refactor plus basic rain ripples
2017-09-27 17:13:21 +02: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
879da9c69a
Add key focus for some more button skins
2017-09-27 12:56:06 +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
44720bf41a
Allow MWList items to retain key focus
2017-09-27 12:56:00 +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
b9341925f2
Set AutoSizedEditBox as Static by default
...
Would look very odd anyway to use it for editable text, with the widget resizing as you type.
2017-09-27 12:55:53 +00:00
scrawl
010a7ea5b3
Fix tooltip widgets being set to accept key focus
2017-09-27 12:55:52 +00:00
scrawl
a0ee1c5630
Fix order of buttons in book window layout for key cycling
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
c88c535e0e
Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2
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
scrawl
9b91ea5d34
Exit drag-and-drop if dragged item is deleted ( Fixes #3097 )
2017-09-26 16:51:19 +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
e4c9d84666
Disable NeedKey for ScrollView skins
...
The widget is set to accept key focus by default for no reason I can tell. Fix in MyGUI TBD
2017-09-25 01:20:46 +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
76ddf8d794
Support Up/DownArrow keys to change NumericEditBox value
2017-09-25 00:47:07 +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
2c4b0cc408
Hide sneak indicator by default
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
622e3ebd60
Remove excessive padding in some GUI layouts
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
1ad14b232f
Adjust ImageButton to accept key focus and use the 'highlighted' texture
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
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
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
scrawl
d07fe91cfe
Don't use MW_Dialog skin with plain Widgets
...
After MyGUI commit cfdaf5f , the 'Client' area will be used for every type of widget, whereas previously it would only be used for some widgets like 'Window'. Use 'Window' widget where the client was always used.
This fixes a wrong margin when built with cfdaf5f or later.
2017-09-20 22:56:57 +02:00
scrawl
fb975d02db
Use client coordinates in HBox/VBox
2017-09-20 22:41:50 +02:00
scrawl
186cc1e370
Fix skins incorrectly named 'Client' to avoid a collision with new MyGUI feature cfdaf5f
2017-09-20 22:29:34 +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
Kyle Cooley
2abf7f1752
Remove unnecessary cache dump
2017-09-15 12:19:12 -04:00
Kyle Cooley
09e645a0e0
Fix careless mistake.
2017-09-09 23:18:09 -04: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
Kyle Cooley
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
2017-09-08 14:37:03 -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
Kyle Cooley
99e90ef808
Cleanup. Also modify ltex index generation.
2017-09-05 19:29:07 -04:00
Kyle Cooley
97d0fd756a
LTEX importing
2017-09-04 19:31:09 -04:00
Kyle Cooley
5c3e90da88
Fix includes
2017-09-04 15:14:42 -04:00
Kyle Cooley
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
2017-09-04 15:13:45 -04:00
Kyle Cooley
90c485104a
Land creator
2017-09-04 01:06:58 -04:00
Kyle Cooley
7cc95a11a4
Add more land table columns
2017-09-03 20:00:19 -04:00
Kyle Cooley
30ba1d4c25
Move touch command to creator, to allow customization and not break abstraction
2017-09-03 17:01:16 -04:00
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
HiPhish
c822b1fa35
Write chapters about tables and record types.
...
The "Tables", "Record Types" and "Record Filters" chapters have been
adapted from the already existing manual.
2017-01-08 15:43:33 +01:00