David Cernat
a4b10c75e1
[Client] Remove unneccessary addConsoleCommandObject() from ObjectList
2020-02-15 10:24:05 +02:00
David Cernat
b97fa7553c
[Client] Remove variable redeclarations
2020-02-08 15:08:07 +02:00
David Cernat
038c5b8231
[Client] Rename ObjectList's addObject() into addBaseObject()
2020-01-23 16:40:04 +02:00
David Cernat
296c04af71
[Client] Combine ObjectList's getBaseObject() and getObjectFromPtr()
2020-01-23 16:18:49 +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
David Cernat
59a38164ea
[Client] Add generic objects to ObjectList using addObjectGeneric()
2020-01-23 09:03:40 +02:00
David Cernat
989188c171
[Client] Remove ObjectList's confusing addObjectDelete() function
2020-01-22 14:35:51 +02:00
David Cernat
27b9357478
[Client] Send Container packets when buying or selling items at merchant
2020-01-20 01:40:44 +02:00
David Cernat
a378b254f8
[Client] Include necessary headers in ContainerItemModel
2020-01-19 17:20:17 +02:00
David Cernat
8b14c007f3
[Client] Send ObjectDelete for purchased objects removed from world
2020-01-19 16:45:24 +02:00
David Cernat
d2ba4a12d9
[Client] Simplify container sending with new addContainerItem() methods
2020-01-16 14:00:30 +02:00
David Cernat
51f0acbaf5
[Client] Improve logging for Container packets
2020-01-16 10:32:48 +02:00
David Cernat
60b6f92fa3
Add OpenMW commits up to 13 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
2020-01-15 07:49:26 +02:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost
...
Additional de-boosting
2020-01-09 22:14:32 +03:00
Andrei Kortunov
1cdd33b434
Implement additional stringops to avoid Boost functions
2020-01-09 19:40:22 +04:00
Andrei Kortunov
a42396254b
Use ISO format to print datetime
2020-01-06 11:27:11 +04:00
Andrei Kortunov
af36b652aa
Simplify datetime formatting
2020-01-04 10:45:11 +04:00
David Cernat
ca9cd90a4d
Add OpenMW commits up to 20 Dec 2019
...
# Conflicts:
# apps/openmw/mwworld/scene.cpp
2019-12-20 15:43:50 +02:00
David Cernat
eeb77f80d2
[Client] Send ConsoleCommand packets when console is used
2019-12-07 10:11:45 +02:00
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.
2019-12-03 23:55:55 +02:00
Andrei Kortunov
eec82f676a
Merge pull request #2602 from elsid/clang_tidy
...
Fix clang-tidy issues
2019-12-03 08:27:43 +04:00
David Cernat
9d6f3fdd09
Add OpenMW commits up to 1 Dec 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
2019-12-01 23:52:42 +02:00
David Cernat
56c3ef71ae
[Client] Send ObjectDelete packets when picking up items once again
...
When fixing problems with ObjectActivate in 49fa35a516
2019-11-30 08:13:22 +02:00
Capostrophic
eed92c824e
Make sure hand-to-hand shortcut is not saved
2019-11-20 19:57:21 +03:00
David Cernat
0c98c5d09e
Add OpenMW commits up to 19 Nov 2019
...
# Conflicts:
# apps/openmw/mwmechanics/aipursue.cpp
# apps/openmw/mwmechanics/summoning.cpp
2019-11-19 17:16:48 +02:00
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
2019-11-17 18:50:11 +01:00
Andrei Kortunov
6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon
...
Minor summoned creature cleanup fixes
2019-11-17 10:47:07 +04:00
Andrei Kortunov
5561eb5415
Do not discard division reminder
2019-11-13 15:18:18 +04:00
Capostrophic
120b7dcd2f
Clean up summoned creatures when corpses are disposed
2019-11-12 21:44:46 +03:00
Andrei Kortunov
6a625b1dac
Scale magic items frames in the quick keys menu
2019-11-09 15:00:50 +04:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images"
2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
...
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
David Cernat
54301f5f89
Add OpenMW commits up to 29 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwworld/inventorystore.cpp
2019-10-29 23:49:31 +02:00
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
2019-10-29 22:26:35 +02:00
David Cernat
05b5a7b32d
[Client] Trigger crimes when using take all on containers
2019-10-29 21:17:01 +02:00
Capostrophic
ee4fa93bd4
Rework prevent merchant equipping setting again
2019-10-28 01:58:23 +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
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge
...
Recharge items outside of player inventory
2019-10-09 23:37:10 +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
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
Capostrophic
421a9d2e50
[Regression] Fix pickpocket crashes
2019-09-23 23:56:37 +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
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
Andrei Kortunov
85bb4a76f6
Improve faction items handling (bug #5164 )
2019-09-17 19:09:08 +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
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
