Commit graph

11289 commits

Author SHA1 Message Date
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
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
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
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
Koncord
cd03d59056 [Client] Fix invalid read (memcheck warning) 2017-12-04 16:25:57 +08:00
David Cernat
c2f330d4f1
Merge pull request #354 from TES3MP/master
Add master commits up to 4 Dec 2017
2017-12-04 04:39:08 +02:00
David Cernat
07f0cc2b0e
Merge pull request #353 from OpenMW/master
Add OpenMW commits up to 4 Dec 2017
2017-12-04 04:38:38 +02:00
scrawl
ff1226c96b
Merge pull request #1575 2017-12-03 22:22:29 +00:00
Andrei Kortunov
8decd35607 Fixes crash on quickload from the container menu (bug #4239) 2017-12-03 21:49:13 +04:00
David Cernat
fc5e883160 [General] Rework PlayerStatsDynamic packets so they are of minimal size 2017-12-02 18:29:30 +02:00
David Cernat
d1ad0c91f8 [General] Rework PlayerEquipment packets so they are of minimal size
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
2017-11-30 12:31:54 +02:00
David Cernat
7e322f1f8b Merge pull request #352 from TES3MP/master while resolving conflicts
# Conflicts:
#	README.md
2017-11-30 10:10:38 +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
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
bd9e8bd10f [General] Simplify storing of attribute and skill index changes 2017-11-29 16:55:51 +02:00
David Cernat
eff3504b05
Merge pull request #350 from TES3MP/master
Add master commits up to 29 Nov 2017
2017-11-29 04:02:24 +02:00
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
2017-11-29 03:52:15 +02:00
Grigorii Latyshev
2abb1a2ec2 Added checkMagicka parameter 2017-11-28 23:35:54 +01:00
Grigorii Latyshev
9fe5a4d236 Revert condition changes 2017-11-28 23:35:46 +01:00
Grigorii Latyshev
dab72b45db Move mana reducing code back 2017-11-28 23:34:05 +01:00
Andrei Kortunov
b9d9660efd Update music state in the menu mode (bug #3664) 2017-11-28 20:49:48 +04:00
Andrei Kortunov
f7f8dfaf2a AiWander: do not allow flying/swimming creatures to use pathgrid 2017-11-28 18:03:13 +04:00
Koncord
e44fcdc0b3 [General] Cleanup Player packets 2017-11-28 21:38:45 +08: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
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
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