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

17977 commits

Author SHA1 Message Date
David Cernat
0206d1813c [General] Modernize packet style for PlayerQuickKeys 2019-10-21 16:55:21 +03:00
David Cernat
4f98d67ed4 [General] Modernize packet style for PlayerJournal 2019-10-21 07:01:36 +03:00
Alexei Dobrohotov
678970b01d
Merge pull request #2565 from elsid/update_recastnavigation 
Update recastnavigation
 2019-10-21 02:51:28 +03:00
elsid
045ceeac11
Replace foreach macro by for-loop 2019-10-20 20:08:16 +02:00
elsid
07660b5605
Fix detournavigator tests 2019-10-20 18:59:14 +02:00
Alexei Dobrohotov
5d5ec1cf63
Merge pull request #2550 from elsid/fix_path_rebuild 
Fix rebuild path for walking actors (Bug #5181)
 2019-10-20 16:05:29 +03:00
Capostrophic
fc7b4d73a8 Remove on-strike enchantment support for ranged weapon types (bug #5190) 2019-10-20 13:34:42 +03:00
Alexei Dobrohotov
85a5355e5c
Merge pull request #2563 from akortunov/ammofix 
Fix OnStrike bows charges
 2019-10-20 11:25:12 +03:00
Andrei Kortunov
dd781b3da2 Fix OnStrike bows charges (regression #5191) 2019-10-20 10:21:47 +04:00
elsid
e4d0af6a6d
Use z coordinate for path distance when diff by z is greater then actor height 2019-10-19 22:01:32 +02:00
Capostrophic
43b1b9dfa2 Weather-related fixes (incl. bug #4783) 
Simplify some calculations
Fix Blizzard weather direction
Fix sky direction during storm
 2019-10-19 22:47:21 +03:00
elsid
81832f8e17
Reuse distance functions 2019-10-19 12:51:37 +02:00
bzzt
1316816148 fix #5176 2019-10-18 13:37:00 +00:00
Alexei Dobrohotov
dec64a7fba
Fix typos in invalid spell effect warnings, clarify them 2019-10-17 23:45:27 +03:00
David Cernat
1ab5916078 [Client] Reorder RecordHelper's overrideRecord() methods alphabetically 2019-10-17 06:58:56 +03:00
David Cernat
520cedb553 [Client] Use overrideRecord name for related functions in RecordHelper 2019-10-16 18:05:52 +03:00
David Cernat
2fc50d7280 [Client] Fix includes for RecordHelper 2019-10-16 15:34:25 +03:00
David Cernat
aa06056d00 [Client] Add createRecord() function to RecordHelper 2019-10-16 13:14:32 +03:00
David Cernat
13deaa88f2 [Client] Fix typo in code used for setting creature base inventories 2019-10-15 08:49:32 +03:00
David Cernat
835ae816a1 [Client] Use a template to combine RecordHelper's existence checks 2019-10-15 08:47:54 +03:00
David Cernat
17020fc13a [Client] Use a template to combine RecordHelper override functions 2019-10-15 07:21:48 +03:00
Andrei Kortunov
6e6d6d7bda Use forward declaration 2019-10-14 15:40:35 +04:00
Andrei Kortunov
606b73ee96 Use rain settings from openmw.cfg (bug #4262) 2019-10-13 22:32:23 +04:00
David Cernat
d113f81237 [Client] Set correct worldspace for cell overrides in RecordHelper 2019-10-13 13:42:03 +03:00
Capostrophic
bc5d54a161 Fix GetEffect result when running on dead actors 2019-10-12 19:06:10 +03:00
Andrei Kortunov
31e78ed41f Rework 'prevent merchant equipping' feature 2019-10-12 14:17:03 +04:00
David Cernat
02bca3f52d [Client] Fix if check in ObjectList::setMemberShorts() 2019-10-11 21:53:53 +03:00
David Cernat
19418f4953 [Client] Don't ignore entire Actor packet if one actor can't be found 2019-10-11 21:29:21 +03:00
Capostrophic
ce943b4f9e Make enchantments affect all actors with an inventory (bug #5186) 2019-10-11 19:29:12 +03:00
Andrei Kortunov
19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip 
Set OnPCEquip properly when a race can't equip an item (bug #5182)
 2019-10-11 20:07:35 +04:00
Andrei Kortunov
67bef9a3a1
Merge pull request #2554 from Capostrophic/summon 
Make sure summoned creatures are removed upon caster death (#5183)
 2019-10-11 20:06:16 +04:00
Alexei Dobrohotov
ccb557edf0
Merge pull request #2552 from akortunov/greeting 
Split greetings from AiWander
 2019-10-11 02:11:46 +03:00
Alexei Dobrohotov
cdbe58c33a
Merge branch 'master' into windspeed 2019-10-11 02:04:30 +03:00
Andrei Kortunov
2fc819cdae Encode ID's in all places to UTF-8 (bug #3977) 2019-10-10 20:52:32 +04:00
Capostrophic
e9009f8d10 Make sure summoned creatures are removed upon caster death 2019-10-10 17:57:45 +03:00
Nelsson Huotari
78f2a5181d Default brush size to 1 2019-10-10 14:27:22 +03:00
Nelsson Huotari
fbb9800e89 Better terrain texture ID handling 2019-10-10 14:27:22 +03:00
Nelsson Huotari
301c05662b assignment to memb. init. list, publics to private, virtual -> final 2019-10-10 14:27:22 +03:00
Andrei Kortunov
69aceb5c1e Split greetings from AiWander (bug #4594) 2019-10-10 09:28:40 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge 
Recharge items outside of player inventory
 2019-10-09 23:37:10 +03:00
David Cernat
d163f1b6da [General] Turn WorldKillCount into a Worldstate packet 
Rename the old WorldKillCount that was a Player packet into PlayerPlaceholder. Rename the unused CellCreate that was a Worldstate packet into WorldKillCount. On the server, move kill count-related script functions from QuestFunctions to WorldstateFunctions.
 2019-10-08 11:09:08 +03:00
Capostrophic
c718f89325 Set OnPCEquip properly when a race can't equip an item (bug #5182) 2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug #4077) 2019-10-07 22:59:43 +04:00
elsid
d1d6ba3ed0
Fix rebuild path for walking actors 
Ignore z coordinate for not swimming nor flying actors to calculate
distance from actor destination to last path point. If walking actor
destination point is floating above the ground then a point on navmesh
may be too far away when z coordinate is included. In this case path
will be rebuild on each AI_REACTION_TIME.
 2019-10-07 20:25:07 +02:00
Andrei Kortunov
f75f9cb337 Use localized faction name when using TFH 2019-10-07 12:14:22 +04:00
David Cernat
4a34666c59 Add OpenMW commits up to 7 Oct 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
 2019-10-07 08:19:21 +03:00
Andrei Kortunov
f0b73e0a27 Do not store owners for items in container stores (bug #1933) 2019-10-05 17:29:00 +04:00
Andrei Kortunov
2b2f63c919
Merge pull request #2538 from Capostrophic/animation 
Use random attack strength if there's no wind up animation (bug #5059)
 2019-10-02 08:23:13 +04:00
Alexei Dobrohotov
6f99747fff
Merge pull request #2507 from elsid/door_stuck 
Fix actors stuck in closing door (bug #5138)
 2019-10-01 22:39:58 +03:00
elsid
7fbc696d44
Change angle direction by rolling dice to avoid rotating door 2019-09-29 13:44:06 +02:00
elsid
6253d2a7ac
Undo door rotation once 2019-09-29 13:42:51 +02:00
Andrei Kortunov
ca46da8b04 Do not stack initially added scripted items (bug #5136) 2019-09-29 13:08:52 +04:00
David Cernat
031acffcbe [General] Implement cell records for RecordDynamic packets, part 1 
New interior cells can be now be created that are either blank or based on existing interior cells.
 2019-09-28 13:12:48 +03:00
David Cernat
18a7ac5940 [Client] Make it possible to override Cell records in ESMStore 2019-09-28 13:10:43 +03:00
David Cernat
0b85829e38 [Client] Make it possible to unload Cells & clear CellStores from World 2019-09-28 13:09:03 +03:00
Alexei Dobrohotov
e744090339
Merge pull request #2535 from akortunov/activate 
Implement vanilla-style AiActivate
 2019-09-26 00:42:43 +03:00
Capostrophic
4d381d0804 Use random attack strength if there's no wind up anim (bug #5059) 2019-09-24 22:42:04 +03:00
Andrei Kortunov
e5564df8cb Implement vanilla-style wind speed calculations (bug #4449) 2019-09-24 10:59:58 +04:00
Andrei Kortunov
48aba76ce9 Implement vanilla-style AiActivate (bug #4456) 2019-09-24 09:30:39 +04:00
Capostrophic
421a9d2e50 [Regression] Fix pickpocket crashes 2019-09-23 23:56:37 +03:00
David Cernat
339428872e [Client] Fix infinite loop in CellController 
Previously, using CellController::getCellStore() to get an unloaded CellStore would make its references get loaded in the process, with the CellStore's loadRefs() then running updateMergedRefs(), which in turn – before getting as far as setting the CellStore's state to State_Loaded – would call CellController::hasLocalAuthority() on its accompanying ESM::Cell, which would then run CellController::isActiveWorldCell(), which would then run CellController::getCellStore() to get the CellStore again, which – still being marked as unloaded – would run the whole loop again... and again.
 2019-09-23 21:18:38 +03:00
David Cernat
d4df2948dd [Client] Use clearer wording for comment in GUIController 2019-09-23 20:30:33 +03:00
David Cernat
219f0cb88e [Client] Fix typo in 56f084c9c0 by using correct function 2019-09-23 07:55:16 +03:00
Andrei Kortunov
b360deaec3 Store raw data about fog of war instead of RGBA images (bug #5108) 2019-09-22 19:59:12 +04:00
Alexei Dobrohotov
ac5491b5c2
Merge pull request #2534 from akortunov/toggleview 
Improve resurrection handling
 2019-09-22 02:02:03 +03:00
Andrei Kortunov
eb1245664f
Merge pull request #2533 from Capostrophic/levelledlist 
Fix chance none logic for nested levelled lists (bug #5169)
 2019-09-21 20:58:13 +04:00
Andrei Kortunov
6450d84473 Improve resurrection handling 2019-09-21 20:22:45 +04:00
Andrei Kortunov
0ff8e83a39
Merge pull request #2532 from Assumeru/undefined 
Fix undefined behaviour
 2019-09-21 18:35:08 +04:00
Evil Eye
3d3ffdfcd8 override eraseStatic for dialogue 2019-09-21 16:24:05 +02:00
Capostrophic
7c9a9d7de0 Fix chance none logic for nested levelled lists (bug #5169) 2019-09-21 14:30:38 +03:00
David Cernat
6828d83a42 [Client] Always hash input for password dialogs 
Additionally, clean up repetitive code in GUIController.
 2019-09-21 14:26:02 +03:00
David Cernat
3903ac6526 [Server] Add script functions for getting SHA256 hashes & random strings 2019-09-21 14:22:19 +03:00
Alexei Dobrohotov
acc4811d12
Merge branch 'master' into guifixes 2019-09-20 20:03:02 +03:00
okdshin
c15b3377da [General] Add PicoSHA2 hash generator to extern 2019-09-20 10:25:34 +03:00
Andrei Kortunov
7cb6a9c1e9 Do not allow to use quick keys during chargen 2019-09-20 07:27:34 +04:00
Andrei Kortunov
1bddbbcfa0 Check if related menus are allowed when using cycle hotkeys (bug #5167) 2019-09-20 07:27:27 +04:00
Andrei Kortunov
a4d196f33f Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168) 2019-09-19 21:48:43 +04:00
David Cernat
7caa6cd8fe [Client] Prevent ActorAI spam from actors starting combat in scripts 2019-09-19 13:58:01 +03:00
David Cernat
ca21bc35c2 [Server] Add script functions that read & send ScriptGlobalShort packets 2019-09-19 08:46:54 +03:00
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019 
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
 2019-09-18 23:46:08 +03:00
Alexei Dobrohotov
fb87778493
Merge branch 'master' into organic-locks 2019-09-18 20:36:40 +03:00
Andrei Kortunov
94a281370f Continue scripts execution after player's death (bug #5166) 2019-09-17 22:40:51 +04:00
Evil Eye
32de86d114 merge master 2019-09-17 20:31:53 +02:00
Evil Eye
7c8b82f45c move locking behaviour to cellref 2019-09-17 20:30:37 +02:00
Andrei Kortunov
85bb4a76f6 Improve faction items handling (bug #5164) 2019-09-17 19:09:08 +04:00
Andrei Kortunov
4a6d2cbaff Do not allow player to take items from evidence chests (bug #3609) 2019-09-17 19:08:33 +04:00
Andrei Kortunov
649a14dfae
Merge branch 'master' into activation 2019-09-16 10:52:16 +04:00
Andrei Kortunov
a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata 
Refactor NIF extra data and particle modifier handling
 2019-09-16 10:19:49 +04:00
Capostrophic
480000da07 Use Open action as fallback for companion activation (bug #5161) 2019-09-15 23:17:36 +03:00
elsid
209e33f5ce
Open door when it is on the way to a next path point 2019-09-15 21:16:00 +02:00
elsid
653a391084
Do not open doors when actor has no path 
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
 2019-09-15 21:12:33 +02:00
elsid
d4b7b3e999
Check for AiPackage type before find nearby door 2019-09-15 21:12:29 +02:00
David Cernat
56f084c9c0 [Client] Fix packet spam for repetitive setting of the same global value 2019-09-15 16:10:09 +03:00
David Cernat
ceb16bb6f8 [Client] Reimplement temporary fix from c65d6c1328 
The real reason for the crash remains to be fixed.
 2019-09-14 19:41:34 +03:00
David Cernat
afa704ce95 [Server] Add OnScriptGlobalShort event 2019-09-14 13:09:01 +03:00
David Cernat
e424bd9bc3 [General] Implement ClientScriptSettings packet, part 2 
The packet can now set which client globals get packets sent about them when their values change on clients.
 2019-09-14 09:37:19 +03:00
Capostrophic
790531671a Fix tests 2019-09-13 21:29:49 +03:00
Capostrophic
8baddefdbd Refactor extra data and particle modifier handling 
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
 2019-09-13 20:26:22 +03:00
Evil Eye
85d52ec183 oops 2019-09-11 22:05:24 +02:00
Alexei Dobrohotov
6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection 
[Final tests] Editor: Terrain texture selection
 2019-09-11 14:09:45 +03:00
Capostrophic
718dbd3f9a Use object ID as the substitution for their name (bug #5158) 2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e Preparation work 
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
 2019-09-10 23:38:16 +03:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
Evil Eye
a86a8ecc0e Allow locking/picking just about everything 2019-09-10 21:53:26 +02:00
Nelsson Huotari
4ccb951126 move check to outermost scope 2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189 Consistency for variable and header argument names. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b More readable code 2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d Don't add empty primitive sets to geometry. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1 Remove globals, const int& -> int, values to const ref. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1 Less verbose syntax 2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d Remove extra include 2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431 Only allow selection of cells in view 2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6 Make less copies 2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7 Remove empty lines 2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892 pass by const ref and other fixes 2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f Fixes, cleanup. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b Remove unused code, clarifications, optimizations 2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492 Terrain texture selection, support for vertex selection 2019-09-10 12:15:19 +03:00
Evil Eye
56b6a7ada4 Fix #5155 2019-09-09 22:29:59 +02:00
David Cernat
3acfbad55d [General] Implement ClientScriptSettings packet, part 1 
For starters, the new packet can set which client scripts have all of their variables synchronized between players. The previous hardcoded list of IDs for synchronized scripts has been removed.
 2019-09-09 10:28:35 +03:00
David Cernat
25e27ccb95 [General] Use placeholder packet ID for unused CellCreate packet 2019-09-09 10:22:20 +03:00
Andrei Kortunov
d58f93f388 Use sayDone() only for scripting backward compatibility 2019-09-06 09:19:41 +04:00
David Cernat
ca67587b89 Add OpenMW commits up to 5 Sep 2019 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-09-05 21:41:50 +03:00
Andrei Kortunov
c9deb1b325 Generate sCrimeMessageReport only once per frame (bug #5012) 2019-09-05 20:16:03 +04:00
Andrei Kortunov
58be8dc976
Merge pull request #2513 from Capostrophic/crime 
Make sure failed pick/trap attempts are a crime (bug #5149)
 2019-09-05 18:51:16 +04:00
Capostrophic
c89c14bb68 Rename objectOpened() to make its role more clear 2019-09-05 17:36:49 +03:00
Capostrophic
8317dc0709 Make sure failed pick/trap attempts are a crime (bug #5149) 2019-09-05 17:29:49 +03:00
James Stephens
bafbc0a055 Cancel door sound if collision is detected and the sound is playing 2019-09-05 07:49:53 +00:00
Alexei Dobrohotov
2daecc633e
Revert Vampirism behavior upon death to 0.45.0-like state 
Until we figure out the better way to handle vampire stuff tangled together with post-death animation magic effect reset.
 2019-09-04 16:42:34 +03:00
David Cernat
190c404b38 [Client] Calculate spell success in more appropriate place 
Previously, creatures with fast spellcasting animations would cast their spells before their success had actually been calculated, causing them to fail.
 2019-09-02 23:50:56 +03:00
James Stephens
7d3f6e1cd9 Altered process so that cost only appears on spell purchase window. 
Added myself to authors
 2019-09-02 17:18:56 +00:00
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
David Cernat
95967ea289 [General] Rename unused ObjectReset packet into ObjectHit 2019-09-01 08:30:03 +03:00
David Cernat
6dccdfe0c1 [Client] Load up TES3MP's settings in the same map as OpenMW's settings 
This allows the "font size" property to be read when the chat window is created.
 2019-08-28 06:37:33 +03:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
David Cernat
3a1e3cf0f5 [Client] Prevent chat key from switching to chat window while in console 2019-08-27 15:23:12 +03:00
David Cernat
a9f1481e5c [Client] Revert changes to key focus setting as per 56539fee4f 2019-08-27 15:22:11 +03:00
David Cernat
a52d32602d [Client] Fix code style in PlayerList 2019-08-27 09:29:43 +03:00
Andrei Kortunov
84b3aaedaa
Merge pull request #2506 from akortunov/refactor 
Rename getWeaponPart() function
 2019-08-27 10:05:44 +04:00
Andrei Kortunov
c059bf04cc Rename getWeaponPart() function 2019-08-27 09:55:02 +04:00
David Cernat
3e1c96a49c [Client] Fix crash by not trying to enable markers for invalid players 2019-08-26 21:10:02 +03:00
David Cernat
78a9a428a6 [Client] Remove unnecessary mwmp::Main::pressedKey() function 
Additionally, add comment around where it was originally used.
 2019-08-26 15:41:45 +03:00
David Cernat
e0f623fb87 [Client] Move check for preventing auto equipping to correct spot 2019-08-26 15:39:56 +03:00
David Cernat
e15428e139 [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
elsid
16170131b7
Add enum type for door state 2019-08-25 15:21:00 +02:00
David Cernat
9350e1d484 [General] Split up Attack packets into Attack and Cast ones 
Create an entirely new PlayerCast packet for that purpose, but rename the already existing but unused ActorInteraction into ActorCast.
 2019-08-25 09:35:23 +03:00
Alexei Dobrohotov
43a58e181f
Merge pull request #2455 from Capostrophic/input 
Revert questionable input manager decisions
 2019-08-24 15:02:50 +03:00
David Cernat
353e7d530a Add OpenMW commits up to 18 Aug 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 22:44:00 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019 
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-08-22 08:40:32 +03:00
David Cernat
f671c0bddc Add OpenMW commits up to 1 Apr 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
 2019-08-21 23:54:39 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
 2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
 2019-08-21 17:29:24 +03:00
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019 
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
 2019-08-21 15:48:07 +03:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-21 14:37:54 +03:00
David Cernat
68886e7539 Add OpenMW commits up to 2 Dec 2018 
# Conflicts:
#	.travis.yml
#	README.md
 2019-08-21 13:08:56 +03:00
David Cernat
cbba81df03 Add OpenMW commits up to 14 Nov 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-08-21 09:04:36 +03:00
David Cernat
3efffe92e3 Add OpenMW commits up to 5 Nov 2018 
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
 2019-08-21 05:08:50 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 13:15:00 +03:00
David Cernat
056591b957 Add OpenMW commits up to 14 Sep 2018 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 12:14:57 +03:00
David Cernat
889bcec7f8 Add OpenMW commits up to 1 Sep 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/difficultyscaling.cpp
#	apps/openmw/mwscript/transformationextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 11:31:51 +03:00
David Cernat
84cab59057 Add OpenMW commits up to 19 Aug 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
 2019-08-20 10:06:15 +03:00
David Cernat
0339958e21 [General] Rename Log class into TimedLog 2019-08-19 21:39:33 +03:00
Andrei Kortunov
bd18655d23
Merge pull request #2439 from Capostrophic/jumping 
Fix jumping mechanics framerate dependency (bug #4991)
 2019-08-18 10:57:11 +04:00
Andrei Kortunov
b58c632c20
Merge pull request #2502 from akortunov/master 
Optimize custom bones search visitor
 2019-08-18 10:36:01 +04:00
Andrei Kortunov
fe71ce9cb2 Optimize custom bones search visitor 2019-08-18 10:30:21 +04:00
Andrei Kortunov
ed8828d3bc
Merge pull request #2457 from Capostrophic/sneak 
Sneaking consistency fixes (bug #5103)
 2019-08-18 08:57:22 +04:00
Andrei Kortunov
661d11c83e
Merge pull request #2465 from Capostrophic/duration 
Human-readable light source duration (feature #5091)
 2019-08-18 08:43:51 +04:00
Andrei Kortunov
d0bc06b849
Merge pull request #2438 from Capostrophic/camera 
Rewrite messed up playerlooking switch handling (bug #5078)
 2019-08-17 23:15:21 +04:00
capostrophic
e5331aab28 Escape number signs in object names for tooltips 2019-08-17 21:53:52 +03:00
elsid
ad05de44ae
Use 3d coordinates to detect stuck 
To able water and flying creatures move to player going up or down.
 2019-08-17 18:09:00 +02:00
elsid
7b94183d83
Revert "Take in account actor half extents for obstacle check" 
This reverts commit 5434e92437.
 2019-08-17 17:55:49 +02:00
Andrei Kortunov
f7917964a0
Merge pull request #2484 from Capostrophic/fallbackanim 
Allow SwimRunForward state WalkForward fallback (bug #5126)
 2019-08-17 12:45:25 +04:00
Andrei Kortunov
ca724d45a1
Merge pull request #2498 from akortunov/master 
[Regression] inject bones for NPC's with custom animation models
 2019-08-17 12:21:34 +04:00
Andrei Kortunov
6156ab45de [Regression] inject bones for NPC's with custom animation models 2019-08-17 12:17:13 +04:00
Alexei Dobrohotov
1eac6f67db
Merge pull request #2496 from Capostrophic/reverb 
Change the default reverb preset to improve underwater FX transition
 2019-08-17 00:29:29 +03:00
Andrei Kortunov
0afb142b8e [Regression] restore ammo inventory sounds 2019-08-16 21:56:14 +04:00
capostrophic
99710e8f55 Allow SwimRunForward state WalkForward fallback (bug #5126) 2019-08-16 20:46:22 +03:00
Andrei Kortunov
786a6c6d42 Use a common doors rotation code in the "lock" command handler 2019-08-16 21:30:24 +04:00
capostrophic
f779529cab Change the default reverb preset to improve underwater FX transition 2019-08-16 17:37:38 +03:00
David Cernat
ab93b5ddc5 [General] Use PlayerItemUse packets when using items through quick keys 2019-08-16 05:50:07 +03:00
elsid
4d86bf3bf2
Update rotated world objects in navigator 2019-08-15 18:19:19 +02:00
David Cernat
ae5200cbb2 [General] Implement light records for RecordDynamic packets 2019-08-14 21:10:53 +03:00
Alexei Dobrohotov
17991164e4
Merge pull request #2489 from ArgonianAccount/class-quiz 
Class quiz fixes
 2019-08-13 21:47:30 +03:00
David Cernat
6160293e86 [Client] Don't clear placeholder summons in CastSpell::inflict() 2019-08-12 15:12:34 +03:00
Andrei Kortunov
deeccb2783
Merge pull request #2461 from Capostrophic/geteffect 
Use up-to-date magic effects for GetEffect (bug #3894)
 2019-08-11 22:20:20 +04:00
ArgonianAccount
53facf7baa Class quiz fixes 2019-08-12 00:54:02 +12:00
Alexei Dobrohotov
e10bbea7c0
Revert 3.4-breaking 8b1ed6c 2019-08-11 12:07:49 +03:00
Alexei Dobrohotov
5640a305e2
Merge pull request #2487 from akortunov/arrows 
Corrections for extended weapon animations feature
 2019-08-10 20:00:34 +03:00
Andrei Kortunov
6019f6507d Corrections for extended weapon animations feature 2019-08-10 20:57:37 +04:00
Julien Valentin
8b1ed6c357
fix Sunglare bug with osg 3.6 2019-08-10 18:28:03 +02:00
Andrei Kortunov
1f7d2f8da0 Revert "Do not use a separate GlowUpdater for every arrow in quiver" 
This reverts commit b7c214b1bc.
 2019-08-09 21:38:03 +04:00
Andrei Kortunov
b09f0f8c2d
Merge pull request #2458 from Capostrophic/jump 
Don't "jump" with 0 vertical velocity in all cases (bug #5106)
 2019-08-09 21:03:24 +04:00
Alexei Dobrohotov
307e9ba666
Merge pull request #2413 from akortunov/weapon 
Refactor weapon types behaviour
 2019-08-09 20:02:10 +03:00
capostrophic
26f59e47db Improve readability 2019-08-09 19:56:21 +03:00
capostrophic
a9c4b18d38 Make sure cast chance checks mana when necessary (bug #5112) 2019-08-09 19:27:25 +03:00
Andrei Kortunov
134631ad72
Merge pull request #2463 from Capostrophic/crit 
Vanilla-friendly ranged crits (bug #5067)
 2019-08-09 20:23:56 +04:00
Andrei Kortunov
fcd6e915d4 Fallback for long animation groups 2019-08-09 19:40:30 +04:00