David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
2017-09-04 18:05:24 +03:00
David Cernat
8c9d6a0160
[Client] Ensure that LocalPlayer's isWerewolf starts out false
2017-09-04 15:44:10 +03:00
David Cernat
ccb15cc09e
[Client] When players die, make guards willing to arrest them again
2017-09-04 15:13:05 +03:00
Koncord
510e657c93
Merge branch 'master' into new-script-api
2017-09-02 19:48:44 +08:00
scrawl
4c5992a0d5
Warn if removing a node fails
2017-09-01 21:42:35 +00:00
scrawl
132ac6001b
Fix bug of Animation::mSkeleton not being assigned
...
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713
Merge pull request #1428 from akortunov/stancechangefixes
...
[Feedback needed] Stance switching changes, part II
2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4
Reset player attack animation when unequip weapon or tool
2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec
Allow to interrupt an attack, if attack button is held
2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a
Fixes a regression with bound weapons equipping (bug #4050 )
2017-09-01 08:59:05 +04:00
scrawl
a8005c33d9
Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51
2017-08-31 21:58:12 +00:00
David Cernat
2e8718a0e0
Merge pull request #282 from OpenMW/master
...
Add OpenMW commits up to 31 Aug 2017, part 2
2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3
[Client] Shorten player names to 31 characters after they are inputted
2017-08-31 18:41:37 +03:00
David Cernat
ac3254d85f
[General] Don't send PlayerAttribute and PlayerSkill packets as werewolf
...
This will prevent the server from overwriting a player's human form stats with their werewolf form stats.
Additionally, share PlayerShapeshift packets last when exchanging data with another player.
2017-08-31 18:21:38 +03:00
David Cernat
93d1aa2e4a
[Client] Comment out the broken sending of custom spells until 0.7.0
2017-08-31 17:07:45 +03:00
David Cernat
98a7769b91
Merge branch 'master' into 0.6.0
2017-08-31 15:44:27 +03:00
Andrei Kortunov
1aaa8a76c5
Allow to play only one copy of given sound at time (bug #3647 )
2017-08-31 16:14:48 +04:00
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-08-31 15:14:13 +03:00
Koncord
54f5104345
[General] Escape format for strings
2017-08-31 20:09:05 +08:00
Andrei Kortunov
91dcd5bc6e
Do not allow to unequip weapon from inventory during attack
2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5
Do not allow to switch weapon to probe or lockpick during attack
2017-08-31 12:36:54 +04:00
David Cernat
cca4991e74
[Utils] Use consistent names for utility functions added by tes3mp
2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5
[Client] Only add valid quests to journal
2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48
[Client] Only add valid inventory & equipment items to LocalPlayer
...
Also add related debug information.
2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89
[Client] Only add spells to players that are ensured to exist
2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80
[Client] Ensure that objects searched for have a valid reference number
2017-08-31 03:40:36 +03:00
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
scrawl
43fda6cf07
Merge pull request #1423 from akortunov/spellpriority
...
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 22:38:36 +00:00
Andrei Kortunov
73d5efabee
Display negative values on fatigue progress bar
2017-08-29 18:53:21 +04:00
Andrei Kortunov
8003dbee12
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 16:40:55 +04:00
Andrei Kortunov
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
2017-08-29 15:53:23 +04:00
Koncord
2d0840cb3a
[General] Modernize Script API
...
This commit changes the style of tes3mp serverside scripting mods. Short list of changes:
* Break compatibility with old server mods
* OOP style lua API
* Basic dependency checker, allowing the installation of multiple server mods without changing configs
* Remove support for C++ plugins
* Change outdated LuaBridge to [sol2](https://github.com/ThePhD/sol2 );
* Support GCC, Clang and MSVC compilers
* New environment variables: "TES3MP_SERVER_DIR" and "TES3MP_SERVER_USERDIR";
* New entity "Command controller" for registering new chat commands;
* New Event system
* Simplified Timer API
* All Lua mods now run in their own environments
* Add global namespace - Data that can be used for communicating between mods
* Player and Actor inherit base class NetActor
2017-08-28 00:15:56 +08:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Harry
86ae2ae395
Improved shuffle ( #1412 )
2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7
Escape content file names before sending them to the GUI
2017-08-25 10:05:56 +00:00
David Cernat
2597f018d2
Merge pull request #272 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 23 Aug 2017
2017-08-23 07:22:29 +03:00
David Cernat
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
2017-08-23 07:14:45 +03:00
David Cernat
8f543fb34e
[Client] Use less exploitable way of disabling console
...
Previously, large framerate drops allowed players to open and use the console for short periods of time.
2017-08-23 04:58:07 +03:00
David Cernat
056d54e9f7
[Client] Only send ObjectScale packets for objects located in cells
2017-08-23 02:45:38 +03:00
scrawl
30665b743d
Merge pull request #1416 from akortunov/guifixes
...
Display large journal entries correctly
2017-08-22 20:37:46 +00:00
Andrei Kortunov
0177fe6602
Display large entries in journal correctly
2017-08-22 23:26:06 +04:00
Andrei Kortunov
e799cbdb51
Combat AI: allow only one summoned creature at time
2017-08-22 09:18:49 +04:00
scrawl
f0dea8b8e6
Revert "Implement a Fisher-Yates shuffle on background music"
2017-08-20 20:20:27 +00:00
David Cernat
ac27ca663b
[Client] Don't send ObjectState packets for items in containers
2017-08-20 06:58:39 +03:00
scrawl
dbb8a5c959
Merge pull request #1401 from h313/master
...
Implement a Fisher-Yates shuffle on background music
2017-08-19 22:48:24 +00:00
Harry
2a85c5f011
Implement a Fisher-Yates shuffle on background music
...
This fixes sometimes getting repetitive background music
2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd
Get only text from clipboard (bug #4025 )
2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b
Revert commit 67d59bead5 (a better
...
implementation found)
2017-08-19 15:24:06 +04:00
scrawl
2611377081
Merge pull request #1350 from akortunov/deathanimationfix
...
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-18 22:04:12 +00:00
scrawl
f277007b49
Merge pull request #1404 from akortunov/ownedcrosshair
...
Owned crosshair feature improvements [discussion]
2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de
Owned crosshair improvements (bug #2789 )
2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842
Added a delay before summoned creature corpse despawning
2017-08-18 11:58:28 +04:00
David Cernat
cffd985038
Merge pull request #266 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 18 Aug 2017
2017-08-18 07:45:36 +03:00
Capostrophic
6c8c883dc0
Making knownEffect aware that there can be more than 4 potion effects
2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac
Merge pull request #1391 from akortunov/aifollow
...
AiFollow: add a threshold when turning to target
2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b
AiFollow: add a threshold when turning to target
2017-08-17 22:52:34 +04:00
scrawl
c231d20413
Merge pull request #1362 from akortunov/spellpriority
...
Combat AI: use WhenUsed enchantments [Feedback needed]
2017-08-16 21:23:57 +00:00
scrawl
306b58349e
Merge pull request #1387 from akortunov/movementfix
...
Check actual movement for GetPCRunning and GetPCSneaking [Feedback needed]
2017-08-16 20:50:49 +00:00
scrawl
d1161819bf
Merge pull request #1396 from akortunov/dispelfix
...
Dispel only effects from spells
2017-08-16 20:49:40 +00:00
Andrei Kortunov
bc7353f100
Check animation state for GetPCRunning and GetPCSneaking
2017-08-16 20:30:47 +04:00
Andrei Kortunov
67d59bead5
Get only text from input fields (bug #4025 )
2017-08-16 15:03:04 +04:00
Andrei Kortunov
1e983604db
Dispel only effects from spells (bug #3995 )
2017-08-15 09:35:29 +04:00
scrawl
8acf0ba633
Merge pull request #1394 from akortunov/followerattackfix
...
Prevent followers from attacking player if crime was reported
2017-08-14 22:19:46 +00:00
Andrei Kortunov
ec64034160
Confiscate stolen item/gem when enchanting
2017-08-14 19:29:34 +04:00
Andrei Kortunov
7a5645b35d
Prevent followers from attacking player if crime was reported
2017-08-14 18:42:19 +04:00
Andrei Kortunov
f84eb68b3d
Confiscate an item when you try to sell it to its owner (bug #3944 )
2017-08-14 11:31:17 +04:00
scrawl
1bdcecc32e
Merge pull request #1390 from akortunov/referencecheck
...
Do not make target reference unavailable on cell change
2017-08-12 18:48:52 +00:00
Andrei Kortunov
3f159960b7
Restored pickpocket and werewolf check
2017-08-12 21:18:05 +04:00
scrawl
b6aaa2f2be
Merge pull request #1389 from akortunov/autosave
...
Create autosave when waiting
2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f
Do not make target reference unavailable on cell change (bug #3898 )
2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875
Create autosave when waiting (bug #1452 )
2017-08-12 09:06:31 +04:00
David Cernat
d51736d68f
[Client] Fix crashes caused by inventory items with disabling scripts
2017-08-11 05:49:33 +03:00
scrawl
0f983144a4
Merge pull request #1383 from akortunov/guifixes
...
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Andrei Kortunov
56f5a5dee3
Added transparency to 'owned' tooltip
2017-08-08 22:57:39 +04:00
scrawl
af9db74010
Merge pull request #1377 from LennyPenny/master
...
Fade out music before change occurs
2017-08-08 17:34:50 +00:00
Andrei Kortunov
4cc8afd25d
Add transparency for tooltips in game mode
2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248
Add transparency for interactive messageboxes in game mode
2017-08-08 20:36:50 +04:00
Lennart Bernhardt
546352dbe3
avoid starting sound updates more than necessary
2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45
remove redundant mMusicFader variable
2017-08-08 03:17:40 +02:00
scrawl
cd4525cf25
Merge pull request #1372 from akortunov/guifixes
...
Journalbook layout fixes
2017-08-07 18:49:13 +00:00
Andrei Kortunov
ab391f17db
Fixes regression in spell school detection (bug #4007 )
2017-08-07 12:12:57 +04:00
Andrei Kortunov
dd919b9f2c
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-07 09:55:50 +04:00
scrawl
ba72eb77f4
Merge pull request #1374 from akortunov/guardfix
...
Disable AiPursue package for player's followers
2017-08-06 21:11:08 +00:00
scrawl
7f5b615295
Merge pull request #1375 from MiroslavR/missing-import
...
Add missing include for isatty function
2017-08-06 21:10:11 +00:00
spycrab
632d39ca76
Allow starting at an (unnamed) exterior cell using --start (Feature #3941 )
2017-08-06 22:31:07 +02:00
Lennart Bernhardt
60a7d3d6e0
Fade out music before change occurs
2017-08-06 20:10:56 +02:00
MiroslavR
393f4ab758
Add missing include for isatty function ( Fixes #4002 )
2017-08-06 13:02:22 +02:00
David Cernat
77ce05b7d6
[Client] Fix spell casting probability synchronization
2017-08-06 00:11:54 +03:00
Andrei Kortunov
72ce118d02
Disable AiPursue package for player's followers
2017-08-05 12:38:26 +04:00
Andrei Kortunov
cf7a6232d0
Combat AI: use WhenUsed enchantments
2017-08-05 12:18:38 +04:00
scrawl
fe8437ae10
Merge pull request #1371 from akortunov/journalfix
...
Do not allow to use journal in a main menu
2017-08-04 21:45:44 +00:00
David Cernat
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
2017-08-05 00:09:34 +03:00
Jake Westrip
63343b6241
Ensure jail does not decrease a skill past zero
2017-08-05 06:15:15 +10:00
David Cernat
0e2038f045
[General] Record and get player positions before their last cell change
2017-08-04 21:45:52 +03:00
David Cernat
fbec0d9443
[Client] Remove inertia from players who are teleported via a packet
2017-08-04 21:43:01 +03:00
Andrei Kortunov
23bda7613b
Do not allow to use journal in a main menu (bug #3991 )
2017-08-04 07:31:41 +04:00
scrawl
a78f254883
Merge pull request #1368 from akortunov/tradefix
...
Trade window improvements
2017-08-03 21:09:57 +00:00
scrawl
a63b9e33fd
Merge pull request #1369 from akortunov/tauntfix
...
Take in account a temporary disposition in isAggressive check (bug #3…
2017-08-03 21:01:03 +00:00
Andrei Kortunov
56a30d7aec
Journalbook layout fixes
2017-08-03 20:27:14 +04:00
