mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-24 23:53:50 +00:00
Code Issues Releases Wiki Activity
26218 commits 38 branches 54 tags 122 MiB
Commit graph

3067 commits

Author SHA1 Message Date
Alexei Dobrohotov
b5ff32569b
Merge pull request #2768 from glassmancody/tabfix 
Fix tab focus for pinned windows
 2020-04-18 22:27:51 +03:00
Capostrophic
fbcc8ef046 Reset dialogue history when the window can't track what closed it 2020-04-14 08:49:14 +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
Andrei Kortunov
0bc40e1002
Merge branch 'master' into dialogue 2020-04-13 13:50:52 +04:00
Andrei Kortunov
cb6707624d
Merge branch 'master' into soul 2020-04-13 13:47:13 +04:00
Cody
a34fe1d9b2 proper game mode detection 2020-04-12 10:18:07 -07:00
Capostrophic
9dbdbbaea7 Only clear dialogue history if the dialogue window is closed (bug #5358) 2020-04-12 11:59:58 +03:00
Capostrophic
96a447ee3a Show the soulgem soul in count dialog (feature #5362) 2020-04-12 11:55:00 +03:00
Cody
8e741a0d0b fixed tab focus for pinned windows 2020-04-11 23:01:16 -07:00
Capostrophic
de7ecddbb8 Don't play equip sound for reactivated quick key items (bug #5367) 2020-04-11 23:29:36 +03:00
Andrei Kortunov
e444766901 Use enums for blockers IDs instead of strings 2020-04-05 19:14:23 +04:00
Andrei Kortunov
2254256db9 Pause both audio and video playback when the game is minimized (feature #4944) 2020-04-04 22:54:51 +04:00
Andrei Kortunov
3d6fd2818f Support for per-type sound blockers 2020-04-04 22:54:51 +04:00
Andrei Kortunov
a68d9aed4c Fix issues, found by CoverityScan 2020-04-04 17:45:26 +04:00
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
 2020-04-04 14:22:25 +04:00
Andrei Kortunov
d222435774 Do not disable a mouse cursor until it moved every time when you exit a GUI mode 2020-04-02 22:39:00 +04:00
David Cernat
7bc3298ed4 Add OpenMW commits up to 1 Apr 2020 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
 2020-04-01 19:24:11 +03:00
Andrei Kortunov
2e7712a390 Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
Andrei Kortunov
3d20df883e
Merge pull request #2727 from akortunov/guifixes 
Make slider control in the wait window to be a more intuitive
 2020-03-21 10:11:20 +04:00
Andrei Kortunov
90508237b1 Make slider control in the wait window to be a more intuitive 2020-03-20 11:58:22 +04:00
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
 2020-03-20 06:35:57 +01:00
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02:00
Andrei Kortunov
94df2114c1 Store fog of war as a PNG image instead of TGA (bug #5108) 2020-03-07 11:05:32 +04:00
Capostrophic
54334932d9 Move user string assignment to layout files 2020-03-02 02:36:16 +03:00
David Cernat
27d35d73a2 [General] Implement OnObjectSound packet 
Many interactions between players and objects now have their sounds sent to other players.
 2020-02-29 18:15:41 +02:00
Capostrophic
4b17d5da43 Make search fields behave more consistently 2020-02-25 18:26:25 +03:00
Alexei Dobrohotov
3f64d98305 Merge branch 'inventorysearch' into 'master' 
Item search in inventory redux

See merge request OpenMW/openmw!158
 2020-02-24 18:14:40 +00:00
Frederic Chardon
78d58a344d Item search in inventory (feature #4831) 2020-02-24 18:14:40 +00:00
Capostrophic
cfa877b109 Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141) 2020-02-21 21:18:54 +03:00
David Cernat
85fb1d1a0b Add OpenMW commits up to 19 Feb 2020 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2020-02-20 01:51:47 +02:00
elsid
650f429ff5
Add final modifier to fix warnings 2020-02-18 10:36:08 -08:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
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, I mistakenly made it so the picking up of items no longer also sent ObjectDelete packets. That is now fixed.
 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
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
David Cernat
353e7d530a Add OpenMW commits up to 18 Aug 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 22:44:00 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019 
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-08-22 08:40:32 +03:00
David Cernat
f671c0bddc Add OpenMW commits up to 1 Apr 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
 2019-08-21 23:54:39 +03:00
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