David Cernat
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
2018-01-01 12:04:25 +02:00
David Cernat
2f4cd6b713
[Client] Revert "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 45993d3da23d347730dchttps://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
dddd2f1cc7
Merge pull request #361 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
2017-12-25 07:37:54 +02:00
David Cernat
5fd9079b26
[Client] Stop drag and drop when setting player inventory
2017-12-25 05:41:13 +02:00
David Cernat
40e70ebf9c
[Client] Fix key focus for chat window
2017-12-25 05:08:36 +02:00
David Cernat
bed96e5a3d
[Client] Remove check of GM_RestBed GUI mode that no longer exists
2017-12-25 03:26:28 +02:00
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
2017-12-25 02:25:01 +02:00
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
2017-12-25 02:03:02 +02:00
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
2017-12-23 13:16:38 +02:00
scrawl
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
2017-12-21 14:49:09 +00:00
scrawl
993982628d
Merge pull request #1590
2017-12-18 20:41:12 +00:00
Andrei Kortunov
1a58171e86
Do not allow to sell items from containers with zero capacity (bug #4268 )
2017-12-17 18:09:25 +04:00
David Cernat
fef6bddc68
[Client] Fix typo related to drag and dropping
2017-12-16 23:19:54 +02:00
David Cernat
535fba0cb3
[Client] Finish drag and drops when arrested or teleported by server
2017-12-16 07:21:02 +02:00
Andrei Kortunov
ba46473038
Do not skip weather transitions from SetPos script command (bug #3603 )
2017-12-13 10:53:23 +04:00
David Cernat
ebf88d12a3
[Client] Send PlayerInventory packet after buying skill training
2017-12-13 05:46:48 +02:00
scrawl
e9ecaf712b
Merge pull request #1584
2017-12-12 20:11:05 +00:00
scrawl
7d62f05f81
Merge pull request #1583
2017-12-12 20:10:59 +00:00
David Cernat
0ad9c99cf4
[Client] Send PlayerInventory packet after completing a vendor trade
2017-12-12 15:18:56 +02:00
Andrei Kortunov
0e04a26ef6
Set duration of magic effects from ingredients (bug #4261 )
2017-12-10 16:10:44 +04:00
Andrei Kortunov
c908ad2fba
Do not allow to place actors underground via SetPos (bug #3783 )
2017-12-10 14:38:02 +04:00
Koncord
077a3d06b3
[General] Change type of BasePlayer::resurrectType to ResurrectType
2017-12-10 12:01:04 +08:00
Koncord
ecbe0127b0
[Client] Remove unused variable
2017-12-10 09:57:18 +08:00
Koncord
fd721143e2
[Client] Implement weather packet
2017-12-10 09:56:55 +08:00
Koncord
25b7095396
[Client] Share WeatherManager to the mwmp::Main class
2017-12-10 09:53:36 +08:00
Koncord
122a30c183
[General] Change type of refNumIndex & mpNum to unsigned
2017-12-10 09:20:13 +08:00
Chris Robinson
08e947319a
Restore exception throwing to the decoder
2017-12-09 11:00:56 -08:00
Koncord
2726d94d10
[Client] Disallow to load save game via launch options
2017-12-09 18:18:08 +08:00
Koncord
d98bb74b80
[Client] Disable autosave on waiting
2017-12-09 18:17:29 +08:00
Koncord
f11473da87
[Client] Remove WorldEvent::addObject(), use move semantics
2017-12-09 15:05:47 +08:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
Koncord
7748e582a8
[Client] Mark derived processor classes as final
2017-12-09 10:18:17 +08:00
David Cernat
de77ee3126
Merge pull request #356 from OpenMW/master
...
Add OpenMW commits up to 7 Dec 2017
2017-12-08 23:08:34 +02: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
David Cernat
ad61d88cb1
[General] Fix typos and use consistent style for recent additions
2017-12-08 18:02:23 +02:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Koncord
051f65a4d5
[Client] Make channel buttons blinking on new messages
2017-12-08 22:53:22 +08:00
Koncord
7eecbfd08e
[Client] Fix saving channel history
2017-12-08 22:36:16 +08:00
Koncord
aa183e6844
[General] Introduce chat channels
2017-12-08 07:43:29 +08:00
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +04:00
David Cernat
85a9181c12
Merge pull request #355 from OpenMW/master
...
Add OpenMW commits up to 6 Dec 2017
2017-12-06 18:32:59 +02:00
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
2017-12-06 01:03:24 +09:00
Allofich
e0c54b3f39
Stop guards trying to arrest player when calm
...
(Fixes #3863 )
2017-12-05 23:53:02 +09:00
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
2017-12-05 10:24:58 +04:00
Andrei Kortunov
29b2308b2c
Do not display cyrillic soft/hard signs in the journal index
2017-12-04 22:42:17 +04:00
Andrei Kortunov
b6ae7f3cc8
Do not add greetings to the journal index (bug #4342 )
2017-12-04 22:42:10 +04:00
David Cernat
e97c9f72a2
[General] Rework getting/clearing of skill modifiers as with attributes
2017-12-04 15:06:27 +02:00
