Commit Graph

184 Commits (master)

Author SHA1 Message Date
David Cernat 7a6dfc61ec Add OpenMW commits up to 21 May 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwscript/interpretercontext.cpp
#   components/CMakeLists.txt
4 years ago
jvoisin 04edb1c817 Trim down some internal includes 4 years ago
David Cernat 7f435ceeac Add OpenMW commits up to 1 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
4 years ago
Alexei Dobrohotov 9763995892 Fix regression #5666 4 years ago
David Cernat 68837aaf4a Add OpenMW commits up to 15 Oct 2020
# Conflicts:
#   .travis.yml
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/mwgui/containeritemmodel.cpp
#   apps/openmw/mwgui/tradewindow.cpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwworld/actionteleport.cpp
#   apps/openmw/mwworld/containerstore.cpp
4 years ago
Assumeru 72549651e0
Rework container resolution (#3006)
* Rework container resolution

* add optional argument to getCount

* remove now-redundant changes

* undo worldimp changes

* move save-fixing code to InventoryState

* replace Rng instances with Seeds
4 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
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
Capostrophic 96a447ee3a Show the soulgem soul in count dialog (feature #5362) 5 years ago
David Cernat 43e7df6df8 Add OpenMW commits up to 11 Mar 2020 5 years ago
Frederic Chardon 78d58a344d Item search in inventory (feature #4831) 5 years ago
David Cernat b97fa7553c [Client] Remove variable redeclarations 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
Capostrophic 56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 6 years ago
Alexei Dobrohotov 7c46102f0c
Merge pull request #2389 from akortunov/fmt
Introduce a custom format() function
6 years ago
Andrei Kortunov e679190f31 Introduce a custom format() function to get rid of boost::format() and hackish replace() 6 years ago
Alexei Dobrohotov 0ee73d89f0
Correct selling prices of creature merchants 6 years ago
Andrei Kortunov faf940546b Get rid of redundant setKeyFocusWidget() method 6 years ago
Andrei Kortunov 675be20a0f Get rid of redundant ControllerRepeatClick class 6 years ago
Alexei Dobrohotov d37cb871d6
Fix last-minute typo 6 years ago
Capostrophic 9d191055bf Make offered price caps barter-specific (bug #5028) 6 years ago
Andrei Kortunov 8df8bd3f37 Use C++11-style loops in the GUI instead of iterators 6 years ago
Capostrophic 8ecd0b82a4 Replace Boost format and replace_all where possible 6 years ago
Capostrophic c3e8d536cd Implement getNormalizedEnchantmentCharge() method and use it 6 years ago
Capostrophic 54bd7b2dcf Implement getItemNormalizedHealth() method and use it 6 years ago
Capostrophic 67de61e1fb Avoid item condition and charge zero divisions 6 years ago
Andrei Kortunov e06f0b797a Replace all NULLs to nullptr 6 years ago
Andrei Kortunov bdd9eba2b8 Use C++ limits instead of C ones 6 years ago
Andrei Kortunov 269ef7a559 Disable repeating for ENTER key in GUI 6 years ago
Capostrophic 7ef6fa9f61 Remove deprecated GMST get* functions 6 years ago
Capostrophic ab29f9e13f Add permanent barter disposition change option (feature #3103) 7 years ago
Capostrophic 191cc76378 Consider faction ownerships in item stolen checks (fixes #4293) 7 years ago
scrawl 8964fc93d6 Fix dialogue window not being exited properly 7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
7 years ago
scrawl b7752ec52d Make TradeWindow not depend on DialogueWindow 7 years ago
scrawl 67dc4e019a Make Enter on trade window price attempt the trade 7 years ago
scrawl 2b03bc0c56 Call WindowBase::onFrame() for every active window 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
Andrei Kortunov f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 7 years ago
Andrei Kortunov 35beede065 Restock items after trade deal instead of trade window opening 8 years ago
Andrei Kortunov 487e72fd23 Play Up sounds instead of Down ones in trade window (bug #3982) 8 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 8 years ago
Bret Curtis 154d7cffa2 replace and purge boost::function 8 years ago
Ben Shealy 5085afa3d7 Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading 9 years ago
Ben Shealy 8703609649 Allow +/- buttons in trade window to decrease offer to 0 9 years ago
scrawl a6e23d03d3 Don't clamp disposition twice, clamping is already done inside getDerivedDisposition 9 years ago
scrawl 12ec90f9e7 Change default argument, fix GetDisposition 9 years ago
ae-g-i-s c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 9 years ago