David Cernat
ec1311fcb7
[Client] Make it possible to check whether a class has a ContainerStore
7 years ago
Capostrophic
e6d9bce519
Implement fWerewolfHealth GMST ( fixes #4142 )
7 years ago
David Cernat
3d5860d6f4
Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw/mwgui/container.cpp
apps/openmw/mwmp/LocalActor.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
components/openmw-mp/Base/BaseEvent.hpp
components/openmw-mp/Log.cpp
components/openmw-mp/Log.hpp
7 years ago
Capostrophic
76f50312f2
Remove a redundant check
7 years ago
David Cernat
ac82124a5d
Merge pull request #395 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
7 years ago
scrawl
c02920bcd1
Merge pull request #1634
...
Conflicts:
apps/openmw/mwworld/worldimp.hpp
7 years ago
Andrei Kortunov
fed3e56fc1
Weather manager: get rid of World dependency
7 years ago
Andrei Kortunov
53ef345680
Update magic effect particles after building new animation (bug #2254 )
7 years ago
Andrei Kortunov
a0a30cdbf5
AI: hide torches during bad weather (bug #4334 )
7 years ago
David Cernat
7ec08e125b
Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
7 years ago
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
scrawl
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
7 years ago
Thunderforge
dfcd243150
Remove the word "interior" from cell not found message
7 years ago
Chris Robinson
4caa7c9674
Workaround older MSVC quirk
7 years ago
Chris Robinson
154cc8c659
Use alternate fog parameters when distant land is enabled
...
This allows the distant land to actually be seen when the user enables it. The
values used are replicated from MGE XE's default settings and should probably
be exposed somewhere.
7 years ago
David Cernat
60f686ee43
[General] Implement setting of physics framerate as part of GameSettings
7 years ago
David Cernat
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
7 years ago
scrawl
a708ac488e
Don't call Store::setUp() unnecessarily
...
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
7 years ago
David Cernat
ac374a8ef9
Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Quests.cpp
apps/openmw-mp/Script/Functions/Quests.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwworld/worldimp.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
David Cernat
4496625154
Merge pull request #381 from OpenMW/master
...
Add OpenMW commits up to 31 Jan 2018
7 years ago
scrawl
b1b8e31562
Use unique_ptr over new/delete ( Fixes #4305 )
7 years ago
David Cernat
f1ba9253b0
[Client] Fix build
7 years ago
David Cernat
1a8a518897
Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
README.md
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwworld/scene.cpp
components/openmw-mp/Version.hpp
7 years ago
David Cernat
ce11a1dfa9
[Client] Fix potential invalid pointer when storing cell unloads
...
Notably, builds of the client done with Clang were crashing on startup before this.
7 years ago
David Cernat
420dab10e1
[General] Track objects directly placed by players in ObjectPlace
...
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).
Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
7 years ago
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
scrawl
e2e48e0a50
Add default value for 'sAnd' GMST ( Fixes #4269 )
7 years ago
scrawl
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269 )
7 years ago
David Cernat
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 10 Jan 2018
7 years ago
David Cernat
8316ec0fa7
[Client] Update tes3mp change comment for object rescaling
7 years ago
Koncord
c4949ac5d9
[General] Change regular enums to enum class
7 years ago
David Cernat
dddd2f1cc7
Merge pull request #361 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
Andrei Kortunov
1a58171e86
Do not allow to sell items from containers with zero capacity (bug #4268 )
7 years ago
Koncord
fd721143e2
[Client] Implement weather packet
7 years ago
Koncord
25b7095396
[Client] Share WeatherManager to the mwmp::Main class
7 years ago
Koncord
122a30c183
[General] Change type of refNumIndex & mpNum to unsigned
7 years ago
David Cernat
de77ee3126
Merge pull request #356 from OpenMW/master
...
Add OpenMW commits up to 7 Dec 2017
7 years ago
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
7 years ago
Koncord
cd03d59056
[Client] Fix invalid read (memcheck warning)
7 years ago
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
7 years ago
scrawl
c50b18b3bb
Move PathgridGraph out of CellStore
...
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.
This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
7 years ago
scrawl
5fe68ab062
Merge pull request #1419
7 years ago
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
7 years ago
Miloslav Číž
4373fea21e
Correct projectile rotation
7 years ago
Miloslav Číž
d0a299caab
Rotate thrown projectiles around the bb center
7 years ago
Miloslav Číž
38bda3bd71
Do not save thrown state for projectiles
7 years ago
Miloslav Číž
3dbcda6686
Make use of mEffectAnimationTime for projectile rotation
7 years ago
Miloslav Číž
2b9a0a7732
Save new projectile state
7 years ago
Miloslav Číž
de42aa9d03
Make thrown projectiles rotate
7 years ago
Andrei Kortunov
9943bd4d74
AiWander fast forwarding improvements (bug #3638 )
7 years ago
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
scrawl
9ecdcc187f
Clarify a warning message refers to inventory objects
7 years ago
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
scrawl
bb4ffb7743
Merge pull request #1514 from akortunov/ringfix
...
Do not replace an equpped ring of the same value
7 years ago
scrawl
5b2fe01375
Merge pull request #1508 from AnyOldName3/shut-up-travis
...
Mark worldimp functions as override to stop distracting Travis CI war…
7 years ago
Andrei Kortunov
e64f14b7ce
Do not replace an equpped ring of the same value
7 years ago
AnyOldName3
03fc3353b9
Tidy up indentation 2
7 years ago
AnyOldName3
f3e6b26e6b
Tidy up indentation
7 years ago
Rhiyo
d9fe3aac99
fixed new clothing replacing old clothing of same value
...
Found on the bug http://bugs.openmw.org/issues/4165 .
In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind.
In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
7 years ago
AnyOldName3
2abff22c08
Make MWWorld::World final to enable compiler optimisations
7 years ago
AnyOldName3
7440cf37bc
Remove redundant virtual keywords implied by override keywords
7 years ago
AnyOldName3
69da89be39
Mark a method I missed out the first time as override
7 years ago
AnyOldName3
2aad5bed7a
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
7 years ago
David Cernat
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
glbwsk
83a5c7c3d8
removed unnecessary comments, added gitignore for clion cmake
7 years ago
glbwsk
ff9cb22a58
npc swap cheaper ring during auto equip
7 years ago
glbwsk
e6e482ea98
added some comments for autoEquip
7 years ago
glbwsk
a25903b075
fixed autoequiping rings by npc - now checks if right hand is free
7 years ago
David Cernat
3e8d7c8416
Merge pull request #306 from OpenMW/master
...
Add OpenMW commits up to 7 Oct 2017
7 years ago
Andrei Kortunov
e2afd3690c
Remove item by id from InventoryStore
7 years ago
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
scrawl
8c0790580a
Add screen fading for exterior cell transitions
7 years ago
Andrei Kortunov
03daf2b9e3
Fix a failed assert in the getCell() check during a new game start
7 years ago
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
7 years ago
David Cernat
ddf0dfed55
Merge pull request #298 from OpenMW/master
...
Add OpenMW commits up to 26 Sep 2017
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
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
7 years ago
Andrei Kortunov
7d703a13a3
Fix a crash in the World::isUnderwater() if the cell is empty
7 years ago
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
7 years ago
MiroslavR
b5f5268ff3
Clean up faraway projectiles
7 years ago
David Cernat
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
7 years ago
scrawl
0e648222b8
Merge pull request #1446 from akortunov/takeallfix
...
Do not allow to equip a replacement, when take all items from a dead corpse
7 years ago
Andrei Kortunov
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
7 years ago
MiroslavR
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
7 years ago
David Cernat
960b91a53c
Merge pull request #290 from OpenMW/master
...
Add OpenMW commits up to 17 Sep 2017
7 years ago
scrawl
5dd2e871c8
Merge pull request #1450 from kcat/master
...
Sound improvements
7 years ago
Andrei Kortunov
44738e1141
Clear player fields upon reload (bug #2639 )
7 years ago
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
7 years ago
Chris Robinson
1fe60dd8e2
Replace some shared_ptrs with pointers to deque entries
7 years ago
David Cernat
98a7769b91
Merge branch 'master' into 0.6.0
7 years ago
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
David Cernat
f6d36d5d80
[Client] Ensure that objects searched for have a valid reference number
7 years ago
AnyOldName3
1578fcbec7
Escape content file names before sending them to the GUI
7 years ago
Andrei Kortunov
7c80ddc9de
Owned crosshair improvements (bug #2789 )
7 years ago
spycrab
632d39ca76
Allow starting at an (unnamed) exterior cell using --start (Feature #3941 )
8 years ago
David Cernat
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
David Cernat
fbec0d9443
[Client] Remove inertia from players who are teleported via a packet
8 years ago
MiroslavR
d24286273b
Prevent respawned references from being added to the scene twice in certain cases ( Fixes #3864 )
8 years ago
scrawl
333648c975
Merge pull request #1324 from akortunov/doorfix
...
Improved doors detection
8 years ago