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
David Cernat
a84c4c7ecc
[Server] Print module order on startup
2017-12-10 15:57:19 +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
David Cernat
f2eca2566f
[Server] Add storedData table for Player to increase clarity
...
This way, customData is meant to hold module-specific and temporary data while storedData is meant to hold persistent core data.
2017-12-10 10:06:27 +02:00
Koncord
077a3d06b3
[General] Change type of BasePlayer::resurrectType to ResurrectType
2017-12-10 12:01:04 +08:00
Koncord
f9c4b847aa
[Server] Make argument const reference
2017-12-10 11:46:50 +08:00
Koncord
c5388e49f2
[Server] Remove Pawn switcher in cmake
2017-12-10 10:29:10 +08:00
Koncord
ba07d7820f
[Server] Remove Terra
2017-12-10 10:20:24 +08:00
Koncord
77d14211c9
[Server] Add Weather.cpp to build
2017-12-10 10:16:16 +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
44dc153ebe
[Server] Add Weather API
2017-12-10 09:51:03 +08:00
Koncord
aff1859759
[Server] Add new line for help strings
2017-12-10 09:47:35 +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
bfdf348a6c
[Server] Fix Undefined behavior
2017-12-09 18:01:15 +08:00
Koncord
f11473da87
[Client] Remove WorldEvent::addObject(), use move semantics
2017-12-09 15:05:47 +08:00
Koncord
4d0072a74c
[Server] Use foreach loop
2017-12-09 15:04:09 +08:00
Koncord
cd620e17ec
[Server] Use std::move(tokens)
2017-12-09 15:03:44 +08:00
Koncord
dd352f0a91
[Server] Improve Player::sendToLoaded()
2017-12-09 15:03:06 +08:00
Koncord
f35d35741e
[General] Remove redundant code
...
Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls
2017-12-09 14:59:41 +08:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
Koncord
585c24cee8
[Server] Optimize CellController
2017-12-09 11:44:56 +08:00
Koncord
ff8b5061b4
[Server] Modernize CellController singleton
2017-12-09 11:08:53 +08:00
Koncord
e97dac7793
[Server] Mark derived processor classes as final
2017-12-09 10:20:55 +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
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 Číž
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
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
1c7330635b
[Server] Add & register ON_PLAYER_WEATHER event
2017-12-08 20:38:36 +08:00
Koncord
392e645fe5
[Server] Add isMarkedForDeleteion function
2017-12-08 20:37:22 +08:00
Koncord
91398c5dcc
[Server] Implicitly join to "Default" channel
2017-12-08 20:35:19 +08:00
Koncord
aa183e6844
[General] Introduce chat channels
2017-12-08 07:43:29 +08:00
Koncord
c55f0f73b8
[Server] Pass shared_ptr<Player> by reference
2017-12-08 07:32:49 +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
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
Koncord
94f3eaa980
[Server] Fix warning "implicit fallthrough"
2017-12-06 13:30:39 +08: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
David Cernat
456bcee68a
[Server] Use Utils function as workaround for "bad exception" on Windows
2017-12-04 14:32:23 +02:00
David Cernat
cfb5835e17
[Server] Clean up method and variable names
2017-12-04 10:39:20 +02: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
993cc3dfd6
[Server] Rename server "plugins"/"mods" into "modules" for clarity
...
The terms "plugins" and "mods" were used interchangeably to refer to collections of server scripts, which was bound to cause confusion later on, especially with client data files frequently being referred to as "plugins" and "mods" as well.
Moreover, the server configuration file now starts its manual ordering with "Module1" for consistency with the pluginlist.json (soon to be dataFileList.json) of the CoreScripts.
2017-12-02 15:39:08 +02: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
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
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
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
2017-11-30 12:18:15 +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
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
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
720ef5f6c5
[General] Use consistent code style
2017-11-29 13:00:22 +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
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
David Cernat
901fe72471
[Server] Fix variable shadowing in Player
2017-11-26 13:14:53 +02:00
