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

15044 commits

Author SHA1 Message Date
scrawl
aa95cb3d91 Merge pull request #1406 from Aesylwinn/reloadassets
Editor: Asset Reloading
2017-08-22 20:17:30 +00:00
Andrei Kortunov
0177fe6602 Display large entries in journal correctly 2017-08-22 23:26:06 +04:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -04:00
Andrei Kortunov
e799cbdb51 Combat AI: allow only one summoned creature at time 2017-08-22 09:18:49 +04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document.
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
3b9326d238 Clear terrain cache and reload terrain 2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d Reload water 2017-08-20 20:55:56 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
scrawl
f0dea8b8e6 Revert "Implement a Fisher-Yates shuffle on background music" 2017-08-20 20:20:27 +00:00
David Cernat
ac27ca663b [Client] Don't send ObjectState packets for items in containers 2017-08-20 06:58:39 +03:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04:00
scrawl
dbb8a5c959 Merge pull request #1401 from h313/master
Implement a Fisher-Yates shuffle on background music
2017-08-19 22:48:24 +00:00
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04:00
Harry
2a85c5f011 Implement a Fisher-Yates shuffle on background music
This fixes sometimes getting repetitive background music
2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd Get only text from clipboard (bug #4025) 2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b Revert commit 67d59bead5 (a better
implementation found)
2017-08-19 15:24:06 +04:00
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -04:00
scrawl
2611377081 Merge pull request #1350 from akortunov/deathanimationfix
Do not allow to loot fighting actors during death animation (bug #3528)
2017-08-18 22:04:12 +00:00
scrawl
f277007b49 Merge pull request #1404 from akortunov/ownedcrosshair
Owned crosshair feature improvements [discussion]
2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de Owned crosshair improvements (bug #2789) 2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842 Added a delay before summoned creature corpse despawning 2017-08-18 11:58:28 +04:00
David Cernat
cffd985038 Merge pull request #266 from TES3MP/0.6.0
Add hotfix commits for 0.6.0 up to 18 Aug 2017
2017-08-18 07:45:36 +03:00
David Cernat
0820b7e92b [Server] Add GetCaseInsensitiveFilename() script function
Additionally, make header order consistent in script function files.
2017-08-18 07:13:08 +03:00
Capostrophic
6c8c883dc0 Making knownEffect aware that there can be more than 4 potion effects 2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac Merge pull request #1391 from akortunov/aifollow
AiFollow: add a threshold when turning to target
2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b AiFollow: add a threshold when turning to target 2017-08-17 22:52:34 +04:00
scrawl
c231d20413 Merge pull request #1362 from akortunov/spellpriority
Combat AI: use WhenUsed enchantments [Feedback needed]
2017-08-16 21:23:57 +00:00
scrawl
306b58349e Merge pull request #1387 from akortunov/movementfix
Check actual movement for GetPCRunning and GetPCSneaking [Feedback needed]
2017-08-16 20:50:49 +00:00
scrawl
d1161819bf Merge pull request #1396 from akortunov/dispelfix
Dispel only effects from spells
2017-08-16 20:49:40 +00:00
Andrei Kortunov
bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 2017-08-16 20:30:47 +04:00
Andrei Kortunov
67d59bead5 Get only text from input fields (bug #4025) 2017-08-16 15:03:04 +04:00
Andrei Kortunov
1e983604db Dispel only effects from spells (bug #3995) 2017-08-15 09:35:29 +04:00
scrawl
8acf0ba633 Merge pull request #1394 from akortunov/followerattackfix
Prevent followers from attacking player if crime was reported
2017-08-14 22:19:46 +00:00
scrawl
24eaced7d2 Merge pull request #1395 from akortunov/tradeconfiscatefix
Confiscate an item when you try to sell it to its owner
2017-08-14 22:18:42 +00:00
Andrei Kortunov
ec64034160 Confiscate stolen item/gem when enchanting 2017-08-14 19:29:34 +04:00
Andrei Kortunov
7a5645b35d Prevent followers from attacking player if crime was reported 2017-08-14 18:42:19 +04:00
Andrei Kortunov
f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 2017-08-14 11:31:17 +04:00
Kyle Cooley
249c1ae95a Fix orbit camera jumping back to old position 2017-08-13 19:26:32 -04:00
scrawl
1bdcecc32e Merge pull request #1390 from akortunov/referencecheck
Do not make target reference unavailable on cell change
2017-08-12 18:48:52 +00:00
Andrei Kortunov
3f159960b7 Restored pickpocket and werewolf check 2017-08-12 21:18:05 +04:00
scrawl
b6aaa2f2be Merge pull request #1389 from akortunov/autosave
Create autosave when waiting
2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f Do not make target reference unavailable on cell change (bug #3898) 2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875 Create autosave when waiting (bug #1452) 2017-08-12 09:06:31 +04:00
David Cernat
d51736d68f [Client] Fix crashes caused by inventory items with disabling scripts 2017-08-11 05:49:33 +03:00
scrawl
0f983144a4 Merge pull request #1383 from akortunov/guifixes
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Thunderforge
f41a4bb937 Changing "New Installation" to "Retail CD/DVD" for clarity 2017-08-09 00:20:49 -05:00
Andrei Kortunov
56f5a5dee3 Added transparency to 'owned' tooltip 2017-08-08 22:57:39 +04:00
scrawl
af9db74010 Merge pull request #1377 from LennyPenny/master
Fade out music before change occurs
2017-08-08 17:34:50 +00:00
Andrei Kortunov
4cc8afd25d Add transparency for tooltips in game mode 2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248 Add transparency for interactive messageboxes in game mode 2017-08-08 20:36:50 +04:00
Lennart Bernhardt
546352dbe3 avoid starting sound updates more than necessary 2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45 remove redundant mMusicFader variable 2017-08-08 03:17:40 +02:00
scrawl
551045e4cc Merge pull request #1370 from Siimacore/data_files_loc_fix
Correcting https://bugs.openmw.org/issues/3906.
2017-08-07 18:52:54 +00:00
scrawl
cd4525cf25 Merge pull request #1372 from akortunov/guifixes
Journalbook layout fixes
2017-08-07 18:49:13 +00:00
Andrei Kortunov
ab391f17db Fixes regression in spell school detection (bug #4007) 2017-08-07 12:12:57 +04:00
Andrei Kortunov
dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 2017-08-07 09:55:50 +04:00
scrawl
ba72eb77f4 Merge pull request #1374 from akortunov/guardfix
Disable AiPursue package for player's followers
2017-08-06 21:11:08 +00:00
scrawl
7f5b615295 Merge pull request #1375 from MiroslavR/missing-import
Add missing include for isatty function
2017-08-06 21:10:11 +00:00
spycrab
632d39ca76 Allow starting at an (unnamed) exterior cell using --start (Feature #3941) 2017-08-06 22:31:07 +02:00
Lennart Bernhardt
60a7d3d6e0 Fade out music before change occurs 2017-08-06 20:10:56 +02:00
MiroslavR
393f4ab758 Add missing include for isatty function (Fixes #4002) 2017-08-06 13:02:22 +02:00
David Cernat
77ce05b7d6 [Client] Fix spell casting probability synchronization 2017-08-06 00:11:54 +03:00
Andrei Kortunov
72ce118d02 Disable AiPursue package for player's followers 2017-08-05 12:38:26 +04:00
Andrei Kortunov
cf7a6232d0 Combat AI: use WhenUsed enchantments 2017-08-05 12:18:38 +04:00
scrawl
fe8437ae10 Merge pull request #1371 from akortunov/journalfix
Do not allow to use journal in a main menu
2017-08-04 21:45:44 +00:00
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
2017-08-05 00:09:34 +03:00
Jake Westrip
63343b6241 Ensure jail does not decrease a skill past zero 2017-08-05 06:15:15 +10:00
David Cernat
0e2038f045 [General] Record and get player positions before their last cell change 2017-08-04 21:45:52 +03:00
David Cernat
fbec0d9443 [Client] Remove inertia from players who are teleported via a packet 2017-08-04 21:43:01 +03:00
Andrei Kortunov
23bda7613b Do not allow to use journal in a main menu (bug #3991) 2017-08-04 07:31:41 +04:00
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02:00
scrawl
a78f254883 Merge pull request #1368 from akortunov/tradefix
Trade window improvements
2017-08-03 21:09:57 +00:00
scrawl
a63b9e33fd Merge pull request #1369 from akortunov/tauntfix
Take in account a temporary disposition in isAggressive check (bug #3…
2017-08-03 21:01:03 +00:00
Andrei Kortunov
56a30d7aec Journalbook layout fixes 2017-08-03 20:27:14 +04:00
Andrei Kortunov
d1489f5b42 Take in account a temporary disposition in isAggressive check (bug #3987) 2017-08-03 19:18:31 +04:00
Andrei Kortunov
35beede065 Restock items after trade deal instead of trade window opening 2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23 Play Up sounds instead of Down ones in trade window (bug #3982) 2017-08-03 18:39:59 +04:00
elsid
748f5225a9 Copy PathFinder::mPath back value when pass to MWMechanics::AiPackage::pathTo as dest
May become dangling reference because method may remove all elements from mPath.
2017-08-02 11:35:53 +03:00
scrawl
0d58a77f86 Merge pull request #1291 from MiroslavR/respawn_crash
Prevent respawned references from being added to the scene twice
2017-08-01 14:38:46 +00:00
Andrei Kortunov
604f9ee323 Split weapons and spells rating code from combat actions 2017-08-01 09:05:35 +04:00
MiroslavR
d24286273b Prevent respawned references from being added to the scene twice in certain cases (Fixes #3864) 2017-08-01 00:11:14 +02:00
Andrei Kortunov
b7cfb1aaf4 Fixed DamageHealth and AbsorbHealth effects applying 2017-07-31 23:05:19 +04:00
scrawl
eac2e52841 Merge pull request #1329 from akortunov/priorityfix
Combat AI: make default spell priority calculation formula close to vanilla
2017-07-31 18:21:47 +00:00
Koncord
d7cbfc98eb [Browser] Fix crashing of browser (I hope) 2017-08-01 02:16:49 +08:00
scrawl
fde6e29628 Merge pull request #1326 from akortunov/spellpriority
Combat AI improvements [feedback needed]
2017-07-31 17:51:51 +00:00
scrawl
333648c975 Merge pull request #1324 from akortunov/doorfix
Improved doors detection
2017-07-31 17:42:53 +00:00
Andrei Kortunov
10eb6ec75f AI: Check angle between actor and door 2017-07-31 19:28:02 +04:00
Koncord
1f632d8bc9 [Master] Fix REST servers/info 2017-07-31 19:32:27 +08:00
Koncord
bca594150c [Browser] Add debug info to QueryClient 2017-07-31 19:08:04 +08:00
Koncord
918658d383 [Master] Waiting ACK instead of immediately closing connection. 2017-07-31 19:08:04 +08:00
scrawl
9ac409e61c Merge pull request #1287 from akortunov/spellsorting
Spellbuying menu improvements
2017-07-31 09:43:47 +00:00
scrawl
43279c49b5 Go back to index when selecting 'cancel' on topics list 2017-07-30 23:51:44 +02:00
scrawl
4b51fd23e0 Merge pull request #1356 from akortunov/guifixes
Add missing journal sounds (bug #3974)
2017-07-30 21:36:04 +00:00
Unknown
bfbfbeac43 Added networking and saving for custom spells 2017-07-31 03:45:47 +10:00
Andrei Kortunov
99b5f21a46 Add missing journal sounds (bug #3974) 2017-07-29 19:41:46 +04:00
Allofich
dae19412f2 Fix problem with animations not looping
Fixes #3804
2017-07-29 20:54:11 +09:00
scrawl
631d79f1c8 Merge pull request #1346 from akortunov/aibreathe
AiBreathe AI package (feature #1374)
2017-07-28 20:50:04 +00:00
scrawl
4c2487d55f Merge pull request #1353 from akortunov/restfix
Update effects during rest (bug #3679)
2017-07-28 20:46:14 +00:00
David Cernat
4db64e1721 [Client] Synchronize spellcasting for non-bipedal creatures 2017-07-28 20:49:26 +03:00
Andrei Kortunov
920021c61b Update effects during rest (bug #3679) 2017-07-28 16:50:52 +04:00
David Cernat
c9550fc560 [Server] Use case-insensitive filename comparison for plugins
Additionally, clarify the comments related to plugin comparison.
2017-07-28 06:57:15 +03:00
David Cernat
690f7dc7df Merge pull request #251 from OpenMW/master
Add OpenMW commits up to 27 Jul 2017, part 2
2017-07-27 20:55:56 +03:00
David Cernat
9d05063af4 [General] Add server script functions for banning & unbanning IPs
Additionally, use a more informative message for the client when trying to connecting to a server that it is banned from.
2017-07-27 19:29:17 +03:00
Marc Zinnschlag
6001e04e51 Merge remote-tracking branch 'rcutmore/bug-3148' 2017-07-27 16:29:44 +02:00
Andrei Kortunov
6ab36c0539 Spellbuying menu improvements 2017-07-27 13:20:18 +04:00
David Cernat
500bff9911 Merge pull request #250 from OpenMW/master
Add OpenMW commits up to 27 Jul 2017
2017-07-27 04:01:44 +03:00
Rob Cutmore
3f2cd9b669 Editor: Do color to int conversion in ColorEditor 2017-07-26 19:56:54 -04:00
Rob Cutmore
c7241c692f Editor: Do int to color conversion in ColorEditor 2017-07-26 19:43:37 -04:00
scrawl
1792886f1e Merge pull request #1344 from julianko/dialogue_performance
Fix dialogue window performance
2017-07-26 22:05:45 +00:00
David Cernat
2f551aba02 [Client] Don't start dialogue via client scripts if already in dialogue
This prevents infinite greeting spam in scripts such as hlormarScript.
2017-07-26 22:37:57 +03:00
David Cernat
e6e5d406b8 Merge pull request #248 from OpenMW/master
Add OpenMW commits up to 26 Jul 2017, part 2
2017-07-26 20:31:39 +03:00
David Cernat
796118c266 [Client] Send StatsDynamic packets more often 2017-07-26 20:15:35 +03:00
Julian
d7aa2a882d improve dialogue window performance 2017-07-26 18:58:27 +02:00
scrawl
d3be4769ea Merge pull request #1347 from akortunov/encumberancefix
Fixed encumberance check (bug #3963)
2017-07-26 16:20:16 +00:00
David Cernat
d543edbd9a [Server] Make sure players are initialized as non-werewolves 2017-07-26 06:01:48 +03:00
David Cernat
84662ed3fe [Client] Add temporary warnings when creating custom spells and items 2017-07-26 05:36:12 +03:00
Rob Cutmore
3fb7c42845 Editor: Use colour field for cell map colour 2017-07-25 19:11:47 -04:00
Rob Cutmore
0082f5a2dc Editor: fix handling of colour columns
Colours are stored as ints in the backend but the conversion from
QColor to int was broken.
2017-07-25 19:11:47 -04:00
David Cernat
cd8d064761 [Server] Add PlayerShapeshift to PlayerCellChange's information exchange 2017-07-25 18:44:06 +03:00
David Cernat
8b79cdd4f4 [Server] Document script functions, part 3
Also reorder functions in Cells and CharClass so they are consistent with the rest.
2017-07-25 18:07:09 +03:00
Andrei Kortunov
548814bfbc Added AiBreathe package (feature #1374) 2017-07-25 10:58:04 +04:00
Andrei Kortunov
325ea10594 Fixed encumberance check (bug #3963) 2017-07-25 10:28:33 +04:00
David Cernat
3d1458b5a2 Merge pull request #246 from OpenMW/master
Add OpenMW commits up to 24 Jul 2017
2017-07-24 20:21:04 +03:00
Andrei Kortunov
3ba0a336b7 Move spell magicka cost calculation to standalone function 2017-07-24 21:11:59 +04:00
Marc Zinnschlag
cfc5cdd309 Merge remote-tracking branch 'plutonicoverkill/highlight-occurence-fix' 2017-07-24 09:18:24 +02:00
David Cernat
2c1ece79fc Merge pull request #245 from OpenMW/master
Add OpenMW commits up to 22 Jul 2017
2017-07-23 22:02:16 +03:00
David Cernat
5e5440b697 [Server] Document script functions, part 2 2017-07-23 21:59:33 +03:00
PlutonicOverkill
16be1e1a84 Fix occurrence highlighting preferences panel 2017-07-23 20:29:42 +12:00
Andrei Kortunov
337f0f876d Fade screen in on a new game start 2017-07-23 11:04:58 +04:00
scrawl
9bc24ab629 Fix character preview zNear/zFar not being autocomputed as intended (Bug #3955) 2017-07-22 00:38:27 +02:00
scrawl
5c11266a46 Fix character preview item selection 2017-07-22 00:06:43 +02:00
scrawl
c9f8a220dc Update the tooltip when the focusObject is set 2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8 Remove tooltip object as part of WindowManager::clear 2017-07-20 20:59:09 +02:00
David Cernat
cc91b32b2f [Server] Make spell script functions consistent with others 2017-07-20 17:58:00 +03:00
David Cernat
7173a48f4b [Client] Prevent ObjectState packet spam 2017-07-20 17:01:04 +03:00
David Cernat
b8b3856c73 Merge pull request #244 from OpenMW/master
Add OpenMW commits up to 19 Jul 2017
2017-07-19 20:49:56 +03:00
David Cernat
8bd33e5fbb [Server] Document script functions, part 1 2017-07-19 20:40:51 +03:00
scrawl
7f634514a8 Fix the viewport of the character preview being set a frame ahead due to a threading issue 2017-07-19 17:43:15 +02:00
scrawl
20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 2017-07-19 16:44:37 +02:00
scrawl
ac78d01b2b Terrain: use the main camera's viewpoint for intersection tests
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
scrawl
a629d48df6 Update the facedObject after the camera is updated 2017-07-19 13:05:51 +02:00
David Cernat
fd046e42ef Merge pull request #242 from OpenMW/master
Add OpenMW commits up to 16 Jul 2017
2017-07-17 21:34:44 +03:00
scrawl
2c7ce26fb7 Merge pull request #1336 from akortunov/evadefix
Combat AI: avoid enemy hits when casting Self-ranged spells
2017-07-16 20:05:21 +00:00
Andrei Kortunov
98f161c7fd Combat AI: avoid enemy hits when casting Self-ranged spells (fixes #3922) 2017-07-16 22:38:23 +04:00
scrawl
2c95f40640 Merge pull request #1333 from akortunov/guidistortionfix
Disable sound distortion for GUI actions and PlaySound command [discussion]
2017-07-16 18:28:03 +00:00
Andrei Kortunov
2b22d10ebc Spellview fixes 2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df Quick keys menu fixes 2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913 Fixed Close button handler in EditEffectDialog (fixes #3956) 2017-07-15 14:03:36 +04:00
David Cernat
aeb1ec3394 [Client] Delimit and clarify changes made by tes3mp to engine and main 2017-07-15 12:44:00 +03:00
David Cernat
f65f996418 [Server] Add script functions for werewolf states 2017-07-15 11:09:28 +03:00
Andrei Kortunov
dca8317083 Disable sound distortion for player actions in GUI mode 2017-07-15 10:59:08 +04:00
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
Andrei Kortunov
37952c9a79 Added door detection based by ray casting 2017-07-03 22:08:29 +04: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
Andrei Kortunov
143fdae6fe Make spell priority calculation close to vanilla (bug #3937). 2017-06-28 14:02:51 +04: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
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