Commit Graph

3089 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
Miloslav Číž db6107f12f
Merge branch 'master' into screenshot360 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 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 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 8316ec0fa7 [Client] Update tes3mp change comment for object rescaling 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
Andrei Kortunov a28cc37501 Do not sell ingredients from organic containers 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
Miloslav Číž 4fc532d873 reference screenshot settings only from one place 7 years ago
Andrei Kortunov 9943bd4d74 AiWander fast forwarding improvements (bug #3638) 7 years ago
Miloslav Číž 319ed2f9b8 disable 360 screenshots in vanity/preview mode 7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
Miloslav Číž d4fd08a63f save 360 screenshots in the configured directory 7 years ago
scrawl 9ecdcc187f Clarify a warning message refers to inventory objects 7 years ago
Miloslav Číž 7feba7e498 basic setup for 360 screenshots 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
Andrei Kortunov 10eb6ec75f AI: Check angle between actor and door 8 years ago
Andrei Kortunov 920021c61b Update effects during rest (bug #3679) 8 years ago
David Cernat 2c1ece79fc Merge pull request #245 from OpenMW/master
Add OpenMW commits up to 22 Jul 2017
8 years ago
scrawl c9f8a220dc Update the tooltip when the focusObject is set 8 years ago
David Cernat b8b3856c73 Merge pull request #244 from OpenMW/master
Add OpenMW commits up to 19 Jul 2017
8 years ago
scrawl 20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 8 years ago
scrawl a629d48df6 Update the facedObject after the camera is updated 8 years ago
David Cernat fd046e42ef Merge pull request #242 from OpenMW/master
Add OpenMW commits up to 16 Jul 2017
8 years ago
scrawl 2c95f40640 Merge pull request #1333 from akortunov/guidistortionfix
Disable sound distortion for GUI actions and PlaySound command [discussion]
8 years ago
Andrei Kortunov dca8317083 Disable sound distortion for player actions in GUI mode 8 years ago
Andrei Kortunov 37952c9a79 Added door detection based by ray casting 8 years ago
David Cernat 99640da111 Merge pull request #234 from OpenMW/master
Add OpenMW commits up to 30 Jun 2017
8 years ago
scrawl 951c4e12e0 Fix crash introduced by commit 1d8a9ff622 (Fixes #3940) 8 years ago
Koncord aa1f5c3cd3 [Client] Change pointer type to reference 8 years ago
David Cernat 813a3c89c4 [General] Implement PlayerBook packet to track skill books read 8 years ago
David Cernat a358dc6af8 [Client] Revert 0020132 now that 534c819 provides a better fix 8 years ago
David Cernat 77758596a1 Merge pull request #230 from OpenMW/master
Add OpenMW commits up to 25 Jun 2017
8 years ago
scrawl 534c81976c Add missing cell update for physics system (Fixes #3917) 8 years ago
David Cernat df67ae4689 Merge pull request #229 from OpenMW/master
Add OpenMW commits up to 20 Jun 2017
8 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Jordan Ayers b277bd782e Adjust restock calculations to ignore filled soul gems.
Bug #3684
8 years ago
scrawl 80eb2ea35d Merge pull request #1313 from akortunov/spellpriority
Make combat AI to do not cast target spells under water
8 years ago
David Cernat 002013294a [Client] Add temporary fix for OpenMW crash caused by using default head 8 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 8 years ago
Bret Curtis 07f75e1104 replace boost::shared_ptr in extern and components 8 years ago
Ewan Higgs 38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 8 years ago
Andrei Kortunov 3190f28710 Spell priority: make AI do not cast target spells under water 8 years ago
David Cernat 89f6c6df96 Merge pull request #225 from OpenMW/master
Add OpenMW commits up to 4 Jun 2017
8 years ago
Nicholas f6f07f5497 clear mGoToJail flag on load 8 years ago
David Cernat 8c785fb22c [Client] Send ObjectDelete packets when summoned creatures despawn 8 years ago
David Cernat 75a60a4700 [Client] Update debug in CellStore 8 years ago
David Cernat 461ab790e2 [Client] Correctly disable auto-equipping for DedicatedPlayers & DedicatedActors 8 years ago
David Cernat f4cdedd8cb [General] Synchronize summoned creatures 8 years ago
David Cernat 4e5c8873e0 [General] Use ObjectSpawn instead of ObjectPlace for actors 8 years ago
David Cernat ea2a060c67 [Client] Sync actor movements from interiors to exteriors & vice versa 8 years ago
David Cernat 7177d56cfb [Client] Only require refNumIndex & mpNum for CellStore::searchExact() 8 years ago
David Cernat cdfc2db2d1 Merge pull request #220 from OpenMW/master
Add OpenMW commits up to 26 May 2017
8 years ago
David Cernat 32879adc5b [General] Allow ObjectTrap to trigger traps, not just disarm them 8 years ago
David Cernat 7ac115b359 [Client] Implement sending and reading of ObjectTrap packets 8 years ago
Andrei Kortunov f17badb3cd Makes cells cache size configurable 8 years ago
David Cernat 97768be14b [Client] Send ObjectPlace packet for random creatures interrupting rest 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 34f0a5e076 [Client] Disable leveled creatures from their class instead of scene.cpp 8 years ago
David Cernat dcc61a095a [Client] Allow multiple WorldObjects to be added to a WorldEvent 8 years ago
David Cernat bdc8b7f863 [Client] Send level creatures in ObjectPlace reply to ActorList request 8 years ago
David Cernat 9eef867928 [Client] Disable regular spawning of leveled creatures 8 years ago
David Cernat 8d41a0c53b [Client] Make LocalActor initialization include newly spawned Actors 8 years ago
David Cernat ebf9df3fe2 [Client] Add getMergedRefs() method to CellStore 8 years ago
David Cernat 9b58973929 [Client] Remove variable added by tes3mp to CellStore that is not used 8 years ago
David Cernat 809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 8 years ago
Koncord 7af73782f3 [OpenMW] Implement MWWorld::createRecord for Creatures 8 years ago
Andrei Kortunov bba822c014 Purge all effects with same ID instead only first (fixes #3839) 8 years ago
David Cernat a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 8 years ago
David Cernat dba0d47973 [Client] Revert position changes on invalid cell changes to fix glitches 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 9ea69f4c1f [Client] Add LocalActor & DedicatedActor cell transition logic to World::moveObject() 8 years ago
David Cernat 4e86d8781f [Client] Clean up & simplify logic for DedicatedPlayer cell transitions 8 years ago
David Cernat a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
scrawl 1956602aa2 Merge pull request #1262 from Allofich/warnings
Fix more warnings
8 years ago
David Cernat fec82dc033 Merge pull request #202 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017
8 years ago
scrawl c2240e3af1 Call the WindowManager::updatePlayer after the startup script is run 8 years ago
Allofich ff3e307059 Pass parameters by const reference 8 years ago
David Cernat edb155869b Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
8 years ago
Allofich f299f26720 Remove unused variable 8 years ago
David Cernat 53081a6a6f [Client] Clean up more checks by using PlayerList::isDedicatedPlayer() 8 years ago
David Cernat 8ebe7ed683 [Client] Remove isLocalActor (no longer needed) from LiveCellRefBase 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 c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl 8f335b3484 Merge pull request #1245 from akortunov/tgm
Vanilla-like tgm
8 years ago