Commit Graph

3184 Commits (master)

Author SHA1 Message Date
Andrei Kortunov 67eace1028 Use struct instead of tuple 4 years ago
Andrei Kortunov 924f634bda Support for multiple summons with same ID in the single spell 4 years ago
David Cernat baa9446cd1 Add OpenMW commits up to 4 Aug 2020 4 years ago
Frederic Chardon 12ee42c6f3 Update mLastTopic before executing scripts. In case the script contains ClearInfoActor it erase not the correct topic.
Other correction not linked with the bug:
- reset mActorKnownTopicsFlag at the same time as mActorKnownTopics
- don't call updateTopics in addResponse, it is already handled by the response
callback
4 years ago
David Cernat 2cb16e778c [General] Use clearer method name for tracking InterpreterContext type 5 years ago
David Cernat ff10aa816b Add OpenMW commits up to 25 Jul 2020
# Conflicts:
#   .travis.yml
5 years ago
David Cernat 58d8367cb0 [Client] Handle input from server-sent custom messageboxes less hackily 5 years ago
David Cernat eb1641dd86 [Client] Fix crashes caused by current modals with invalid widgets 5 years ago
Bret Curtis a5da59e840
Merge pull request #2967 from Capostrophic/casesensitivity
Fix search filter unicode character case sensitivity
5 years ago
Capostrophic 65ac0c86b8 Fix search filter unicode character case sensitivity 5 years ago
Andrei Kortunov 7f936e4cde
Merge pull request #2961 from akortunov/move
Do not use outdated references when moving objects to new cells
5 years ago
David Cernat 39e429c9eb Add OpenMW commits up to 11 Jul 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
5 years ago
Andrei Kortunov da791590ac Update HUD icons during mechanics update again to avoid crashes 5 years ago
Andrei Kortunov db8f0ad6fd Do not use outdated references when moving objects to new cells (bug #5387) 5 years ago
CedricMocquillon 096e25b29a Make the getSkillForTraining a member method of TrainingWindow class.
The implementation is based now on the member of the class
mTrainingSkillBasedOnBaseSkill instead of local static
5 years ago
CedricMocquillon 1aa4f6bf96 The number of skills points a trainer can teach is based either on its base
values or on its modified ones depending on the new setting 'trainers training
 skills based on base skill' value
5 years ago
CedricMocquillon 281cef9769 The 3 skill selected by a trainer are based on its 3 best skills.
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
5 years ago
David Cernat 5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
5 years ago
Bret Curtis 0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
Replace OpenThreads by std types
5 years ago
Andrei Kortunov 9ec61c14d2 Mark some methods as overrides to avoid warnings 5 years ago
Andrei Kortunov d1b5f17390 Remove redundant virtual qualifier 5 years ago
Andrei Kortunov 27f1a3376c Add a separate stats watcher for GUI 5 years ago
Andrei Kortunov d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 5 years ago
elsid 40ad87bc4d
Replace OpenThreads by std types 5 years ago
David Cernat 3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
5 years ago
fredzio ae27ad6bcd Follow up to MR 126
Fill settings-default.cfg with default values as RGBA values are not intuitive for end users.
Add a boolean setting to enable the formatting (disabled by default).
5 years ago
psi29a 981184109e Merge branch 'formattopics' into 'master'
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
5 years ago
Bret Curtis 9446cece62 Issue #5468: Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly. 5 years ago
Bret Curtis c944acf26b
Merge pull request #2913 from akortunov/warnfix
Get rid of ECLD and dependencies
5 years ago
Andrei Kortunov d1a3cc98ff Get rid of ECLD and dependencies 5 years ago
Andrei Kortunov 3e396a904e Reset selected slot when close savegame dialogue to avoid accidental saving/loading 5 years ago
bzzt lost a hitlab login 0b4226f3e2 ico effieciency
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
David Cernat e5b1843089 Add OpenMW commits up to 11 Jun 2020
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 36a2308acd Add OpenMW commits up to 30 May 2020
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwscript/interpretercontext.cpp
5 years ago
David Cernat 62df188fd4 Add OpenMW commits up to 16 May 2020
# Conflicts:
#	CI/before_script.linux.sh
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwscript/globalscripts.cpp
#	apps/openmw/mwscript/interpretercontext.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/cellstore.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
#	components/interpreter/context.hpp
5 years ago
Bret Curtis 204d2acf25
Merge pull request #2092 from akortunov/float_stats
Store attributes and skills values as floats
5 years ago
Andrei Kortunov 81805b7263 Introduce a separate class to control world date and time 5 years ago
Andrei Kortunov 5468fcb29f Store attributes and skills values as floats (bug #4021) 5 years ago
Andrei Kortunov 3dce225f28 Implement vanilla-style corprus handling (bug #3714, bug #4623) 5 years ago
Andrei Kortunov 396afe79f1 Move font loading to the FontLoader 5 years ago
Bret Curtis f36288569c
Merge pull request #2874 from akortunov/windowmanager
Cleanup WindowManager
5 years ago
Andrei Kortunov 2ff04b4e73 Move TextColours initialization to the TextColours itself 5 years ago
Andrei Kortunov dcfc4cc5dd Rename onFrame() to update() to make WindowManager consistent with other managers 5 years ago
Andrei Kortunov 000e44a18e Move data from WindowManager to CharacterCreation to simplify API 5 years ago
Capostrophic 51c0806a31 Use AppliedOnce flag in more effect duration calculations (#5425) 5 years ago
David Cernat 94b211dd4f [Client] Synchronize changes to gold pools from other services 5 years ago
David Cernat 3c51f1c23a [General] Include last gold restock time in ObjectMiscellaneous packets 5 years ago
David Cernat 23ff7b9610 [General] Synchronize gold pools for traders via ObjectMiscellaneous 5 years ago
Andrei Kortunov e827d9c04f Disable physics profiler, if Bullet was compiled without profiling support 5 years ago
Bret Curtis 42cba092b7
Merge pull request #2716 from akortunov/png
Store fog of war as a PNG image instead of TGA
5 years ago
Bret Curtis 507adac8cd
Merge pull request #2783 from akortunov/input
Refactor InputManager
5 years ago
David Cernat 95e5e6d33d [Client] Prevent constant loss of key focus for chat window 5 years ago
David Cernat 053a5a6258 Add OpenMW commits up to 9 May 2020
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/aiextensions.cpp
5 years ago
Andrei Kortunov f990150c49 Move video wrapper to the WindowsManager 5 years ago
Capostrophic 45e6a03937 Only reset dialogue history of dialogue GUI mode is gone 5 years ago
Bret Curtis b4aeb2711c
Merge pull request #2809 from Capostrophic/spellcasting
Refactor spellcasting header and implementation (task #5339)
5 years ago
fredzio 947f3cf13c Optionally change color of keywords in the dialogue window based on the
next answer:
- if the answer was already heard, apply "color topic exhaused" setting
- if the answer was never heard, and the current actor is specified in
the dialog, apply "color topic specific"
- otherwise, do nothing special
5 years ago
bzzt dc33eeadf1 tightscenebound is uncessary after water bbfix 5 years ago
Capostrophic 8d22e075e6 Separate functions that don't belong to CastSpell class 5 years ago
Alexei Dobrohotov afa502cfba
Merge pull request #2800 from elsid/rm_unused
Remove unused code
5 years ago
David Cernat a20f8e77dc Add OpenMW commits up to 25 Apr 2020
# Conflicts:
#	.travis.yml
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
5 years ago
elsid ffacc30597
Use std::array for a list of extensions
This list doesn't change and the size is known at compile time.
5 years ago
elsid 975e4f9908
Fix warning -Wrange-loop-construct
apps/openmw/mwgui/loadingscreen.cpp:81:36: warning: loop variable 'extension' of type 'const std::__cxx11::basic_string<char>' creates a copy from type 'const std::__cxx11::basic_string<char>' [-Wrange-loop-construct]
                    for(auto const extension: supported_extensions)
                                   ^
apps/openmw/mwgui/loadingscreen.cpp:81:25: note: use reference type 'const std::__cxx11::basic_string<char> &' to prevent copying
                    for(auto const extension: supported_extensions)
                        ^~~~~~~~~~~~~~~~~~~~~
                                   &
5 years ago
elsid ee60d4bcea
Remove unused ItemStack::stacks 5 years ago
Bret Curtis e1a5435531 Merge commit '8a8107e8' 5 years ago
Capostrophic dab09180ae Make sure non-carriable light sources can't be picked up 5 years ago
Bret Curtis 8a8107e837 as it says; revert vismask and uncomplicate openmw 5 years ago
Alexei Dobrohotov b5ff32569b
Merge pull request #2768 from glassmancody/tabfix
Fix tab focus for pinned windows
5 years ago
Capostrophic fbcc8ef046 Reset dialogue history when the window can't track what closed it 5 years ago
David Cernat 25a632c650 Add OpenMW commits up to 13 Apr 2020
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
Andrei Kortunov 0bc40e1002
Merge branch 'master' into dialogue 5 years ago
Andrei Kortunov cb6707624d
Merge branch 'master' into soul 5 years ago
Cody a34fe1d9b2 proper game mode detection 5 years ago
Capostrophic 9dbdbbaea7 Only clear dialogue history if the dialogue window is closed (bug #5358) 5 years ago
Capostrophic 96a447ee3a Show the soulgem soul in count dialog (feature #5362) 5 years ago
Cody 8e741a0d0b fixed tab focus for pinned windows 5 years ago
Capostrophic de7ecddbb8 Don't play equip sound for reactivated quick key items (bug #5367) 5 years ago
Andrei Kortunov e444766901 Use enums for blockers IDs instead of strings 5 years ago
Andrei Kortunov 2254256db9 Pause both audio and video playback when the game is minimized (feature #4944) 5 years ago
Andrei Kortunov 3d6fd2818f Support for per-type sound blockers 5 years ago
Andrei Kortunov a68d9aed4c Fix issues, found by CoverityScan 5 years ago
Andrei Kortunov 26ac6839d4
Merge pull request #2755 from akortunov/guifixes
Do not disable a mouse cursor until it moved when you exit a GUI mode
5 years ago
Andrei Kortunov d222435774 Do not disable a mouse cursor until it moved every time when you exit a GUI mode 5 years ago
David Cernat 7bc3298ed4 Add OpenMW commits up to 1 Apr 2020
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
5 years ago
Andrei Kortunov 2e7712a390 Fix C5204 warnings by adding default virtual destructors 5 years ago
Andrei Kortunov 3d20df883e
Merge pull request #2727 from akortunov/guifixes
Make slider control in the wait window to be a more intuitive
5 years ago
Andrei Kortunov 90508237b1 Make slider control in the wait window to be a more intuitive 5 years ago
fredzio e1b5dd97b8 Add a filter in the alchemy window.
A button allow to switch between ingredient name and magic effect.
Switching reset the filter.
The default filter can be set in the layout file.

The player can show only ingredients whose either name or effect
match the filter
Only effect that are known to the player (via alchemy skill) are
taken into account
5 years ago
David Cernat 43e7df6df8 Add OpenMW commits up to 11 Mar 2020 5 years ago
Andrei Kortunov 94df2114c1 Store fog of war as a PNG image instead of TGA (bug #5108) 5 years ago
Capostrophic 54334932d9 Move user string assignment to layout files 5 years ago
David Cernat 27d35d73a2 [General] Implement OnObjectSound packet
Many interactions between players and objects now have their sounds sent to other players.
5 years ago
Capostrophic 4b17d5da43 Make search fields behave more consistently 5 years ago
Alexei Dobrohotov 3f64d98305 Merge branch 'inventorysearch' into 'master'
Item search in inventory redux

See merge request OpenMW/openmw!158
5 years ago
Frederic Chardon 78d58a344d Item search in inventory (feature #4831) 5 years ago
Capostrophic cfa877b109 Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141) 5 years ago
David Cernat 85fb1d1a0b Add OpenMW commits up to 19 Feb 2020
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
5 years ago
elsid 650f429ff5
Add final modifier to fix warnings 5 years ago
Andrei Kortunov 84979fa8b7 Move VisMask to components 5 years ago
David Cernat a4b10c75e1 [Client] Remove unneccessary addConsoleCommandObject() from ObjectList 5 years ago
David Cernat b97fa7553c [Client] Remove variable redeclarations 5 years ago
David Cernat 038c5b8231 [Client] Rename ObjectList's addObject() into addBaseObject() 5 years ago
David Cernat 296c04af71 [Client] Combine ObjectList's getBaseObject() and getObjectFromPtr() 5 years ago
David Cernat 975797c09b [General] Implement ObjectRestock packet
Restocking object containers via trading now requires the server to send back an ObjectRestock packet before it can happen.

The unused packet ID ID_SCRIPT_GLOBAL_FLOAT has been replaced with ID_OBJECT_RESTOCK.
5 years ago
David Cernat 59a38164ea [Client] Add generic objects to ObjectList using addObjectGeneric() 5 years ago
David Cernat 989188c171 [Client] Remove ObjectList's confusing addObjectDelete() function 5 years ago
David Cernat 27b9357478 [Client] Send Container packets when buying or selling items at merchant 5 years ago
David Cernat a378b254f8 [Client] Include necessary headers in ContainerItemModel 5 years ago
David Cernat 8b14c007f3 [Client] Send ObjectDelete for purchased objects removed from world 5 years ago
David Cernat d2ba4a12d9 [Client] Simplify container sending with new addContainerItem() methods 5 years ago
David Cernat 51f0acbaf5 [Client] Improve logging for Container packets 5 years ago
David Cernat 60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
5 years ago
Alexei Dobrohotov 7a4caaf5bf
Merge pull request #2660 from akortunov/boost
Additional de-boosting
5 years ago
Andrei Kortunov 1cdd33b434 Implement additional stringops to avoid Boost functions 5 years ago
Andrei Kortunov a42396254b Use ISO format to print datetime 5 years ago
Andrei Kortunov af36b652aa Simplify datetime formatting 5 years ago
David Cernat ca9cd90a4d Add OpenMW commits up to 20 Dec 2019
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
5 years ago
David Cernat eeb77f80d2 [Client] Send ConsoleCommand packets when console is used 5 years ago
David Cernat 5b4db83d61 [Client] Once again allow beds to be used even if waiting is disallowed
This had been broken by rest-related commits in OpenMW.
5 years ago
Andrei Kortunov eec82f676a
Merge pull request #2602 from elsid/clang_tidy
Fix clang-tidy issues
5 years ago
David Cernat 9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat 56c3ef71ae [Client] Send ObjectDelete packets when picking up items once again
When fixing problems with ObjectActivate in 49fa35a516, I mistakenly made it so the picking up of items no longer also sent ObjectDelete packets. That is now fixed.
5 years ago
Capostrophic eed92c824e Make sure hand-to-hand shortcut is not saved 5 years ago
David Cernat 0c98c5d09e Add OpenMW commits up to 19 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
5 years ago
elsid b55f5ab648
Avoid virtual call in WindowManager ctor
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        loadUserFonts();
        ^
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: This constructor of an object of type 'WindowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: Call to virtual function during construction
5 years ago
Andrei Kortunov 6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon
Minor summoned creature cleanup fixes
5 years ago
Andrei Kortunov 5561eb5415 Do not discard division reminder 5 years ago
Capostrophic 120b7dcd2f Clean up summoned creatures when corpses are disposed 5 years ago
Andrei Kortunov 6a625b1dac Scale magic items frames in the quick keys menu 5 years ago
Bret Curtis 0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images" 5 years ago
Bret Curtis 36614dba2a
Merge pull request #2453 from akortunov/fog_compression
Store raw data about fog of war instead of RGBA images
5 years ago
David Cernat 54301f5f89 Add OpenMW commits up to 29 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat bde9f7b817 Add OpenMW commits up to 20 Oct 2019
# Conflicts:
#	apps/openmw/mwgui/recharge.cpp
#	apps/openmw/mwrender/globalmap.cpp
#	apps/openmw/mwrender/globalmap.hpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat 05b5a7b32d [Client] Trigger crimes when using take all on containers 5 years ago
Capostrophic ee4fa93bd4 Rework prevent merchant equipping setting again 5 years ago
Andrei Kortunov 19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip
Set OnPCEquip properly when a race can't equip an item (bug #5182)
5 years ago
Alexei Dobrohotov b7a1e6561b
Merge pull request #2080 from akortunov/recharge
Recharge items outside of player inventory
5 years ago
Capostrophic c718f89325 Set OnPCEquip properly when a race can't equip an item (bug #5182) 5 years ago
Andrei Kortunov c51aba0b13 Recharge items outside of player's inventory (bug #4077) 5 years ago
Andrei Kortunov f75f9cb337 Use localized faction name when using TFH 5 years ago
David Cernat 4a34666c59 Add OpenMW commits up to 7 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
5 years ago
Andrei Kortunov f0b73e0a27 Do not store owners for items in container stores (bug #1933) 5 years ago
Capostrophic 421a9d2e50 [Regression] Fix pickpocket crashes 5 years ago
Andrei Kortunov b360deaec3 Store raw data about fog of war instead of RGBA images (bug #5108) 5 years ago
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
5 years ago
Andrei Kortunov 85bb4a76f6 Improve faction items handling (bug #5164) 5 years ago
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
5 years ago
Andrei Kortunov c9deb1b325 Generate sCrimeMessageReport only once per frame (bug #5012) 5 years ago
James Stephens 7d3f6e1cd9 Altered process so that cost only appears on spell purchase window.
Added myself to authors
5 years ago
James Stephens b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 5 years ago