Commit graph

14737 commits

Author SHA1 Message Date
Andrei Kortunov
3b163ce6ce Disable sound distortion for PlaySound script command 2017-07-15 10:58:19 +04:00
David Cernat
e3929df38a Merge pull request #239 from OpenMW/master
Add OpenMW commits up to 14 Jul 2017
2017-07-15 09:13:04 +03:00
David Cernat
43a3daf0aa [General] Add & implement PlayerShapeshift packet for werewolf states 2017-07-15 09:02:19 +03:00
scrawl
ada85aa1ee Merge pull request #1331 from akortunov/guidistortionfix
Prevent GUI sounds distortion
2017-07-14 19:55:33 +02:00
David Cernat
ad9fa0631a [General] Rename jailText to jailEndText and add jailProgressText in PlayerJail 2017-07-13 20:13:28 +03:00
David Cernat
708d3723eb [Client] Fix client script messagebox buttons that had always broken in tes3mp 2017-07-13 18:58:48 +03:00
David Cernat
e36c0afc59 [General] Send faction reputation via PlayerFaction packets 2017-07-13 13:36:00 +03:00
David Cernat
be93ec8ef6 [General] Implement ObjectState packet 2017-07-13 09:46:30 +03:00
David Cernat
083b46394d [General] Add ignoreJailSkillIncreases to PlayerJail packets 2017-07-12 18:24:37 +03:00
David Cernat
5962570c48 [General] Add jailText to PlayerJail packets 2017-07-12 16:39:31 +03:00
David Cernat
5774023f8b [Client] Add missing processor initialization for ProcessorPlayerJail 2017-07-11 14:31:32 +03:00
David Cernat
3280f0c5ee [General] Implement PlayerJail packet
Rework server's DeathFunctions into MechanicsFunctions

Remove connection between PlayerResurrect and jailing
2017-07-11 13:34:09 +03:00
David Cernat
b1b27728e2 [Server] Move functions dealing with PlayerKillCount to QuestFunctions 2017-07-11 07:15:06 +03:00
Koncord
9cc07f100c [Server] Add OnObjectState callback 2017-07-11 02:21:19 +08:00
Andrei Kortunov
54b4d93f79 Added a special function for GUI sounds playing 2017-07-10 15:48:00 +04:00
David Cernat
3529f9b090 [General] Add placeholders for PlayerJail, ObjectState & ConsoleCommand 2017-07-10 12:33:53 +03:00
David Cernat
4e74910fdb [General] Disable automatic sync for PlayerJournal and PlayerFaction
Simplify PlayerFaction packets by removing BOTH action
2017-07-08 12:27:48 +03:00
David Cernat
6dde0ca9c9 [Server] Rework script functons by removing unnecessary vector buffers
Add new initialization script functions to allow clearing all player changes vectors in a manner consistent with Actor and World functions

Add toOthers boolean to all methods that send packets with player changes vectors
2017-07-07 09:25:48 +03:00
David Cernat
2c05b7f747 [Server] Rename InitiateEvent() into InitializeEvent() for consistency 2017-07-07 08:12:48 +03:00
David Cernat
1d504a665f [General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets 2017-07-05 07:06:33 +03:00
Koncord
940ae5c2fb [Server] Implement GetIP API function 2017-07-04 15:57:16 +08:00
Koncord
1f3cbb46e2 [Server] Use __ARM_ARCH definition for detecting ARM 2017-07-04 15:56:40 +08:00
Koncord
768790e9b4 [Server] Move Base processors and Initializer to processors subdirectory 2017-07-04 01:13:10 +08:00
Koncord
60ac884d13 [Server] Delete commented line 2017-07-04 00:31:57 +08:00
Koncord
9bb586de77 [Client] Simplify setMapExplored() 2017-07-03 23:43:32 +08:00
Koncord
52349278e9 [Client] Fix warnings 2017-07-03 23:41:16 +08:00
Koncord
b2339f2f9a [Client] Fix building 2017-07-03 23:40:38 +08:00
David Cernat
60574ae667 [General] Implement jail time as a death penalty 2017-07-03 15:45:21 +03:00
David Cernat
71313c5aa6 [General] Implement PlayerMap packet, part 1 2017-07-03 09:28:27 +03:00
David Cernat
ad4b1d05bb [Client] Add comments for GUI additions made by tes3mp 2017-07-03 05:06:07 +03:00
David Cernat
b1fb9ba23e [Browser] Remove Favorites tab while it remains broken 2017-07-03 02:32:32 +03:00
David Cernat
c899525e30 [General] Use address keys with clearer meaning in tes3mp config files 2017-07-03 01:31:48 +03:00
David Cernat
99640da111 Merge pull request #234 from OpenMW/master
Add OpenMW commits up to 30 Jun 2017
2017-07-02 14:22:06 +03:00
David Cernat
1f682749d6 [General] Add optional notes to PasswordDialogs 2017-07-02 13:07:36 +03:00
Koncord
9630f95335 [Server] Remove debug output 2017-07-02 11:12:41 +08:00
Koncord
73cf134107 [General] Fix incoming password string 2017-07-02 11:11:33 +08:00
Koncord
0cf09adb44 [General] Move AddProcessor to BasePacketProcessor 2017-06-30 20:09:05 +08:00
Koncord
d9e98ec771 [Server] Add expected ‘;’ 2017-06-30 19:58:14 +08:00
Koncord
d14ad55a49 [Server] Fix compilation on arm 2017-06-30 19:46:27 +08:00
Koncord
f92117e73d [Server] change "__arm__" to "__ARM_ARCH" in ARM detection 2017-06-30 19:31:07 +08:00
Koncord
15a197cb9a [Server] Temporarily disable CallFF for ARM 2017-06-30 19:17:04 +08:00
Koncord
f015c3b2f6 [Server] Remove commented code 2017-06-30 18:03:01 +08:00
Koncord
653db9e266 [Server] Simplify native CallPublic & CreateTimerEx 2017-06-30 18:01:14 +08:00
Koncord
5292914325 [Server] Simplify native CallPublic & CreateTimerEx 2017-06-30 17:59:50 +08:00
Koncord
1c09e0c255 [Server] Add CallFF dependency 2017-06-30 17:58:41 +08:00
scrawl
951c4e12e0 Fix crash introduced by commit 1d8a9ff622 (Fixes #3940) 2017-06-30 00:52:02 +02:00
David Cernat
0b68e59060 [Client] Send ObjectLock packets when using lock spells 2017-06-29 22:29:49 +03:00
Koncord
9519c467eb [Client] Simplify updateEquipment for LocalPlayer & LocalActor 2017-06-29 14:52:23 +08:00
Koncord
596f42e408 [Client] Fix "invalid iterator" error 2017-06-29 14:36:56 +08:00
David Cernat
685bf15d52 Merge pull request #231 from OpenMW/master
Add OpenMW commits up to 27 Jun 2017
2017-06-28 05:58:19 +03:00
Koncord
5b2cab4c6b [General] Change NULL to nullptr 2017-06-27 22:49:28 +08:00
Koncord
0ed0d2417b [Client] Make foreach style consistent with other 2017-06-27 22:27:02 +08:00
Koncord
2427a4f877 [Client] Update DedicatedActor to C++11 2017-06-27 22:25:39 +08:00
Koncord
8f7da49152 [Client] Update DedicatedPlayer to C++11 2017-06-27 22:25:29 +08:00
Koncord
08666cabdb [Client] Update PlayerList to C++11 2017-06-27 22:24:34 +08:00
Koncord
a110ec1767 [Client] Update GUIController to C++11 2017-06-27 21:59:05 +08:00
Koncord
aa1f5c3cd3 [Client] Change pointer type to reference 2017-06-27 21:58:36 +08:00
Koncord
7499777b3a [Client] Update CellController to C++11 2017-06-27 21:56:40 +08:00
Koncord
7d4dd2ad1c [Client] Update Cell to C++11 2017-06-27 21:56:24 +08:00
Koncord
7918e887dd [Client] Update ActorList to C++11 2017-06-27 21:56:14 +08:00
Koncord
aa12b35d03 [Client] Update LocalActor to C++11 2017-06-27 21:12:00 +08:00
Koncord
689050e1d0 [Client] Long expression to lambda 2017-06-27 21:01:13 +08:00
Koncord
58a6a8c3bc [Client] Update LocalPlayer to C++11 2017-06-27 20:43:39 +08:00
Andrei Kortunov
7fcb22b867 Do not show empty journal entries (fixes #3891) 2017-06-27 15:54:16 +04:00
Koncord
6222c20e82 [Client] Convert MechanicsHelper to namespace 2017-06-27 16:43:53 +08:00
Koncord
7d3e08f031 [Client] Simplify loops 2017-06-27 16:32:16 +08:00
Koncord
f7341c021f [Client] Modernize loops in WorldEvent to C++11 2017-06-27 15:58:41 +08:00
Koncord
61cc3ced5d [Client] Remove boost from processors 2017-06-27 15:25:30 +08:00
Koncord
e68eee651a [Server] Fix Resurrect 2017-06-27 15:16:23 +08:00
Koncord
fcccd7b665 [General] Remove creatureStats.mDead from packets 2017-06-27 15:03:41 +08:00
Koncord
c58c26f6c0 [Server] Implement native CreateTimer & CreateTimerEx 2017-06-27 14:50:40 +08:00
Koncord
9ab58b6708 [Server] Remove redundant SetResurrectType
Rename SendResurrect to Resurrect
2017-06-27 14:49:39 +08:00
David Cernat
813a3c89c4 [General] Implement PlayerBook packet to track skill books read 2017-06-27 08:27:14 +03:00
David Cernat
b3b73c5cd2 [General] Implement resurrection at nearest shrine or temple 2017-06-27 01:01:45 +03:00
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
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