David Cernat
068f733d1e
Merge pull request #338 from TES3MP/master
...
Add master commits up to 16 Nov 2017
2017-11-16 08:50:27 +02: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
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
Grigorii Latyshev
6e4f6c4bd5
Change abs to std::abs
2017-11-13 21:36:55 +01:00
David Cernat
1272b03f25
[Server] Fix typo in player script function
2017-11-13 07:43:20 +02:00
David Cernat
b4e8560698
[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.
2017-11-13 05:38:56 +02:00
David Cernat
926106cf8c
[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.
2017-11-13 05:33:27 +02:00
David Cernat
a21f5d18d6
Merge pull request #336 from TES3MP/master
...
Add master commits up to 12 Nov 2017
2017-11-12 06:37:34 +02: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
David Cernat
a8261bb385
[General] Fix printing of packet identifiers after changes to logger
2017-11-12 02:36:18 +02:00
scrawl
a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix
...
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192 )
2017-11-11 22:30:59 +00:00
scrawl
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
...
Item models reworking
2017-11-11 22:12:07 +00:00
Andrei Kortunov
8c0dcd8b2b
Do not track a nearest actor during combat and pursue (bug #4179 )
2017-11-11 19:46:59 +04:00
rexelion
f0649849b8
changed variable name to be more descriptive
2017-11-11 12:00:23 +00: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
700e4d032e
Merge pull request #334 from TES3MP/master
...
Add master commits up to 11 Nov 2017
2017-11-11 03:47:22 +02:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
2017-11-11 03:46:21 +02:00
scrawl
f1aeb416ec
Disable Activate key when textinput is active (Bug #4151 )
2017-11-10 22:54:53 +00:00
scrawl
b06512a60d
Fix error message that referred to the wrong file (Bug #4159 )
2017-11-10 22:51:32 +00:00
scrawl
1afbf99f74
Make movement keys not function in text input mode
2017-11-10 22:51:31 +00:00
rexelion
69a56eaea3
don't initialise rangeAttackOfTarget
2017-11-10 10:44:53 +00: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
David Cernat
4dbada69bf
Merge pull request #332 from TES3MP/master while resolving conflicts
2017-11-10 08:50:28 +02:00
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
2017-11-10 08:43:50 +02:00
rexelion
983c33c4c8
don't use a pointer for ActionWeapon
2017-11-09 14:23:26 +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
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
rexelion
a1d9f11b04
use fProjectileMaxSpeed for ranged weapons distance
2017-11-07 11:43:21 +00:00
Koncord
ca7f3f7450
[Client] Disable focus on <tab> for chat window
2017-11-07 11:44:08 +08:00
Koncord
64b531aa3c
[Server] Remove redundant argument
2017-11-07 06:37:09 +08:00
Koncord
f377164db9
[Client] Fix build
2017-11-07 05:35:23 +08:00
Koncord
d15c674584
[General] Move getFilenameTimestamp() to Utils
2017-11-07 05:33:10 +08:00
scrawl
801f2d42d5
Merge pull request #1537 from drummyfish/guardfix
...
Check the real distance to target in AIPursue (issue #4184 )
2017-11-05 23:24:59 +00:00
Miloslav Číž
f98a821482
fix possible bug in aipursue
2017-11-05 23:46:15 +01:00
scrawl
87c79d7102
Merge pull request #1536 from rexelion/knockoutfix
...
Wait a few seconds before getting up (fixes #3884 )
2017-11-05 20:27:54 +00:00
scrawl
45993d3da2
Merge pull request #1529 from drummyfish/animfix
...
Stop character landing animation when turning (issue #4177 )
2017-11-05 20:24:24 +00:00
Miloslav Číž
430d01a39a
additional animation refactor
2017-11-05 20:19:47 +01:00
rexelion
de7a7d842b
mTimeUntilWake is initialised in the constructor
2017-11-05 18:30:34 +00:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
...
Trigger OnActivate when item is picked up through the inventory (Issue #3726 )
2017-11-05 15:35:39 +00:00
rexelion
48ec680f23
use game time instead of real time
2017-11-04 19:37:20 +00:00
Miloslav Číž
f34223fce9
check the real distance to target in aipursue
2017-11-04 20:02:21 +01:00
