Commit Graph

179 Commits (ffi-server-rewrite)

Author SHA1 Message Date
David Cernat 799241e8c6 [Client] Use informative error message for RefData::setCount() issue 6 years ago
David Cernat 3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
7 years ago
Andrei Kortunov e64f14b7ce Do not replace an equpped ring of the same value 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
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 73e7aa838d Merge pull request #296 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
Andrei Kortunov 4580024d76 Unequip all items from dead corpse when take all items (bug #4095) 7 years ago
David Cernat 461ab790e2 [Client] Correctly disable auto-equipping for DedicatedPlayers & DedicatedActors 8 years ago
David Cernat 26087a182d Merge pull request #213 from OpenMW/master
Add OpenMW commits up to 8 May 2017
8 years ago
David Cernat 809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 8 years ago
Andrei Kortunov bba822c014 Purge all effects with same ID instead only first (fixes #3839) 8 years ago
David Cernat 5c5c62f33a Merge pull request #206 from OpenMW/master
Add OpenMW commits up to 23 Apr 2017, part 2
8 years ago
MiroslavR eada8c6822 Fix wrong incrementation in InventoryStore::visitEffectSources (Fixes #3838) 8 years ago
David Cernat 53081a6a6f [Client] Clean up more checks by using PlayerList::isDedicatedPlayer() 8 years ago
David Cernat 11a9e3bdb1 Merge pull request #197 from OpenMW/master
Add OpenMW commits up to 14 Apr 2017
8 years ago
Allofich 6e405aed8c Adjustments to RemoveItem behavior
(Fixes #3796)
8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
scrawl 809f5cd01b Fix bad override 8 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
8 years ago
scrawl 29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
8 years ago
David Cernat a2ef39c655 Merge pull request #178 from OpenMW/master
Add OpenMW commits up to 2 Mar 2017
8 years ago
scrawl 1692b7f38e Merge pull request #1209 from dhustkoder/master
Added ConstContainerStoreIterator (Task #3092)
8 years ago
Rafael Moura 6c2ce2b2a1 Porting more ContainerStoreIterator usage to const version #4
removed const_cast revision
8 years ago
Rafael Moura 05cc69f6f1 Porting more ContainerStoreIterator usage to const version 8 years ago
David Cernat cdffbc05f7 Merge pull request #159 from OpenMW/master
Add OpenMW commits up to 19 Feb 2017
8 years ago
Allofich bc60421615 Change NPC equip logic to be more like original
(Bug #3754)
8 years ago
David Cernat 0d75264221 Merge pull request #155 from OpenMW/master
Add OpenMW commits up to 17 Feb 2017, part 2
8 years ago
MiroslavR f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 8 years ago
David Cernat dfb87e9e0d Merge pull request #124 from OpenMW/master
Add OpenMW commits up to 11 Jan
8 years ago
MiroslavR f1f9209814 Creatures now auto-equip shields (Fixes #3704) 8 years ago
David Cernat 5bdfb72752 Merge pull request #116 from OpenMW/master
Add OpenMW changes up to 26 Dec
8 years ago
scrawl cf496287f7 Silence static analysis warnings 8 years ago
David Cernat f9ca98498d Merge pull request #107 from OpenMW/master
Add OpenMW commits up to 20 Nov, part 2
8 years ago
Allofich 0e429ae41d Make water walking mechanics closer to original MW 8 years ago
David Cernat 94c5d6d2f9 Don't use autoEquip on player-controlled NPCs 8 years ago
MiroslavR 407abc605f Fix auto-equipping of blunt weapons 8 years ago
MiroslavR 76ddd9bebb Add a setting for merchant auto-equipping prevention 8 years ago
MiroslavR 1d3008594d Autoequip weapons (Fixes #3562) 8 years ago
MiroslavR 14240cf7a2 Fix autoEquip to better match vanilla (Fixes #3590) 8 years ago
MiroslavR 11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 8 years ago
Allofich 5aad1d81f4 Remove no longer used parameter 8 years ago
Allofich dc8ff5e49b Play all sfx and use particle textures for permanent enchantments 8 years ago
MiroslavR 72d2daae90 Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects 9 years ago
scrawl 3f1df4caa6 Don't auto-equip ammunition (Fixes #3401) 9 years ago