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
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
David Cernat
ab93b5ddc5
[General] Use PlayerItemUse packets when using items through quick keys
2019-08-16 05:50:07 +03:00
David Cernat
57f84914c3
[Client] Prevent permanent deletion of player markers on cell changes
2019-07-14 22:42:55 +03:00
David Cernat
94a9292cc6
[Client] Use correct index when unassigning quickkeys from WindowManager
2019-07-01 13:48:45 +03:00
David Cernat
49fa35a516
[Client] Use ObjectActivate packets when picking up items from inventory
2019-06-09 01:00:01 +03:00
uramer
3b2098382b
update player map markers when client changes cell
2019-03-21 16:27:15 +01:00
Vladimir Panteleev
9d5fc7954f
DRY skill widget updates in stats window
...
The skill widgets were configured in two places: initial creation, and
updates. The former was redundant, and duplicated the functionality of
the latter.
To fix this redundancy, replace the duplicate code with a call to
setValue.
2019-03-05 22:52:30 +00:00
Capostrophic
2f38e4fbb3
Fix enchanted item icon update
2019-03-02 20:01:42 +03:00
Bret Curtis
79fca2e7c6
Merge pull request #2095 from akortunov/reflections
...
Add more settings to water reflections
2019-03-02 15:37:06 +01:00
Bret Curtis
f6127a30c0
Merge pull request #2199 from akortunov/guifixes
...
Use C++11-style loops in the GUI instead of iterators
2019-03-02 15:36:54 +01:00
Andrei Kortunov
bf5f68a4d8
Replace boost GCD to the homebrew implementation
2019-03-02 17:32:05 +04:00
Andrei Kortunov
9398117ea7
Allow to do not reflect terrain
2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184
Add more settings to water reflections in exteriors (feature #4859 )
2019-03-02 14:26:14 +04:00
Andrei Kortunov
8df8bd3f37
Use C++11-style loops in the GUI instead of iterators
2019-03-02 13:27:59 +04:00
Bret Curtis
735bcf17c2
Merge branch 'boost-gcd-deprecation' into 'master'
...
Fix boost deprecation warning
See merge request OpenMW/openmw!66
2019-02-26 18:02:01 +00:00
AnyOldName3
cd4303da23
Add preprocessor check to determine which common_factor header to use.
2019-02-26 17:03:07 +00:00
Capostrophic
216e1ab16f
Always include <memory> for smart pointers in MWGui
2019-02-25 18:50:51 +03:00
Capostrophic
8ecd0b82a4
Replace Boost format and replace_all where possible
2019-02-24 03:20:20 +03:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes
...
Remove redundant includes
2019-02-24 01:14:16 +01:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Capostrophic
58788de7c4
Get rid of Boost.Array
2019-02-22 23:16:34 +03:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix
...
Fix some issues, found by PVS-Studio
2019-02-22 15:01:37 +01:00
Bret Curtis
55fc04e462
Merge pull request #2175 from Capostrophic/includes
...
Include cleanup
2019-02-22 14:56:20 +01:00
Capostrophic
c03ed4cd50
Include cleanup
2019-02-19 18:40:33 +03:00
Andrei Kortunov
9de0c9045a
Fix API usage errors
2019-02-17 14:29:39 +04:00
Andrei Kortunov
dc6ef15571
Simplify loop in the addSkills()
2019-02-17 14:29:39 +04:00
Andrei Kortunov
ad9412a117
Remove some redundant checks
2019-02-17 14:29:36 +04:00
Andrei Kortunov
18a59df050
Throw exceptions by value instead of reference
2019-02-17 10:24:25 +04:00
AnyOldName3
89d4d3be08
Fix boost deprecation warning
2019-02-13 14:49:36 +00:00
Capostrophic
e9c6c11418
Fix hiding three-tab (Cyrillic) topic index
2019-02-08 10:53:50 +03:00
Andrei Kortunov
8580a58ba0
Optimize HUD update (do not do unnecessary work)
2019-01-25 21:15:29 +04:00
David Cernat
f481c85e07
[Client] Use ADD before REMOVE for PlayerInventory in repair/recharge
...
Previously, when recharging or repairing an item, the client sent a PlayerInventory packet to the server with the old version of the item that was supposed to be removed and then it sent a PlayerInventory packet with the new version of the item that was supposed to be added.
Unfortunately, the current CoreScripts make it so custom items using generated IDs have their records deleted when they are completely removed from the world, however briefly, even if they are added back immediately afterwards. In practice, this meant that – before this commit – recharging or repairing a custom item led to its removal from the player inventory stored on the server, followed by the deletion of its record, followed by its readdition to the inventory (but with the record staying deleted). Logging out and logging back in immediately prevented the player from receiving the item anymore because of its now non-existent record.
2019-01-11 13:08:26 +02:00
Andrei Kortunov
0937f02598
Get rid of unnecessary string streams
2019-01-07 21:08:16 +04:00
David Cernat
906d2a837d
[Client] Send PlayerInventory packets when recharging items w/ soulgems
2018-12-30 11:58:33 +02:00
Ilya Zhuravlev
1bdec2399f
Make sure CopyFramebufferToTextureCallback is only called once and not every frame
2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
8e7c01b561
loadingscreen: Fix UaF in loading screen.
...
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
2018-12-24 14:18:26 -05:00
Andrei Kortunov
a53333c3d5
Native animated containers support (feature #4730 )
2018-12-13 23:11:16 +04:00
David Cernat
afd17e5a48
[Client] Don't finish drag & drop that is supposed to be unsuccessful
...
This prevents items from vanishing when your attempt to drop them in a full container is denied.
2018-12-06 18:11:52 +02:00
Bret Curtis
a21792657a
Merge pull request #2034 from akortunov/guifixes
...
Improve GUI cleanup
2018-11-15 07:31:57 +01:00
Andrei Kortunov
5e071e3eb0
Add a missing check if mPtr is empty (bug #4715 )
2018-11-13 10:32:23 +04:00