krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
20899 commits 35 branches 0 tags 65 MiB
Commit graph

15721 commits

Author SHA1 Message Date
David Cernat
a639d3494a [Client] Fix use of DedicatedPlayers as targets for ConsoleCommand 2018-01-05 01:24:15 +02:00
David Cernat
502df7d9c1 [Client] Clean up GUIChat slightly 2018-01-05 00:03:05 +02:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master 
Add OpenMW commits up to 2 Jan 2017
 2018-01-04 12:12:18 +02:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
David Cernat
1cf2f35a28 [Server] Add script functions to set & get plugin enforcement state 2018-01-02 16:33:18 +02:00
Andrei Kortunov
b277b83810 Display the 'Screenshot saved' message after the screenshot saving (bug #4191) 2018-01-02 14:52:42 +04:00
Bret Curtis
c3c3fbc68e overriden -> overridden 2018-01-02 11:42:08 +01:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master 
Add OpenMW commits up to 1 Jan 2017
 2018-01-02 07:50:37 +02:00
David Cernat
bca9c55046 [Client] Reinstate "Merge pull request #1529 from drummyfish/animfix" 
This reverts commit 2f4cd6b713 and adds back the changes made by 45993d3da2 because the OpenMW issue at https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
 2018-01-02 07:47:27 +02:00
Koncord
c4949ac5d9 [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Thunderforge
3f7143556a Providing different mappings depending on the version of SDL installed 2018-01-01 22:16:54 -06:00
Koncord
8f5d31cb03 [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Koncord
4ab338bbb1 [Server] Register ON_PLAYER_QUICKKEYS event 2018-01-02 11:53:03 +08:00
Koncord
5777759aae [General] Change enum QuickKey::QUICKKEY_TYPE to enum class 2018-01-02 11:52:38 +08:00
Koncord
2019128d92 [Server] Change signature of TimerController::kill, validate callback 2018-01-02 08:17:26 +08:00
Miloslav Číž
3b741dc4b7 Revert "Add slider for refraction size in settings window" 
This reverts commit ee40b41285.
 2018-01-01 13:28:14 +01:00
David Cernat
51a92bcf8f [Client] Fix build 2018-01-01 13:10:57 +02:00
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
scrawl
57257d057f
Remove unintended jump cooldown (Fixes #4250) 2017-12-31 23:48:51 +00:00
David Cernat
47a3dc9ff2 [Server] Add broadcast argument to functions for sending WorldPackets 2017-12-30 21:52:30 +02:00
David Cernat
1e2517698d [Server] Send player speech and animation packets only to nearby players 2017-12-29 06:17:45 +02:00
David Cernat
2f4cd6b713 [Client] Revert "Merge pull request #1529 from drummyfish/animfix" 
This reverts commit 45993d3da2, reversing
changes made to 3d347730dc.

That commit made players have to wait around 1.5 seconds after each jump before doing a new one.

It will be reinstated once its accompanying OpenMW issue at https://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
Marc Zinnschlag
7245b251e8 Merge remote-tracking branch 'drummyfish/cs-cam' 2017-12-19 17:01:13 +01:00
Marc Zinnschlag
93716cecd9 Merge remote-tracking branch 'origin/master' 2017-12-19 17:01:03 +01: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
Miloslav Číž
01f9d90315 CS: Reorder 3D input menu 2017-12-15 17:22:32 +01:00
Miloslav Číž
13dc1bd41e CS: Add tooltip to camera-ortho-size preference 2017-12-15 14:56:03 +01:00
Miloslav Číž
1f5feeddb9 CS: Change camera parameter types to int 2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242 CS: Mover object-marker-alpha under Rendering 2017-12-15 14:36:12 +01:00
Marc Zinnschlag
ecf1cea1b7 Merge remote-tracking branch 'drummyfish/cs-cam' 2017-12-15 13:41:54 +01:00
Miloslav Číž
79527b746a Remove unused variable 2017-12-14 17:29:24 +01:00
Miloslav Číž
b246580c63 Fix orbit camera axis 2017-12-13 20:08:38 +01: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
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
Miloslav Číž
ee40b41285 Add slider for refraction size in settings window 2017-12-09 14:03:56 +01: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
Miloslav Číž
b69c16e682 Add setting option to scale water refractions 2017-12-06 20:39:09 +01: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
David Cernat
a796f81444 [General] Add and use utility function for int value checks in vectors 2017-11-26 13:03:54 +02:00