1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Commit graph

15017 commits

Author SHA1 Message Date
David Cernat
a358dc6af8 [Client] Revert 0020132 now that 534c819 provides a better fix 2017-06-26 07:36:57 +03:00
David Cernat
7d81b84dd8 [Client] Write list of loaded plugins to log 2017-06-26 06:49:58 +03:00
David Cernat
77758596a1 Merge pull request #230 from OpenMW/master
Add OpenMW commits up to 25 Jun 2017
2017-06-26 03:13:00 +03:00
scrawl
8d17565efd Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900) 2017-06-25 14:44:17 +02:00
scrawl
903e59f495 Don't reset idle time when there is no camera movement (Fixes #3902) 2017-06-25 13:08:55 +02:00
scrawl
44e2089098 Don't play 'menu click' sound for right clicks (Fixes #3919) 2017-06-25 12:52:59 +02:00
scrawl
534c81976c Add missing cell update for physics system (Fixes #3917) 2017-06-25 12:47:57 +02:00
David Cernat
9a519b5cc2 [Client] Avoid incrementing actor death count if we aren't its authority 2017-06-23 09:22:48 +03:00
David Cernat
66a3f3d475 [Server] Use cleaner solution for safely reading cell descriptions 2017-06-23 08:29:14 +03:00
David Cernat
78f29302ef [General] Fix PlayerJournal logic by sending only refIds for its actors
Additionally, make the refIds for actors usable in script functions.
2017-06-23 08:12:32 +03:00
David Cernat
48c63dbce9 [General] Fix ObjectLock packets by making hasCellData true for them 2017-06-22 05:49:44 +03:00
David Cernat
4ad87faac1 [Server] Create new Settings category for script functions 2017-06-20 07:24:15 +03:00
David Cernat
ebf7740969 [General] Repurpose GameConsole packet as GameSettings & add difficulty to it 2017-06-20 05:28:45 +03:00
David Cernat
df67ae4689 Merge pull request #229 from OpenMW/master
Add OpenMW commits up to 20 Jun 2017
2017-06-20 04:16:51 +03:00
scrawl
62f0ba6045 Merge pull request #1279 from Allofich/position
Fix actors not returning to their wander locations
2017-06-20 00:57:44 +02:00
scrawl
73fbaae97f Merge pull request #1325 from jordan-ayers/bugfix/3684-restock-soul-gems
Adjust restock calculations to ignore filled soul gems. (Bug #3684)
2017-06-20 00:39:39 +02:00
scrawl
41fb17f39b Revert "Correcting https://bugs.openmw.org/issues/3906"
This reverts commit b0abed00e5.
2017-06-20 00:36:06 +02:00
David Cernat
c6aee3b780 [Client] Fix build by changing boost::shared_ptr into std::shared_ptr 2017-06-18 19:36:06 +03:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Andrei Kortunov
1a8f2bfc11 Combat AI: select target by priority 2017-06-16 16:11:12 +04:00
Andrei Kortunov
a2be73295b Combat AI: take in account enemy weapon resistance 2017-06-16 13:33:42 +04:00
Andrei Kortunov
62b24eb078 Combat AI: do not use range weapons under water 2017-06-16 12:20:31 +04:00
Jordan Ayers
b277bd782e Adjust restock calculations to ignore filled soul gems.
Bug #3684
2017-06-15 21:59:13 -05:00
Allofich
4f08084e79 Make stationary actors return to position on load
Also makes wandering actors resume their previous destination when an interrupting combat or pursuit ends.

(Fixes #3656)
2017-06-15 18:33:50 +09:00
Allofich
028762a7dc Make guards that are attacked try to arrest player
(Fixes #3706)
2017-06-15 01:47:10 +09:00
scrawl
cd1821c464 Merge pull request #1322 from Siimacore/wizardthreadfix
Stopping the thread in the wizard that prevented it to stop correctly
2017-06-13 19:48:06 +02:00
scrawl
53264f34b3 Merge pull request #1321 from akortunov/spellpriority
Use mRange to check spell range instead of mArea.
2017-06-13 17:06:47 +02:00
Allofich
42402976e3 Fixes for building in MSVC 2017-06-13 19:38:12 +09:00
Siimacore
6af470ff03 Stopping the thread in the wizard that prevented it to stop correctly 2017-06-13 12:00:55 +02:00
Andrei Kortunov
87939bf3b1 Use mRange to check spell range instead of mArea. 2017-06-13 11:02:40 +04:00
scrawl
f7969fb178 Merge pull request #1317 from Siimacore/master
Correcting https://bugs.openmw.org/issues/3906
2017-06-12 23:47:07 +02:00
scrawl
dd3f612e88 Merge pull request #1316 from akortunov/doorfix
Doors usage improvements
2017-06-12 23:34:40 +02:00
scrawl
80eb2ea35d Merge pull request #1313 from akortunov/spellpriority
Make combat AI to do not cast target spells under water
2017-06-12 23:32:35 +02:00
scrawl
6d90f5a9a5 Merge pull request #1312 from akortunov/guifixes
Split greeting from topic response
2017-06-12 23:19:45 +02:00
Koncord
3803535bd5 [General] Implement CleanChat() 2017-06-12 08:01:47 +08:00
Koncord
7b98f9f7ff [Server] Log all exceptions 2017-06-11 20:04:56 +08:00
Andrei Kortunov
e9d0bf7c12 Added missed return statement 2017-06-11 15:06:44 +04:00
Andrei Kortunov
9fdfb2a83f Spell priority: make AI do not cast target spells when enemy is under water 2017-06-11 10:13:00 +04:00
Siimacore
b0abed00e5 Correcting https://bugs.openmw.org/issues/3906 2017-06-10 21:36:35 +02:00
Andrei Kortunov
cab51d26cc Doors: small key search optimizations 2017-06-10 22:33:14 +04:00
Andrei Kortunov
188424d5d3 Allow AI to use keys to open doors 2017-06-10 22:31:17 +04:00
David Cernat
51b95f35cd [Server] Fix problem with fetching interior cell descriptions 2017-06-10 18:03:58 +03:00
David Cernat
db7709ee18 [Server] Modernize getting and setting of player cells 2017-06-10 17:49:41 +03:00
David Cernat
0d3976950b [Server] Use consistent names for rotation script functions 2017-06-10 17:06:09 +03:00
David Cernat
bea3afaec8 [Client] Ensure uninitialization of DedicatedActors for late packets 2017-06-10 15:49:00 +03:00
David Cernat
1ae5bd19e1 [Client] Don't set difficulty based on client settings 2017-06-10 15:29:09 +03:00
David Cernat
70d9374a6a [General] Implement PlayerKillCount packets 2017-06-10 14:04:19 +03:00
David Cernat
5b23da8e1c [General] Rename unused PlayerRegionChange packet into PlayerKillCount 2017-06-10 12:01:37 +03:00
David Cernat
ee5c9b65c5 [General] When changing region, send new region name in PlayerCellChange 2017-06-10 11:43:40 +03:00
David Cernat
e5f5b047bc [Client] Don't send empty ObjectSpawn packets for cells with no leveled creatures 2017-06-10 11:04:17 +03:00
David Cernat
f02ed0d621 [Server] Add script functions for getting and setting actor dynamic stat modifiers 2017-06-10 09:28:35 +03:00
David Cernat
79351c737e [Client] Disable back button in chargen race window 2017-06-10 08:10:56 +03:00
David Cernat
002013294a [Client] Add temporary fix for OpenMW crash caused by using default head 2017-06-10 06:49:07 +03:00
David Cernat
312fc84a6f [Client] Use update timer in mwmp::Cell instead of LocalActor 2017-06-10 03:29:51 +03:00
Bret Curtis
dbf149f9b2 gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now 2017-06-10 00:51:19 +02:00
Andrei Kortunov
4600f24e27 Playing sound when AI is opening a door 2017-06-09 22:52:40 +04:00
Bret Curtis
c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2 replace and purge boost::function 2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96 remove boost/tuple 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required
put boost system back in, clean others up

revert Qt

add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104 replace boost::shared_ptr in extern and components 2017-06-09 19:08:53 +02:00
Bret Curtis
c8b67221d7 use nullptr instead of NULL 2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
David Cernat
18bf79e08b [Client] Correctly set mpNum for placed gold 2017-06-09 13:31:19 +03:00
Andrei Kortunov
3190f28710 Spell priority: make AI do not cast target spells under water 2017-06-09 10:23:46 +04:00
David Cernat
6ac7ee8fcd [Client] Fix problems with NPC equipment sync 2017-06-09 04:58:56 +03:00
Andrei Kortunov
4bb9622c21 Handle greetings differently from responses 2017-06-08 22:40:31 +04:00
David Cernat
abaa26e32a Merge pull request #226 from OpenMW/master
Add OpenMW commits up to 8 Jun 2017
2017-06-08 05:25:47 +03:00
scrawl
59eb0aba7d Merge pull request #1310 from akortunov/guifixes
Removed empty space before dialogue entry (bug #3892)
2017-06-07 21:55:45 +02:00
Koncord
587b53bfed [Client] Reorder files 2017-06-07 00:06:10 +08:00
Koncord
568b0702fa [Server] Implement PasswordDialog 2017-06-06 23:34:27 +08:00
Koncord
b84f97ec2b [Client] Implement PasswordDialog 2017-06-06 23:33:59 +08:00
Koncord
cef58fa164 [Server] Change fprintf to LOG_MESSAGE_SIMPLE in GET_PLAYER 2017-06-06 16:35:05 +08:00
Koncord
186e5fe33e [Server] Remove GetAngleY & remove Y parameter from SetAngle 2017-06-06 16:33:34 +08:00
David Cernat
89f6c6df96 Merge pull request #225 from OpenMW/master
Add OpenMW commits up to 4 Jun 2017
2017-06-05 03:38:58 +03:00
Andrei Kortunov
c2962ced90 Removed empty space before dialogue entry (bug #3892) 2017-06-04 23:20:43 +04:00
scrawl
172cc65be9 Merge pull request #1308 from akortunov/spellpriority
Spell priority: dispel usage improvements
2017-06-04 12:49:53 +02:00
Andrei Kortunov
00402b7154 Removed unused variable 2017-06-04 14:09:23 +04:00
scrawl
70e02f4c28 Merge pull request #1306 from Nialsy/master
Fixed quickload with menus open
2017-06-04 11:18:49 +02:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
David Cernat
315ec46ff6 Merge pull request #224 from OpenMW/master
Add OpenMW commits up to 3 Jun 2017
2017-06-03 17:19:34 +03:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
Andrei Kortunov
42f3c73c75 Spell priority: dispel usage improvements 2017-06-03 13:16:44 +04:00
Nicholas
f6f07f5497 clear mGoToJail flag on load 2017-06-02 13:33:47 -05:00
Koncord
ad873e16b8 [Client] Limiting updates to ~64 per second 2017-06-02 21:20:35 +08:00
Koncord
9742b0a801 [Client] Reset statTimer every timeout 2017-06-02 20:45:44 +08:00
Koncord
80631ae8bd [Client] Reset positionTimer on time expired 2017-06-02 20:45:19 +08:00
Koncord
a847d46984 [Client] Get rid Z axis in direction.pos 2017-06-02 18:33:51 +08:00
Koncord
d67db1a9bd [Client] Play rotation animation on dedicated players 2017-06-02 18:05:33 +08:00
Koncord
2ef1e26233 [Client] Fix ID_PLAYER_POSITION spam 2017-06-02 17:19:36 +08:00
Koncord
5f30dfd5db [Client] Get rid direction.rot 2017-06-02 15:44:39 +08:00
David Cernat
8c785fb22c [Client] Send ObjectDelete packets when summoned creatures despawn 2017-06-02 09:15:08 +03:00
David Cernat
0bed33e39e [Client] Reset player fatigue when being resurrected
This way, players killed by strong hand-to-hand attacks will no longer be forced to lie on the ground when resurrected.
2017-06-02 06:58:33 +03:00
David Cernat
75a60a4700 [Client] Update debug in CellStore 2017-06-02 05:26:07 +03:00
David Cernat
e042673779 [Client] Fix error when trying to delete player markers that don't exist 2017-06-01 22:42:57 +03:00
David Cernat
cf41956cad [Client] Prevent framerate drops caused by invalid rotation values 2017-06-01 21:45:36 +03:00
David Cernat
41de1876a3 Merge pull request #223 from OpenMW/master
Add OpenMW commits up to 31 May 2017
2017-06-01 08:11:46 +03:00
scrawl
9fd0d54a35 Merge pull request #1289 from akortunov/newrepair
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
f6c3d4935e Spell priority: feather and burden 2017-05-31 19:23:44 +04:00
Andrei Kortunov
10d4cb15ad Improved repair widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e Improved recharge widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
6c21e4ed31 Spell priority: ignore some effects useless in battle 2017-05-31 18:41:41 +04:00
scrawl
2638327593 Merge pull request #1303 from akortunov/guifixes
Character generation layout fixes
2017-05-31 15:25:41 +02:00
David Cernat
d8cd57a8be [Client] Make topic sync work with localized versions of the game 2017-05-31 14:11:16 +03:00
David Cernat
34a452d775 [Client] Fix logic for initialization and updating of player markers
Additionally, disable the Ptrs of players who move to cells that don't exist for us instead of placing them in ToddTest.
2017-05-31 10:54:19 +03:00
David Cernat
a353a21280 [General] Fix code style inconsistencies 2017-05-31 08:37:11 +03:00
David Cernat
97bf0252a4 [Client] Disable collision for actors loaded as dead from server 2017-05-31 07:52:45 +03:00
David Cernat
906b263a2d [Client] Update topics in current dialogue screen when receiving PlayerTopic packets 2017-05-31 06:51:50 +03:00
David Cernat
461ab790e2 [Client] Correctly disable auto-equipping for DedicatedPlayers & DedicatedActors 2017-05-31 05:11:39 +03:00
David Cernat
068a45be87 [General] Synchronize player & NPC rotation animations 2017-05-30 12:08:58 +03:00
David Cernat
f4cdedd8cb [General] Synchronize summoned creatures 2017-05-30 10:11:01 +03:00
David Cernat
1c6e359fe9 [Client] Set and clear hitAttemptActorId for DedicatedPlayers
This allows a DedicatedPlayer's follower NPCs to target enemies attacking the DedicatedPlayer.
2017-05-30 08:20:45 +03:00
David Cernat
4e5c8873e0 [General] Use ObjectSpawn instead of ObjectPlace for actors 2017-05-29 06:59:05 +03:00
David Cernat
0cce9908be Merge pull request #222 from OpenMW/master
Add OpenMW commits up to 29 May 2017
2017-05-29 04:53:23 +03:00
David Cernat
27148ce9eb [General] Add placeholders for 12 new packets, to be implemented soon
Additionally, make it slightly clearer who created which previously existing packets.
2017-05-29 04:43:52 +03:00
scrawl
a1661af864 Merge pull request #1301 from akortunov/tooltips
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
Koncord
b3b7003313 [Server] Add "--no-logs" option 2017-05-28 19:12:58 +08:00
Koncord
dbb636ac90 [Server] Parse program options 2017-05-28 19:10:16 +08:00
Koncord
c4686ec578 [Server] Remove debug line 2017-05-28 18:48:55 +08:00
Koncord
cc7efc6e37 [Server] Use first 10 characters of CommitHash for humans 2017-05-28 18:32:23 +08:00
Koncord
80925736c0 [Server] Add commit hash to the rules 2017-05-28 18:29:00 +08:00
Koncord
565889ccbc [Client] Add commit hash to password 2017-05-28 18:26:48 +08:00
Koncord
bc3612dfe9 [Server] Add commit hash to password 2017-05-28 18:26:38 +08:00
Koncord
6a472de1c0 [Browser] Remove servers before updating server list 2017-05-28 13:22:29 +08:00
David Cernat
b0c1aafc5a [Client] Use a 10 times higher maximum distance for linear interpolation 2017-05-28 03:30:23 +03:00
David Cernat
ea2a060c67 [Client] Sync actor movements from interiors to exteriors & vice versa 2017-05-28 01:11:32 +03:00
David Cernat
7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 2017-05-27 22:49:11 +03:00
David Cernat
6918ae7bc7 [Client] Don't crash when receiving certain packets from NULL players 2017-05-27 22:32:28 +03:00
David Cernat
2e45203bbb [Client] Clean up mapIndexes in CellController 2017-05-27 21:20:24 +03:00
David Cernat
619982b085 [Client] Only try to send actor data to other players when authorized 2017-05-27 18:55:14 +03:00
David Cernat
73b9683182 [General] Make most ActorPackets smaller by not including refIds in them 2017-05-27 16:59:23 +03:00
David Cernat
7177d56cfb [Client] Only require refNumIndex & mpNum for CellStore::searchExact() 2017-05-27 16:59:23 +03:00
Koncord
8f2ef83be1 [Browser] Fix QT warnings 2017-05-27 13:08:52 +08:00
Koncord
9f0ec849a0 [Browser] Disable refresh button when action in progress 2017-05-27 11:44:55 +08:00
Koncord
ec5d1b7a86 [Browser] Do not try to open window if server is no more reachable 2017-05-27 11:25:00 +08:00
Koncord
c8eb0f0eae [Browser] Move downloading query info to another thread 2017-05-27 10:57:34 +08:00
Koncord
e1766da83c [Master] Fix REST API for old servers 2017-05-27 09:26:32 +08:00
David Cernat
7c87ac80ee [Client] Ensure correct drawState when receiving an ActorAttack packet 2017-05-27 04:19:28 +03:00
David Cernat
bf2b3bbf51 [Browser] Once again refresh server list when starting 2017-05-27 03:18:02 +03:00
David Cernat
9d9581a1c2 [Client] Prevent DedicatedActors from automatically equipping torches 2017-05-27 02:52:26 +03:00
David Cernat
940a2b6eb5 [Server] Add script functions for setting and sending ActorEquipment 2017-05-27 00:57:40 +03:00
David Cernat
f47a10dd4a [Server] Add script callback and getter functions for ActorEquipment 2017-05-26 22:54:51 +03:00
David Cernat
311ce4119d [General] Fix logic issues related to ActorEquipment 2017-05-26 22:53:28 +03:00
Andrei Kortunov
46c8842808 Fixed enchant points calculations formula 2017-05-26 23:42:11 +04:00
David Cernat
cdfc2db2d1 Merge pull request #220 from OpenMW/master
Add OpenMW commits up to 26 May 2017
2017-05-26 17:38:59 +03:00
David Cernat
4f273932af [General] Implement sending and reading of ActorEquipment packets 2017-05-26 04:37:49 +03:00
David Cernat
ec921eefc8 [Client] Prevent players from getting stuck in drag and drop when their opened containers are deleted 2017-05-26 02:13:31 +03:00
David Cernat
20a72ec807 [Client] Send ObjectTrap packets when disarming traps with keys & probes 2017-05-26 01:47:59 +03:00
David Cernat
32879adc5b [General] Allow ObjectTrap to trigger traps, not just disarm them 2017-05-26 01:28:43 +03:00
David Cernat
93aa674eff [Server] Add SendObjectTrap() script function 2017-05-26 00:42:46 +03:00
David Cernat
7ac115b359 [Client] Implement sending and reading of ObjectTrap packets 2017-05-26 00:21:24 +03:00
Koncord
4082cddde5 [Browser] Do not allow to connect to unreachable servers 2017-05-26 03:10:53 +08:00
Koncord
f8c6ed8028 [Browser] Fix freeze when server is unreachable 2017-05-26 03:03:42 +08:00
Koncord
24d4e1c222 [General] Remove useless PacketSendMyID 2017-05-26 02:40:49 +08:00
Koncord
7a6c12bc2a [Browser] Simplify PingRakNetServer() 2017-05-26 01:37:16 +08:00
Koncord
a9fc096c9a [General] Move password of master server to header 2017-05-26 01:34:39 +08:00
Koncord
056ec2d434 [General] Fix CMake errors 2017-05-25 23:56:22 +08:00
Koncord
cb5e88ce5c [Master] Use add_definitions
Because CMAKE_CXX_STANDARD introduced in CMake 3.1
2017-05-25 23:00:18 +08:00
Andrei Kortunov
f17badb3cd Makes cells cache size configurable 2017-05-25 13:09:40 +04:00
David Cernat
97768be14b [Client] Send ObjectPlace packet for random creatures interrupting rest 2017-05-25 01:00:47 +03:00
David Cernat
dbdb11b5f0 [Server] Add script functions for dialogue 2017-05-24 23:22:43 +03:00
David Cernat
11369f6513 [General] Implement sending and reading of PlayerTopic packets 2017-05-24 21:43:34 +03:00
David Cernat
08de349133 [General] Add placeholders for PlayerTopic & ObjectTrap packets 2017-05-24 19:01:28 +03:00
David Cernat
b1264cca92 [Client] Send ObjectLock whenever using spells or keys to unlock objects 2017-05-24 16:25:44 +03:00
David Cernat
870fd9a78b [General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead 2017-05-24 13:28:34 +03:00
David Cernat
48ee8fd536 [Client] Send PlayerFaction packets when getting expelled from factions 2017-05-24 12:19:11 +03:00
David Cernat
d0ec5c61e2 Merge pull request #219 from OpenMW/master
Add OpenMW commits up to 21 May 2017, part 2
2017-05-21 22:51:44 +03:00
scrawl
f9cdc2da94 Merge pull request #1293 from akortunov/spellpriority
aicombataction.cpp: implement some spell priority TODO's
2017-05-21 21:18:10 +02:00
MiroslavR
98daf4f043 Merge pull request #1296 from akortunov/jumpfatiguefix
Fixed jump fatigue loss formula (bug #3843)
2017-05-21 11:47:58 +02:00
David Cernat
d307876199 Merge pull request #218 from OpenMW/master
Add OpenMW commits up to 21 May 2017
2017-05-21 12:04:49 +03:00
Koncord
56012db86e [Master] Fix build for windows 2017-05-21 14:53:36 +08:00
scrawl
8cd8eab9dd Merge pull request #1294 from akortunov/constenchantfix
Swap enchant type when purge selected soulgem (bug #3878)
2017-05-20 23:44:14 +02:00
Andrei Kortunov
4f41c44cd6 Swap enchant type when clean selected soulgem widget (fixes #3878) 2017-05-20 18:30:11 +04:00
David Cernat
68fa82f03a [Master] Fix build in Visual Studio 2017-05-20 12:47:06 +03:00
Koncord
17af679c07 [Master] Enable RestAPI 2017-05-20 00:06:34 +08:00
Koncord
ec6614ba32 [Master] Add RestAPI 2017-05-20 00:06:34 +08:00
David Cernat
10f84c125e [Browser] Start browser without needing to refresh first 2017-05-19 17:34:20 +03:00
Koncord
50c839d425 [Broser] Break while loop if connection was closed 2017-05-19 22:04:38 +08:00
Koncord
d3bf4ec577 [Browser] Do not try to receive packet if sending is failed. 2017-05-19 22:03:57 +08:00
David Cernat
0595192129 [Server] Make GetFactionExpelledState() return a bool instead of an int 2017-05-18 21:51:24 +03:00
David Cernat
a2e2ca7cab [Server] Add script functions for factions 2017-05-18 20:56:50 +03:00
David Cernat
e6983993c2 [General] Implement sending and reading of PlayerFaction packets 2017-05-18 19:27:20 +03:00
David Cernat
04c9c5ed48 [General] Forward PlayerJournal packets to other players 2017-05-18 12:57:48 +03:00
David Cernat
0189dbf916 [General] Make JournalItem consistent with other packet structs 2017-05-18 10:32:23 +03:00
David Cernat
90c594b726 [Server] Make names for Player script callbacks shorter 2017-05-16 20:52:09 +03:00
David Cernat
a634a5d9bb [Server] Add missing includes for ProcessorInitializer 2017-05-16 19:53:58 +03:00
David Cernat
1d0167c3c9 [Client] Add missing include for PlayerFaction processor 2017-05-16 19:30:29 +03:00
David Cernat
ad388c7e12 [General] Add placeholders for ActorEquipment & PlayerFaction packets
Also reorder packets and packet processors.
2017-05-16 19:25:31 +03:00
David Cernat
f527fe9ebe [General] Add basic integrity check to reading of ActorList packets
Additionally, add newlines to files missing them.
2017-05-16 14:20:40 +03:00
David Cernat
05564bd123 [General] Add basic integrity check to reading of Container packets 2017-05-14 20:24:06 +03:00
David Cernat
46501909ff [Client] Comment out spammy debug about Container packets 2017-05-14 11:08:53 +03:00
David Cernat
8f5e6531db [Client] Avoid updating positions and anim flags when framerate is low
Also rename DedicatedPlayer methods so they are consistent with those from DedicatedActor
2017-05-14 10:52:44 +03:00
David Cernat
271594f0ee [Client] Don't play death animations for NPCs saved as dead on server 2017-05-14 10:27:43 +03:00
David Cernat
da22639620 Merge pull request #216 from OpenMW/master
Add OpenMW commits up to 12 May 2017
2017-05-14 05:26:22 +03:00
Marc Zinnschlag
6906e35ac0 Merge remote-tracking branch 'origin/master' 2017-05-12 14:48:03 +02:00
PlutonicOverkill
5ec97811d8 Don't switch pages when right-clicking on list 2017-05-12 20:22:18 +12:00
PlutonicOverkill
7281e8b888 Remove C++11 features 2017-05-12 12:48:25 +12:00
PlutonicOverkill
cd75c5618c Move context menu code to PageBase 2017-05-11 19:46:51 +12:00
PlutonicOverkill
16f8341de3 Prevent context menu appearing for modifier settings 2017-05-10 21:24:12 +12:00
PlutonicOverkill
c2f427f48d Prevent context menu appearing when right-clicking shortcut setting 2017-05-10 20:43:52 +12:00
PlutonicOverkill
646ff72cdc Add a more elegant way of showing the context menu 2017-05-10 20:27:50 +12:00
PlutonicOverkill
bd9f657603 Show context menu when user clicks on empty space 2017-05-10 19:51:43 +12:00
David Cernat
2eb5221472 Merge pull request #215 from OpenMW/master
Add OpenMW commits up to 9 May 2017
2017-05-09 14:31:26 +03:00
David Cernat
3c30801eac [Server] Try to fix server crash from iterations through invalid players 2017-05-09 14:30:25 +03:00
David Cernat
5a786e6c56 [Client] Make all LocalActors get initialized correctly again 2017-05-09 14:19:25 +03:00
David Cernat
d7d4dec200 [Client] Don't spam AnimFlags packets when a Player or Actor is flying 2017-05-09 12:27:59 +03:00
PlutonicOverkill
30af92f575 Fix pointer initialisation bug 2017-05-09 20:58:32 +12:00
PlutonicOverkill
4879405097 Add reset context menu for key binding pages 2017-05-09 19:58:34 +12:00
PlutonicOverkill
3545cfa00a Rewrite feature to reset options to default 2017-05-09 19:50:16 +12:00
David Cernat
1f747d4375 [Client] Only apply interpolation when positions don't change too much 2017-05-09 04:41:26 +03:00
David Cernat
22e2135ce1 Merge pull request #214 from OpenMW/master
Add OpenMW commits up to 8 May 2017, part 2
2017-05-09 03:12:04 +03:00
David Cernat
cc559cf8e2 [General] Don't send packets for dead LocalActors, to fix Position spam 2017-05-09 02:47:29 +03:00
Allofich
315ad54b29 Don't make NPCs or player speak while underwater
(Fixes #3851)
2017-05-08 19:55:54 +09:00
Andrei Kortunov
de14e9811d Fixed Travis CI build 2017-05-08 11:16:03 +04:00
David Cernat
5bd95628ce [Client] Send an ObjectDelete packet when disposing of corpses 2017-05-08 08:44:43 +03:00
PlutonicOverkill
f30d1a3075 Revert everything 2017-05-08 17:24:28 +12:00
David Cernat
26087a182d Merge pull request #213 from OpenMW/master
Add OpenMW commits up to 8 May 2017
2017-05-08 01:03:19 +03:00
Koncord
31adb5d715 [Server] Allow timers callbacks to restart timers 2017-05-08 05:48:04 +08:00
scrawl
48c764a580 Update test 2017-05-07 23:31:06 +02:00
scrawl
813af876f6 Use a partial binary search in isReservedName (Fixes #3835) 2017-05-07 23:28:56 +02:00
scrawl
109bc3cb59 Merge pull request #1281 from akortunov/purgefix
Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first
2017-05-07 21:08:30 +02:00
scrawl
796d2c59ca Merge pull request #1282 from MiroslavR/noenv_player_vo
Do not apply underwater effects to player's voice
2017-05-07 21:07:19 +02:00
Koncord
d82ed7d0ad [Client] Register ProcessorGameTime 2017-05-08 02:46:02 +08:00
Koncord
6c45b6dc5b [Client] Fix ProcessorGameTime ID 2017-05-08 02:45:44 +08:00
David Cernat
3fb0bbb58c [Client] Make it possible to turn off console again 2017-05-07 20:13:49 +03:00
PlutonicOverkill
a9760ec805 Fix indenting 2017-05-07 17:07:58 +12:00
PlutonicOverkill
d8a711f89f Fix tabs 2017-05-07 17:05:50 +12:00
PlutonicOverkill
477af73ad6 Missed another one 2017-05-07 17:00:26 +12:00
PlutonicOverkill
418aeb65f1 Remove unneeded dependencies 2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8 Forgot to remove debugging code 2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710 Keep the settings page in sync with the real settings 2017-05-07 16:51:11 +12:00
David Cernat
34f0a5e076 [Client] Disable leveled creatures from their class instead of scene.cpp 2017-05-07 03:18:15 +03:00
David Cernat
aaaed8ab8b [Client] Fix potential object duplication in WorldEvent::placeObjects()
Also clean up the debug messages in WorldEvent so they don't take up multiple lines.
2017-05-07 03:17:19 +03:00
David Cernat
de49f5f175 [General] Add and use isActor bool for WorldObject 2017-05-07 03:07:09 +03:00
David Cernat
9d2c5c3502 [General] Simplify structure of BaseEvent 2017-05-06 21:57:29 +03:00
Koncord
250c199188 [Server] Fill query information about plugins 2017-05-07 02:52:28 +08:00
Koncord
87c172186e [Server] Add and implement PushPlugin method to MasterClient 2017-05-07 02:51:57 +08:00
Koncord
873da495b1 [Server] Trigger 'update' when added new rules in MasterClient 2017-05-07 02:51:25 +08:00
Koncord
f2b8a939ef [Server] Add postInit method and move getPluginListSample in to it 2017-05-07 02:49:58 +08:00
Koncord
3f34d328b8 [Browser] use range-based 'for' instead regular 'for' 2017-05-07 02:21:52 +08:00
Koncord
96212e96f4 [Browser] Fix rules list 2017-05-07 02:17:15 +08:00
Koncord
26445355e6 [Server] Fix initialization of mclient 2017-05-07 02:17:15 +08:00
Koncord
a4a77ddeff [Server] Add SetRuleString and SetRuleValue to script API 2017-05-07 02:17:15 +08:00
Koncord
a0b71eda23 [Server] FIx deadlock 2017-05-07 02:17:15 +08:00
Koncord
c2ce2f2ce7 [Server] Use MasterServer update rate from config 2017-05-07 02:17:15 +08:00
David Cernat
dcc61a095a [Client] Allow multiple WorldObjects to be added to a WorldEvent 2017-05-06 20:44:39 +03:00
Koncord
32284787de [Server] Add OnServerPostInit callback 2017-05-07 01:42:01 +08:00
Koncord
9992058942 [Browser] Use constant instead magic value in PingRakNetServer 2017-05-07 01:06:39 +08:00
Koncord
b7e45f269b [Browser] Detach ping from GUI thread 2017-05-07 00:56:50 +08:00
Koncord
db16e45e76 [Browser] Add PingUpdater & PingHelper classes for detached ping 2017-05-07 00:56:50 +08:00
Koncord
42eaa7a8fd [Browser] Optimize PingRakNetServer() function 2017-05-07 00:56:50 +08:00
PlutonicOverkill
64879c03e4 Add option to reset settings to default 2017-05-06 20:18:31 +12:00
David Cernat
bdc8b7f863 [Client] Send level creatures in ObjectPlace reply to ActorList request 2017-05-06 08:40:36 +03:00
David Cernat
9eef867928 [Client] Disable regular spawning of leveled creatures 2017-05-06 08:37:51 +03:00
David Cernat
3def111ca1 [Client] Fix graphical glitches related to DedicatedActor initialization 2017-05-06 04:49:49 +03:00
David Cernat
62aa6ed7ea [Client] Send PlayerPosition packets based on a timeout 2017-05-06 00:59:54 +03:00
David Cernat
ef12a37d59 [Client] Send ActorPosition packets based on a timeout 2017-05-06 00:33:48 +03:00
David Cernat
db3859565b [Client] Send ActorStatsDynamic packets only when stats change enough 2017-05-05 23:17:15 +03:00
David Cernat
4d81455020 [General] Rework and simplify death reasons so they work with NPCs 2017-05-05 22:16:31 +03:00
David Cernat
b745a33f18 [Client] Resurrect DedicatedActors that aren't supposed to be dead 2017-05-05 20:38:28 +03:00
David Cernat
8b4e167efe [Client] Prevent NPC subtitles from being added to open Dialogue window 2017-05-05 20:16:20 +03:00
David Cernat
bcdbecf608 [Client] Initialize Cell before moving DedicatedActor to it 2017-05-05 19:54:20 +03:00
David Cernat
60cf623455 [Client] Make DedicatedActors transition into LocalActors when eligible 2017-05-05 07:37:09 +03:00
David Cernat
06f3c07116 [Server] Only read Actor packets from players who are still authorities 2017-05-05 06:13:34 +03:00
David Cernat
206c9cc357 [Client] Use CellController pointers to make code easier to read 2017-05-05 04:58:44 +03:00
David Cernat
e05adbfe65 [Client] Add better debug for Actor cell changes 2017-05-05 04:46:40 +03:00
David Cernat
950a8eae3d [Client] Move Actors to Cells rather than reinitialize them from scratch 2017-05-05 03:52:41 +03:00
David Cernat
8b8d55e8d3 [Client] Set a very high processing range for AI for the time being 2017-05-05 03:17:28 +03:00
David Cernat
8d41a0c53b [Client] Make LocalActor initialization include newly spawned Actors 2017-05-05 02:46:16 +03:00
David Cernat
79691254a4 Merge pull request #210 from OpenMW/master
Add OpenMW commits up to 3 May 2017
2017-05-03 17:44:08 +03:00
Marc Zinnschlag
a2e863e7dd Merge remote-tracking branch 'origin/master' 2017-05-03 14:31:21 +02:00
Andrei Kortunov
4d927439ca Spell priority: item wearing check when disintegrate weapon/armor 2017-05-03 11:13:35 +04:00
Koncord
93edd67681 [Client] Use boolean var instead requestQuit or throwing runtime_error 2017-05-03 14:52:32 +08:00
Koncord
e0139c33b3 [Client] Remove destructor in Cell 2017-05-03 14:46:25 +08:00
Koncord
4eb02af8fb [Client] Use __WINDOWS define 2017-05-03 14:44:38 +08:00
Koncord
47e6820f97 [General] Move printWithWidth and intToHexStr to components 2017-05-03 14:38:44 +08:00
Andrei Kortunov
d598809ac6 Spell priority: check spell resistance, check if actor is already has a non-magnitude effect 2017-05-03 10:35:56 +04:00
David Cernat
34e77c5dae [Client] Initialize Actors based on the guid of an ActorAuthority packet 2017-05-03 04:47:04 +03:00
David Cernat
e01cadad23 [Server] Send ActorAuthority packets to all players who loaded the cell 2017-05-03 04:45:55 +03:00
David Cernat
63dd2d9246 [General] Remove code related to ActorAuthority packets that is not used 2017-05-03 04:43:59 +03:00
David Cernat
0b40cb8919 [Client] When there are more client than server plugins, print them all 2017-05-03 03:14:11 +03:00
David Cernat
92e277d75d [Client] Prevent application hang on Windows when plugins don't match 2017-05-03 02:17:19 +03:00
David Cernat
0284f18876 [Client] Replace plugin load order message with a clearer one at the top 2017-05-03 02:15:14 +03:00
David Cernat
1dbe9f0eaa [Client] Print plugin comparison in a better-looking way on Windows 2017-05-03 01:51:47 +03:00
David Cernat
f80a16b897 [Client] Don't use try/catch when printing missing plugins
Also move load order note to bottom where it fits better.
2017-05-03 00:15:43 +03:00
David Cernat
4294508082 [Client] Don't print null for missing plugins when comparing with server 2017-05-02 23:22:37 +03:00
David Cernat
c3c04bbfc3 [General] Make coding style consistent 2017-05-02 22:47:58 +03:00
Koncord
afcf5a7fc8 [Client] Fix segmentation fault 2017-05-03 02:43:58 +08:00
Koncord
ccae9590cc [Client] Fix comparison between signed and unsigned integer expressions 2017-05-03 02:43:00 +08:00
Koncord
01bdbfecfb [Client] Fix wrong checksum collection 2017-05-03 02:41:36 +08:00
Koncord
7bee82cedb [Client] Add notification about strict order 2017-05-02 23:50:36 +08:00
Koncord
f6bea7a114 [Client] Read answer about ID_GAME_PREINIT from server 2017-05-02 23:37:18 +08:00
Koncord
bda9a76d29 [Server] Send server plugin list to client 2017-05-02 23:33:50 +08:00
Koncord
f00c4dc107 [Server] Improve preload logic for parsing plugin lists 2017-05-02 20:21:08 +08:00
Koncord
5ddad6a4c6 [Server] Implement getPluginListSample() 2017-05-02 20:21:08 +08:00
Koncord
b223d0fa1e [Server] Register new callback 2017-05-02 20:21:08 +08:00
PlutonicOverkill
829560719e Make name highlighting more consistent and only for variable names 2017-05-02 17:28:42 +12:00
David Cernat
377aa9b6c9 [Server] Refresh cellActorList's count after removing Actors from it 2017-05-02 03:39:00 +03:00
David Cernat
cad3eb8968 [Client] Iterate through CellStore's mergedRefs when initializing Actors 2017-05-02 03:31:40 +03:00
David Cernat
ebf9df3fe2 [Client] Add getMergedRefs() method to CellStore 2017-05-02 03:29:52 +03:00
David Cernat
f59609fcd7 [Client] Fix actor memory leaks, part 2 2017-05-02 02:45:18 +03:00
David Cernat
9b58973929 [Client] Remove variable added by tes3mp to CellStore that is not used 2017-05-02 02:42:37 +03:00
David Cernat
83ba4b62b1 [Server] Remove Actors from a Cell's ActorList when they change cells 2017-05-02 01:39:08 +03:00
David Cernat
a77bd6652f [Client] Read ActorPosition packets sent from Lua script cell loads 2017-05-01 21:55:50 +03:00
David Cernat
4c35c328a9 [Server] Add SendActorPosition() script function 2017-05-01 20:58:40 +03:00
David Cernat
e5e888ac21 [Server] Add script functions for checking what data an Actor has 2017-05-01 20:55:36 +03:00
David Cernat
fafed96bf4 [Server] Store data from ActorPosition in the ActorLists of Cells 2017-05-01 20:42:54 +03:00
Andrei Kortunov
1520a4d7db Levelup menu layout fixes 2017-05-01 20:48:39 +04:00
David Cernat
730df061b3 [General] Add hasPositionData and hasStatsDynamicData bools to BaseActor 2017-05-01 19:44:23 +03:00
Koncord
5517d871c6 [Server] Handle ID_CONNECTION_ATTEMPT_FAILED in MasterClient
And fix log message
2017-05-02 00:24:24 +08:00
Koncord
1ce8c0f9ec [Server] Fix id in log message for ID_PLAYER_CELL_STATE processor 2017-05-02 00:16:54 +08:00
David Cernat
48b773bfcb [Client] Use float scale for WorldEvent::sendObjectScale() 2017-05-01 19:09:44 +03:00
Koncord
60f4a1d9e5 [Client] Fix issues when changing npc model to creature 2017-05-01 22:54:43 +08:00
Koncord
6ddab0d323 [Server] Add and implement "look like creature" functions 2017-05-01 21:15:12 +08:00
Koncord
e77b109ef5 [Browser] Show only fully connected players in main window 2017-05-01 18:48:47 +08:00
Andrei Kortunov
26ec467df0 Tooltips: faction, magic effects layout fixes 2017-05-01 10:00:51 +04:00
David Cernat
62d93a09c1 [Server] Add new script callbacks for cells, remove a couple of others
OnPlayerCellState and OnActorStatsDynamic are now removed as callbacks.

The old OnCellUnload is now renamed into OnCellDeletion.

OnCellLoad and a new OnCellUnload relating to a specific player's load/unload are added.
2017-05-01 02:36:13 +03:00
David Cernat
e1ee4a4f49 [Server] Store data from ActorStatsDynamic in the ActorLists of Cells 2017-05-01 00:53:08 +03:00
David Cernat
217894100a [Server] Add ReadCellActorList() script function 2017-05-01 00:49:58 +03:00
David Cernat
a73cbac226 [Server] Store a BaseActorList in every Cell to keep track of Actor data 2017-05-01 00:42:34 +03:00
Andrei Kortunov
987677db75 Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes 2017-04-30 22:39:05 +04:00
MiroslavR
d24bcbac15 Do not apply underwater effects to player's voice (Fixes #3850) 2017-04-30 18:51:49 +02:00
Andrei Kortunov
6331cc6ab9 Tooltips: level, race, class, specialization layout fixes 2017-04-30 19:45:36 +04:00
David Cernat
e8e0090b9b [General] Use new SimpleCreatureStats struct in BaseActor 2017-04-30 18:44:59 +03:00
David Cernat
0e8d115794 [Server] Clean up ActorFunctions by using readActorList pointer
Also rename scriptActorList into writeActorList, and also rename matching methods, for clarity.
2017-04-30 17:12:15 +03:00
David Cernat
b54560a362 [Server] Clean up WorldFunctions by using readEvent pointer
Also rename scriptEvent into writeEvent, along with matching methods, for clarity.
2017-04-30 16:35:56 +03:00
David Cernat
809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 2017-04-30 14:57:43 +03:00
David Cernat
f2ec6ce02c Merge pull request #209 from OpenMW/master
Add OpenMW commits up to 30 Apr 2017
2017-04-30 13:31:16 +03:00
scrawl
9f1527b7da Merge pull request #1272 from akortunov/guifixes
Service menus layout fixes
2017-04-30 12:27:21 +02:00
Koncord
eda74ddf44 [Client] Fix memory leaks 2017-04-30 13:56:30 +08:00
Koncord
3372f27f3a [Client] Notify player about current chat mode 2017-04-30 13:56:11 +08:00
David Cernat
f6a218025a [Client] Fix actor memory leaks, part 1 2017-04-30 04:19:28 +03:00
David Cernat
0ba8a407bc [Server] Reuse Cell deletion code in CellController 2017-04-30 04:03:03 +03:00
David Cernat
b62969d3cf [Server] Add OnCellUnload script callback 2017-04-30 03:32:04 +03:00
David Cernat
234510a87f [Server] Split off Cell and CellController into two different files 2017-04-29 23:05:12 +03:00
Koncord
805c346bd7 [Client] Fix copy-paste mistake 2017-04-30 01:06:47 +08:00
Koncord
465a05bad0 [Client] Add ability to look like a creature for the DedicatedPlayers 2017-04-30 00:18:44 +08:00
Koncord
7af73782f3 [OpenMW] Implement MWWorld::createRecord for Creatures 2017-04-30 00:16:19 +08:00
David Cernat
a2f6d99dfd [Server] Use new CreatureStats in ActorFunctions to fix invalid pointer 2017-04-29 18:20:01 +03:00
David Cernat
d333c0b484 [Client] Read ActorStatsDynamic packets sent from Lua script cell loads 2017-04-29 17:44:46 +03:00
Koncord
fbd8e8b3a1 [Client] Use CreatureStats instead NpcStats 2017-04-29 22:40:22 +08:00
Koncord
26c00c3141 [Client] Change chat font to RussoOne for better visibility 2017-04-29 20:34:36 +08:00
Koncord
db0e25cb6c [Client] Allow colors in the chat window 2017-04-29 20:34:36 +08:00
David Cernat
6ff9091afd [Server] Add script functions for setting actor dynamic stats 2017-04-29 02:10:14 +03:00
David Cernat
9d7142f684 [Server] Clean up order for StatsFunctions 2017-04-29 01:42:11 +03:00
David Cernat
03c56e01f9 [Server] Add script functions for getting actor dynamic stats 2017-04-29 01:15:19 +03:00
David Cernat
3d6b21942c [Server] Add OnActorStatsDynamic script callback 2017-04-29 00:32:23 +03:00
David Cernat
e419e25e72 [Client] Don't initialize actors without unique indexes 2017-04-28 23:17:23 +03:00
David Cernat
328b4fb763 [Server] Fix invalid pointers when using ActorFunctions::GetActorCell() 2017-04-28 20:31:02 +03:00
David Cernat
a71dbc7d09 [Server] Add script functions for setting actor cells and positions 2017-04-28 18:44:01 +03:00
David Cernat
9c5eb47e90 [Server] Add and use Utils::getCellFromDescription() 2017-04-28 16:33:58 +03:00
David Cernat
cc3dfd7da0 Merge pull request #208 from OpenMW/master
Add OpenMW commits up to 28 Apr 2017
2017-04-28 12:48:46 +03:00
PlutonicOverkill
95f60d2bb3 Merge branch 'master' into mark-variable 2017-04-28 20:15:48 +12:00
PlutonicOverkill
cbb2b8b119 Add setting so feature can be turned off 2017-04-28 19:57:49 +12:00
PlutonicOverkill
a8e7628e83 Enable highlighting when cursor is placed over a name (script editor) 2017-04-28 19:28:05 +12:00
Marc Zinnschlag
7919c4d672 Merge remote-tracking branch 'plutonicoverkill/master' 2017-04-28 08:40:07 +02:00
David Cernat
aeab851ed8 [Server] Add script functions for getting actor position coordinates 2017-04-28 00:05:12 +03:00
David Cernat
1ce60fbf30 [Server] Add GetActorCell() script function 2017-04-27 14:59:49 +03:00
PlutonicOverkill
e685de0f84 Fix script editor undo/redo context menu actions 2017-04-27 19:48:01 +12:00
PlutonicOverkill
6063d8e31b Fix existing context menu in script editor 2017-04-27 16:31:45 +12:00
Koncord
e53916da10 [Browser] Add Rules tab to ServerInfo 2017-04-27 11:41:45 +08:00
Koncord
db2b53c1b8 [Browser] Update to new protocol 2017-04-27 11:41:45 +08:00
Koncord
e7a1474e04 [Browser] Implement QueryClient 2017-04-27 11:41:45 +08:00
Koncord
d40a55a748 [Master] Update server via operator= instead map::insert 2017-04-27 11:41:45 +08:00
Koncord
b677a0455d [Server] Fix MasterClient crashes 2017-04-27 11:41:45 +08:00
David Cernat
752848834a Merge pull request #207 from OpenMW/master
Add OpenMW commits up to 26 Apr 2017
2017-04-27 00:15:24 +03:00
Andrei Kortunov
f484ef8ffb Fixed jump fatigue loss formula (fixes #3843) 2017-04-26 18:28:59 +04:00
Andrei Kortunov
bba822c014 Purge all effects with same ID instead only first (fixes #3839) 2017-04-26 17:18:06 +04:00
Marc Zinnschlag
61e6b0d03c improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault) 2017-04-26 15:03:30 +02:00
PlutonicOverkill
3d1e640388 Add setting to change keyboard shortcut and fix another crash 2017-04-26 19:42:03 +12:00
PlutonicOverkill
1f699552f7 Fix infinite recursion bug in uncommentSelection() 2017-04-26 15:49:39 +12:00
David Cernat
9a89284bca [Server] Add OnActorCellChange script callback 2017-04-25 23:31:37 +03:00
David Cernat
6a21ec1fdc [General] Rename PlayerPos into PlayerPosition 2017-04-25 22:11:33 +03:00
David Cernat
7b07d6651f [General] Add and use PlayerBounty packet and matching script functions 2017-04-25 21:24:39 +03:00
David Cernat
6658531713 [General] Fix names for two PlayerProcessors 2017-04-25 19:01:56 +03:00
David Cernat
7dbcfbd3b1 [Client] Use better check for empty CreatureStats in DedicatedActor 2017-04-25 16:55:58 +03:00
David Cernat
11605bd19a [Client] Make aggressive actors initiate combat with DedicatedPlayers
Previously, they were only attacking DedicatedPlayers who had attacked them first.
2017-04-25 16:08:14 +03:00
PlutonicOverkill
61e374fdfc Implement commentSelection() and uncommentSelection() 2017-04-25 19:12:18 +12:00
PlutonicOverkill
83ff7d162c Add comment/uncomment actions to the context menu 2017-04-25 16:12:59 +12:00
David Cernat
a4165325fa [Client] Improve synchronization of Actor swings 2017-04-25 01:47:43 +03:00
David Cernat
ce9605957a [Client] Use different way of preventing attacks on players in dialogue 2017-04-25 01:11:01 +03:00
David Cernat
ea7c3f2dc7 [Client] Make tes3mp combat code work with Creatures, not just NPCs 2017-04-24 21:06:23 +03:00
David Cernat
a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 2017-04-24 19:46:12 +03:00
David Cernat
44476248b7 [Client] Add and use DedicatedPlayer::update() 2017-04-24 18:38:57 +03:00
David Cernat
e11a24f446 [Client] Add back statement that should not have been removed in e4a261e 2017-04-24 18:10:05 +03:00
David Cernat
e4a261ea2e [Client] Remove unused include and variables, fixing warnings 2017-04-24 17:53:50 +03:00
Koncord
51422da641 [Server] Remove outdated code 2017-04-24 20:27:15 +08:00
Koncord
0f30f57d4d [Server] Handle IS_PENDING and IS_CONNECTING in switch 2017-04-24 20:26:19 +08:00
Koncord
d0c3d190e1 [Server] Send players list to master server 2017-04-24 20:24:39 +08:00
Koncord
3e00d42067 [Server] Reworking MasterClient to new master server 2017-04-24 20:01:05 +08:00
Koncord
9643eb6026 [Master] Notify server about announce state
Rename structure Server to QueryData
2017-04-24 19:58:48 +08:00
David Cernat
841e6a63f8 [Client] Initialize Creatures as LocalActors 2017-04-24 11:58:39 +03:00
David Cernat
850b19badf [Client] Add clearer debug messages for Actor initialization 2017-04-24 11:04:28 +03:00
David Cernat
2082f8ff4f [Client] Send LocalActor cell changes at end of mwmp::Cell's update 2017-04-24 10:59:47 +03:00
David Cernat
1f6ba9d9ee [Client] Remove jump check from LocalActor that is irrelevant for NPCs 2017-04-24 10:58:39 +03:00
David Cernat
e70faf1016 [Client] Fix crashes in PlayerProcessors from NULL players
Also rename ProcessorPlayerDrawState into ProcessorPlayerAnimFlags
2017-04-24 01:46:27 +03:00
David Cernat
dba0d47973 [Client] Revert position changes on invalid cell changes to fix glitches 2017-04-23 22:25:16 +03:00
David Cernat
5c5c62f33a Merge pull request #206 from OpenMW/master
Add OpenMW commits up to 23 Apr 2017, part 2
2017-04-23 21:35:09 +03:00
David Cernat
284f863292 [Client] Add linear interpolation for DedicatedActors 2017-04-23 21:28:23 +03:00
MiroslavR
eada8c6822 Fix wrong incrementation in InventoryStore::visitEffectSources (Fixes #3838) 2017-04-23 18:05:41 +02:00
David Cernat
a12694c6ef [Client] Fix crash caused by late-arriving ActorAuthority packets 2017-04-23 17:12:45 +03:00
David Cernat
14e1ff27cb [Client] Rename CellController's cellsActive to cellsInitialized for clarity 2017-04-23 16:53:24 +03:00
David Cernat
ef634a1c52 Merge pull request #205 from OpenMW/master
Add OpenMW commits up to 23 Apr 2017
2017-04-23 14:47:10 +03:00
David Cernat
27186f555d [Client] Enable reading of ActorPackets, and thus NPC sync, by default 2017-04-23 14:01:13 +03:00
David Cernat
871d8c8308 [Client] Send and read ActorCellChange packets 2017-04-23 14:01:13 +03:00
David Cernat
9ea69f4c1f [Client] Add LocalActor & DedicatedActor cell transition logic to World::moveObject() 2017-04-23 14:01:13 +03:00
David Cernat
4e86d8781f [Client] Clean up & simplify logic for DedicatedPlayer cell transitions 2017-04-23 14:01:13 +03:00
David Cernat
87ada3e763 [Client] Add CellController::isSameCell() and use it in LocalPlayer 2017-04-23 14:01:13 +03:00
Koncord
d1df9dde14 [Server] Add processors to source groups 2017-04-23 13:59:17 +08:00
Koncord
c35d5a2c6c [Master] Implement Master server 2017-04-23 13:39:43 +08:00
Andrei Kortunov
c2706ac3e7 Merchant repair and travel window scroll fix 2017-04-23 09:15:25 +04:00
scrawl
0e37e71ea2 Merge pull request #1266 from akortunov/handsfallbackfix
Improved hands bodyparts selection fallback
2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3 Improved bodypart select fallback (fixes #2594) 2017-04-22 22:23:10 +04:00
David Cernat
4ebc9f1314 Merge pull request #204 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2017-04-22 14:33:26 +03:00
MiroslavR
0737d6cb72 Merge pull request #1270 from Allofich/scriptfix
Check for NULL before running voice dialogue scripts
2017-04-22 01:58:20 +02:00
Allofich
f34e35eb19 Check for NULL before running voice scripts
(Fixes #3834)
2017-04-22 07:51:31 +09:00
David Cernat
a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
2017-04-21 21:07:37 +03:00
scrawl
8fbf9dc597 Merge pull request #1253 from akortunov/pinned
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f Move updatePinnedWindows() function to private section 2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa Remove unused code 2017-04-21 18:39:01 +04:00
Allofich
143ee387cc Add enabled check to animation script commands
(Fixes #3793)
2017-04-21 23:27:24 +09:00
scrawl
fc56fc0b81 Merge pull request #1265 from akortunov/develop
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
scrawl
2c879ddbbf Merge pull request #1264 from Allofich/script
Run scripts for voiced dialogue
2017-04-21 15:26:09 +02:00
Andrei Kortunov
e717d046f2 Escaped class name string 2017-04-21 17:21:57 +04:00
scrawl
1956602aa2 Merge pull request #1262 from Allofich/warnings
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce Use sLevel GMST instead of hardcoded text in load game menu 2017-04-21 09:40:25 +04:00
David Cernat
fec82dc033 Merge pull request #202 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017
2017-04-21 07:58:13 +03:00
Andrei Kortunov
6c1e3a0618 Merged from upstream master 2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f Fix shadowing warnings 2017-04-21 11:06:18 +09:00
Allofich
60c67bc327 Run scripts for voiced dialogue
(Fixes #3787)
2017-04-21 10:39:11 +09:00
scrawl
c2240e3af1 Call the WindowManager::updatePlayer after the startup script is run 2017-04-21 00:51:13 +02:00
scrawl
1ffb9e1bf3 Remove renderWorldMap() 2017-04-21 00:50:22 +02:00
scrawl
bfdde0262f Merge pull request #1260 from akortunov/levitationfix
Purge existing levitation effects when levitation is disabled (fixes #3766)
2017-04-21 00:25:09 +02:00
Allofich
ff3e307059 Pass parameters by const reference 2017-04-20 23:47:03 +09:00
David Cernat
10d554af5b [Client] Make NPCs react to DedicatedPlayer & DedicatedActor attacks 2017-04-20 17:00:40 +03:00
Andrei Kortunov
90d90b6d81 Fixed dynamic stats tooltips in review menu 2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes 2017-04-20 17:20:20 +04:00
Allofich
2e5fd74db0 Fix invalid iterator warning 2017-04-20 19:30:35 +09:00
David Cernat
edb155869b Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
2017-04-19 22:12:33 +03:00
David Cernat
6aa0fa85ab [Client] Send and read ActorAttack packets 2017-04-19 22:10:06 +03:00
David Cernat
2e8714afaa [Client] Rethink and restructure tes3mp combat code so it works for NPCs 2017-04-19 22:06:04 +03:00
scrawl
df3b4fe6a5 Merge pull request #1259 from Allofich/warnings
Fix a few Cppcheck warnings
2017-04-19 20:32:40 +02:00
David Cernat
6c2bbd6608 [Client] Fix assignAttackTarget() not assigning LocalPlayer as target 2017-04-19 20:51:31 +03:00
Andrei Kortunov
f0f1df3a96 Properly clear inventory 2017-04-19 20:54:09 +04:00
Allofich
e87d2aa1af Remove unused function 2017-04-20 01:47:30 +09:00