mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 05:15:33 +00:00
Code Issues Releases Wiki Activity
16944 commits 38 branches 54 tags 122 MiB
Commit graph

9326 commits

Author SHA1 Message Date
Marc Zinnschlag
63fd1e8df7 Merge remote-tracking branch 'origin/master' 2016-07-27 15:49:11 +02:00
AnyOldName3
20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 2016-07-27 00:58:31 +01:00
Koncord
1e3eff91ac Merged branch tes3mp-gui into tes3mp-gui 2016-07-23 22:08:01 +08:00
Koncord
9ab77cb123 New API functions: MessageBox, CustomMessageBox, InputDialog 
New Callback: OnGUIAction
 2016-07-23 22:02:06 +08:00
Stanislav Zhukov
fe50394f4d Fix movement desync 
I think this should fix all movements desyncs
 2016-07-22 23:40:34 +08:00
MiroslavR
4a3529488b Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220 Fix moved references disappearing when modified by a plugin 2016-07-22 02:12:03 +02:00
MiroslavR
d790747389 Implement deletion of moved references (Bug #3471) 2016-07-22 01:59:02 +02:00
davidcernat
ab309180c2 Add useful debug info for cell changes 2016-07-21 23:07:37 +03:00
AnyOldName3
59639e3988 Make it build again (but remove the new functionality). 2016-07-20 15:16:53 +01:00
AnyOldName3
95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 2016-07-20 02:48:57 +01:00
davidcernat
3c8543bfaf Make player references cross exterior cells only when called by server 
Previously, clientside representations of players were able to move to a new exterior cell once during their movement tick and then again when sending a cell change packet to the server. Besides causing crashes in CellRef because of a messy cell-changing record, this also led to major desyncs.

Clientside representations of players can now only change their cells when a server-sent cell change packet specifically allows it.
 2016-07-20 03:26:25 +03:00
David Cernat
360eec30a0 Merge pull request #2 from OpenMW/master 
Add recent OpenMW commits by AnyOldName3
 2016-07-20 02:58:57 +03:00
Marc Zinnschlag
c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 2016-07-19 16:19:28 +02:00
Aesylwinn
3483b54df5 Build fix. 2016-07-18 00:05:27 -04:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
davidcernat
7bf08e5e5a Fix transition between exterior cells for non-local players 
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
 2016-07-17 22:03:20 +03:00
MiroslavR
19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 2016-07-17 19:52:12 +02:00
Koncord
6f07d590d4 Fix SetPos and SetAngle functions 
Fix types for SetPos and SetAngle
 2016-07-17 17:59:46 +08:00
mrcheko
203804ff15 fix AiPackage repeating 2016-07-16 19:08:49 +03:00
mrcheko
59a1a6d117 checkWayIsClear: remove PATHFIND_CAUTION_DIST check 2016-07-16 19:07:48 +03:00
Stanislav Zhukov
b09e4a0218 Fix chat 'y' 
Now you can close chat only if pressed 'Enter'.
 2016-07-13 03:21:30 +08:00
AnyOldName3
f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 2016-07-12 17:09:57 +01:00
GrimKriegor
ace719507c Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1 
https://github.com/TES3MP/TES3MP/issues/1
 2016-07-12 01:42:05 +01:00
AnyOldName3
e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 2016-07-12 01:06:57 +01:00
mrcheko
b4e94e2aae Merge remote-tracking branch 'upstream/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
 2016-07-12 00:45:01 +03:00
AnyOldName3
1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 2016-07-11 22:33:15 +01:00
mrcheko
8d4f0660ce fix hardcoded melee attack ranges 2016-07-12 00:17:43 +03:00
AnyOldName3
195dd27780 Resolve obvious runtime error revealing more subtle one 2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c Trim unneeded code 2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776 Remove a compilation error and set up framework to remove the others 2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:16:32 +01:00
scrawl
2329812988 Merge pull request #995 from Allofich/traps 
Trap and lock fixes
 2016-07-10 17:19:36 +02:00
scrawl
67d3571fac Fix activation distance in third person mode 2016-07-10 17:10:19 +02:00
mrcheko
05794505c8 travis build fix 2016-07-10 17:25:50 +03:00
Allofich
599e6708ec Allow using keys to open trapped objects of lock level 0 2016-07-10 23:08:11 +09:00
Allofich
cabe038a97 Make lockpick and probe sounds 3d positional 2016-07-10 22:08:42 +09:00
Allofich
249918612d Play trap disarm sound when key used on trapped object 2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
mrcheko
f57858b750 Merge remote-tracking branch 'upstream/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
 2016-07-10 14:36:48 +03:00
MiroslavR
b0fcad4cb8 Don't stack effects for scrolls of the same type (Fixes #3466) 2016-07-10 03:49:09 +02:00
MiroslavR
75a66ced20 Fix actors lacking turning animations while in first person mode 2016-07-10 01:48:54 +02:00
mrcheko
d2fe6fe857 Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/aicombat.hpp
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
#	apps/openmw/mwmechanics/aiwander.cpp
#	apps/openmw/mwmechanics/aiwander.hpp
 2016-07-09 22:59:54 +03:00
MiroslavR
dc0bc5b68c Implement Face instruction (Feature #1424) 2016-07-09 02:16:47 +02:00
scrawl
6f376bd499 Merge pull request #983 from Allofich/telekinesis 
Don't allow telekinesis on actors or teleport doors
 2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989 Clean up, remove unnecessary code changes 2016-07-09 02:24:08 +09:00
Allofich
53ceefa46a Allow some telekinesis on teleport doors 2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0 Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
scrawl
e362e3e6a5 Fix cppcheck warnings 2016-07-07 23:50:48 +08:00
Poncho
5b3ac5ff27 Use correct direction multipliers during awareness check 2016-07-07 23:50:48 +08:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
scrawl
994ad3e004 Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 2016-07-07 23:50:48 +08:00
scrawl
cd8c84dc6c Fix typo in SameRace dialogue function (function was inverted, Fixes #3116) 2016-07-07 23:50:48 +08:00
scrawl
5d4063d8c7 LocalScripts: initialize mIter 2016-07-07 23:50:47 +08:00
Koncord
1e29409dd5 Add OpenMW-mp target 2016-07-07 23:50:38 +08:00
Allofich
0e5c3f781f Only allow trap distance check to apply to player 2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d Cleanups 2016-07-07 21:57:00 +09:00
Allofich
cb621939fd Streamline trap code 2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
Allofich
8014f37879 Avoid duplicate code 2016-07-07 21:54:30 +09:00
Allofich
538209b0a2 Change variable to mRatio and initialize it 2016-07-07 21:54:29 +09:00
Allofich
e25e698978 Fix telekinesis check for activators 2016-07-07 21:54:29 +09:00
MiroslavR
80f2ae0ca7 Apply magic effects while waiting/sleeping 2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4 Player's death now interrupts waiting/sleeping 2016-07-06 00:15:25 +02:00
MiroslavR
d4e29e3e0c Clear projectiles on non-incremental time advances 2016-07-06 00:11:58 +02:00
mrcheko
0793e4a80e refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck 2016-07-05 21:38:41 +03:00
Allofich
c1236f4113 Simplified code 2016-07-04 20:25:25 +09:00
Allofich
c02695e56d Cleanups and fixes 2016-07-04 16:06:16 +09:00
Allofich
199607423b Use iMaxActivateDist for AI actors that use Activate packages 2016-07-04 16:06:16 +09:00
Allofich
64d298d2b5 Use raycast distance when player activates trapped object 2016-07-04 16:06:15 +09:00
Allofich
64d53a2314 Avoid double raycasts when using getFacedObject 2016-07-04 16:06:04 +09:00
Allofich
574e40db5e Don't allow telekinesis on activators 2016-07-04 01:50:47 +09:00
scrawl
343dccdbcc Merge pull request #980 from scrawl/voice_fix 
Voice fix
 2016-07-02 21:55:46 +02:00
scrawl
d96e49c04a Do not set change flag when running forEach on an empty cell 2016-07-02 20:44:14 +02:00
scrawl
8f62ea2e80 Fix for "RigGeometry rendering with no skeleton" errors 2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 2016-07-02 19:48:11 +02:00
scrawl
96757a3b7c Fix non-predefined cells not being saved correctly 2016-07-02 19:43:08 +02:00
MiroslavR
c8b61cb234 Cache magic effects in MWMechanics::Spells 2016-07-02 12:50:00 +02:00
MiroslavR
700dde116e Show remnant corprus effects in magic window 2016-07-02 05:17:24 +02:00
MiroslavR
54f52f7bae Implement effect removal for abilities (Fixes #3455) 2016-07-01 18:50:28 +02:00
scrawl
252b27f0ef Remove getEyePos() 2016-07-01 15:04:59 +02:00
Allofich
b29e9e9c77 Don't allow telekinesis on actors or teleport doors 2016-07-01 02:27:20 +09:00
MiroslavR
72d2daae90 Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects 2016-06-29 22:54:11 +02:00
scrawl
528de956da Merge pull request #981 from Allofich/magicka 
Fix timing of some magicka calculations
 2016-06-29 20:42:18 +02:00
Allofich
2290346296 Fix timing of some magicka calculations 2016-06-30 02:59:09 +09:00
scrawl
5eb6c548d7 Merge pull request #965 from kpp/find_tinyxml 
Find tinyxml
 2016-06-28 02:51:51 +02:00
scrawl
509e5dfe4d Include cleanup 2016-06-27 22:10:30 +02:00
scrawl
4699a8098b Include fix 2016-06-27 21:51:18 +02:00
scrawl
1739351b7a Remove now unused Sound_Decoder::rewind() 2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0 Don't analyze the loudness for sounds that don't need it 2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb Analyze the loudness data as the stream is decoded for playback 
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.

The benefit is that we need to decode the audio just once instead of twice.

We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
 2016-06-27 21:32:54 +02:00
scrawl
fc293aa048 Merge pull request #978 from Allofich/fatigue 
Fix update of fatigue display
 2016-06-27 17:05:05 +02:00
Allofich
1602eb3de8 Fix so that keepPlayerAlive() will not run twice 2016-06-27 21:43:49 +09:00
Allofich
19a20a6871 Fix update of fatigue display 2016-06-27 21:17:06 +09:00
MiroslavR
7244809c4a Remove redundant part of condition 2016-06-26 15:17:52 +02:00
MiroslavR
dfc62c99b4 Show correct class image in level-up dialog (Fixes #3443) 2016-06-26 03:22:58 +02:00
Allofich
dc468dd139 Fix magicka and fatigue calculations from fortifying attributes 2016-06-25 19:21:49 +09:00
Allofich
5d3aebd04b Update disposition check between persuasion attempts 2016-06-22 01:47:09 +09:00
terrorfisch
be25e2ba75 Make NPCs use both hands in weaponless combat. 2016-06-20 10:24:51 +02:00
Allofich
b1be3596dc Cleanup of #include statements 2016-06-18 10:56:28 +09:00
Allofich
4a38fb8650 Use namespace block in aiactivate 2016-06-17 20:59:37 +09:00
scrawl
f549b5fb7a Add missing include 2016-06-17 04:34:31 +02:00
scrawl
c18de84798 Fix a crash that could occur when two or more plugins move a deleted ref to another cell (Fixes #3446) 2016-06-17 02:27:49 +02:00
scrawl
3ce63c3f6e Merge pull request #967 from Allofich/AIPackageFixes 
AI package cleanups
 2016-06-16 20:22:51 +02:00
Allofich
c2b51112f2 AI package cleanups 2016-06-16 17:17:56 +09:00
scrawl
693d3cea4a Float to surface fix 2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07 Split refreshCurrentAnims into multiple functions 2016-06-15 03:14:44 +02:00
scrawl
372f2e2f18 Merge pull request #962 from Allofich/AIPackageFixes 
Duration fixes for Follow and Escort
 2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e Duration fixes for Follow and Escort 2016-06-15 02:11:30 +09:00
scrawl
3ec4ee6290 Make a copy of map key to work around it being invalidated (Fixes #3329) 2016-06-13 02:06:44 +02:00
Roman Proskuryakov
28c63aea72 Uses FindTinyXML to find package 2016-06-12 21:40:02 +03:00
scrawl
4acfe1a7e4 Move cleanupSummonedCreature to the mechanics manager (Bug #3439) 2016-06-12 02:43:33 +02:00
scrawl
910ad76e29 Remove spell effects when a summoned creature expires (Bug #3439) 2016-06-12 00:41:13 +02:00
scrawl
b7e45b046d When a summoned creature dies, wait for its death animation to complete before removing it (Bug #3439) 2016-06-12 00:40:55 +02:00
scrawl
a825882c6b Process death events at the end of the death animation (Fixes #1873) 2016-06-12 00:04:50 +02:00
scrawl
37afe966cf Update comment 2016-06-11 21:25:40 +02:00
scrawl
b6230bd31f Reject weather dialogue conditions when in an interior cell (Fixes #3437) 2016-06-11 18:26:20 +02:00
scrawl
844cbc5a14 Add isNullAction() method to fix compiler warning 2016-06-11 18:26:20 +02:00
scrawl
7a30ef5cc1 Do not consider actors following the player as hostiles 2016-06-11 18:26:20 +02:00
scrawl
a85932a62b Ignore the collision box offset when launching projectiles (Fixes #3201) 2016-06-10 23:47:01 +02:00
scrawl
c6601ab2ab Do not use the collision box offset for combat hit tests (Fixes #3201) 2016-06-10 23:47:01 +02:00
scrawl
8fcc1911d9 Use fCombatDistance as the creature attack range 2016-06-10 23:47:01 +02:00
Daniel Pettersson
943d9d97dc Slowfall now stops momentum when jumping 2016-06-10 15:22:12 +02:00
scrawl
a00e4de5c3 Fix another bug related to vanity mode toggle 2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9 Fix queueing of vanity mode toggle (Bug #3421) 2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9 Do not use/assign the camera distance in first person mode (Fixes #3421) 2016-06-10 01:05:43 +02:00
scrawl
166cced22f Merge pull request #957 from svaante/master 
Added 1.5 bonus for ranged weapons when weapons are rated
 2016-06-10 00:01:05 +02:00
scrawl
a14f1bc222 Merge pull request #954 from Allofich/AIWanderDuration 
Improve duration calculations in Wander AI
 2016-06-09 23:46:37 +02:00
Allofich
55ac1fab68 Change Wander duration to run on a counter 2016-06-10 04:36:18 +09:00
Daniel Pettersson
256439f884 Added 1.5 bonus for ranged weapons when weapons are rated 2016-06-09 21:23:36 +02:00
scrawl
abcd2219e8 Ignore the calling actor in getEnemiesNearby / getActorsFighting 2016-06-08 22:13:21 +02:00
scrawl
165f048792 Do not count dead NPCs as observers (Fixes #3434) 2016-06-07 22:01:44 +02:00
scrawl
12eea9ed69 Remove magic number in getMaxActivationDistance 2016-06-07 15:18:36 +02:00
scrawl
8fb8c2bae5 Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order 2016-06-07 02:43:25 +02:00
scrawl
f417d7780a Fix the enemy nearby check (Bug #3423) 2016-06-07 01:55:34 +02:00
scrawl
dfc2f3469a Don't play music if no playlist is set 2016-06-07 01:36:09 +02:00
scrawl
f64bc3c7ef Pass the victim to commitCrime on pickpocket detection (Fixes #3424) 2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728 Fix crash in race dialog when no head or hair are available 2016-06-06 01:04:14 +02:00
scrawl
a45643f150 Merge pull request #949 from Allofich/master 
Fix return values for AITravel
 2016-06-05 21:16:28 +02:00
Allofich
065d6a391d Don't repeat sequences of only one non-wander AI 2016-06-06 04:12:49 +09:00
scrawl
2ee414abe4 Merge pull request #943 from kpp/find_bullet 
Find bullet
 2016-06-05 16:02:34 +02:00
Ben Shealy
5085afa3d7 Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading 2016-06-04 12:28:47 -04:00
scrawl
3645b3357e Fix improper assignement of spawn point in placeAt for non-actors (Bug #3417) 2016-06-02 21:24:19 +02:00
scrawl
ab2089bbf3 Throw an exception if placeAt is passed an invalid direction parameter 2016-06-02 21:19:02 +02:00
Roman Proskuryakov
3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 2016-05-31 07:18:37 +03:00
Allofich
bce66c629a Change editor-placed AI packages to cycle 2016-05-29 17:34:40 +09:00
scrawl
496cb85b01 Do not cancel Ai packages when on loading (Fixes #3409) 
This piece of code was an attempt to fix up save games made before commit d3b76b7006 , but ended up introducing a new bug.
 2016-05-28 20:27:05 +02:00