David Cernat
7a6dfc61ec
Add OpenMW commits up to 21 May 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/interpretercontext.cpp
# components/CMakeLists.txt
2021-05-21 16:00:09 +02:00
jvoisin
04edb1c817
Trim down some internal includes
2021-04-30 19:39:26 +02:00
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
2020-11-01 23:17:59 +02:00
Alexei Dobrohotov
9763995892
Fix regression #5666
2020-10-27 18:08:14 +03:00
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
2020-10-15 19:51:39 +02:00
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
2020-10-13 17:46:32 +02:00
David Cernat
3c51f1c23a
[General] Include last gold restock time in ObjectMiscellaneous packets
2020-05-16 19:10:11 +03:00
David Cernat
23ff7b9610
[General] Synchronize gold pools for traders via ObjectMiscellaneous
2020-05-16 02:51:11 +03:00
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
2020-04-13 19:53:42 +03:00
Capostrophic
96a447ee3a
Show the soulgem soul in count dialog (feature #5362 )
2020-04-12 11:55:00 +03:00
David Cernat
43e7df6df8
Add OpenMW commits up to 11 Mar 2020
2020-03-11 22:17:17 +02:00
Frederic Chardon
78d58a344d
Item search in inventory (feature #4831 )
2020-02-24 18:14:40 +00:00
David Cernat
b97fa7553c
[Client] Remove variable redeclarations
2020-02-08 15:08:07 +02:00
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.
2020-01-23 12:50:34 +02:00
Capostrophic
56539fee4f
Partially revert "Get rid of redundant setKeyFocusWidget() method"
2019-06-09 02:12:44 +03:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt
...
Introduce a custom format() function
2019-05-21 21:45:52 +03:00
Andrei Kortunov
e679190f31
Introduce a custom format() function to get rid of boost::format() and hackish replace()
2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
0ee73d89f0
Correct selling prices of creature merchants
2019-05-19 23:43:40 +03:00
Andrei Kortunov
faf940546b
Get rid of redundant setKeyFocusWidget() method
2019-05-17 19:09:40 +04:00
Andrei Kortunov
675be20a0f
Get rid of redundant ControllerRepeatClick class
2019-05-17 10:49:00 +04:00
Alexei Dobrohotov
d37cb871d6
Fix last-minute typo
2019-05-13 09:50:32 +03:00
Capostrophic
9d191055bf
Make offered price caps barter-specific (bug #5028 )
2019-05-09 21:19:10 +03:00
Andrei Kortunov
8df8bd3f37
Use C++11-style loops in the GUI instead of iterators
2019-03-02 13:27:59 +04:00
Capostrophic
8ecd0b82a4
Replace Boost format and replace_all where possible
2019-02-24 03:20:20 +03:00
Capostrophic
c3e8d536cd
Implement getNormalizedEnchantmentCharge() method and use it
2018-10-25 16:16:07 +03:00
Capostrophic
54bd7b2dcf
Implement getItemNormalizedHealth() method and use it
2018-10-25 15:45:31 +03:00
Capostrophic
67de61e1fb
Avoid item condition and charge zero divisions
2018-10-24 19:06:55 +03:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Andrei Kortunov
bdd9eba2b8
Use C++ limits instead of C ones
2018-09-20 16:02:26 +04:00
Andrei Kortunov
269ef7a559
Disable repeating for ENTER key in GUI
2018-09-10 12:55:00 +04:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Capostrophic
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
2018-08-01 17:31:35 +03:00
Capostrophic
191cc76378
Consider faction ownerships in item stolen checks ( fixes #4293 )
2018-06-03 10:22:20 +03:00
scrawl
8964fc93d6
Fix dialogue window not being exited properly
2017-09-27 12:56:02 +00:00
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
2017-09-25 23:38:28 +02:00
scrawl
b7752ec52d
Make TradeWindow not depend on DialogueWindow
2017-09-25 18:07:49 +02:00
scrawl
67dc4e019a
Make Enter on trade window price attempt the trade
2017-09-25 00:47:07 +02:00
scrawl
2b03bc0c56
Call WindowBase::onFrame() for every active window
2017-09-24 19:08:15 +02:00
scrawl
4fff2e2e34
Refactor exitCurrentGuiMode
2017-09-24 19:08:13 +02:00
scrawl
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
2017-09-24 19:08:12 +02: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
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
Andrei Kortunov
54b4d93f79
Added a special function for GUI sounds playing
2017-07-10 15:48:00 +04:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
Ben Shealy
5085afa3d7
Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading
2016-06-04 12:28:47 -04:00
Ben Shealy
8703609649
Allow +/- buttons in trade window to decrease offer to 0
2016-04-09 17:49:21 -04:00
scrawl
a6e23d03d3
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
2016-03-18 00:42:22 +01:00
scrawl
12ec90f9e7
Change default argument, fix GetDisposition
2016-03-18 00:38:02 +01:00
ae-g-i-s
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
2016-03-08 21:30:28 +01:00
