Commit Graph

3089 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
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
David Cernat d4a12856ee [Client] Enable AI for LocalActors 8 years ago
David Cernat 0d766a7a04 [Client] Add and use mwmp::Cell class 8 years ago
David Cernat 9beaf9b7a1 [Client] Initialize and update LocalActors while their cells are active 8 years ago
David Cernat 9759764699 [Client] Clean up getting and resetting of WorldEvent 8 years ago
David Cernat d7a760490e [Client] Simplify sending of world packets, part 2 8 years ago
David Cernat 4abe295a80 [Client] Simplify sending of world packets by adding WorldEvent methods 8 years ago
David Cernat 0df14320e0 [Client] Set mMpNum to 0 for ManualRef 8 years ago
David Cernat bb9ea6ccd4 [Client] Also include list of creatures in reply to ActorList 8 years ago
David Cernat ca92be14a5 [Client] Reply to ActorList request with list of NPCs 8 years ago
David Cernat 2bd81c3de0 [Client] Use mpNum for every WorldObject 8 years ago
David Cernat 4644235cf6 [Client] Use mpNum in exact searches for objects 8 years ago
David Cernat 06acd3cbc4 [Client] Add a multiplayer object index and matching methods to CellRef 8 years ago
David Cernat e5cf632e1d [Client] Stop creating new reference numbers for placed/spawned objects 8 years ago
David Cernat 7647715dac Merge pull request #190 from OpenMW/master
Add OpenMW commits up to 27 Mar 2017
8 years ago
scrawl 0a061d45b7 Merge pull request #1239 from akortunov/projectilefix
Disable explosion effect for 0-range projectiles (bug #3730)
8 years ago
Andrei Kortunov 14b59e0e4b Vanilla-like tgm (fixes #3798) 8 years ago
Andrei Kortunov 860b556713 Disables explosion effect for 0-range projectiles (fixes #3730) 8 years ago
David Cernat c10dd1b002 Merge pull request #188 from OpenMW/master
Add OpenMW commits up to 24 Mar 2017
8 years ago
Allofich 5282556ae0 Show names on combat actors when RMB GUI is active
Fixes (#3797)
8 years ago
David Cernat 60037e4081 Merge pull request #185 from OpenMW/master
Add OpenMW commits up to 14 Mar 2017
8 years ago
scrawl e987fe85d0 Add abort flag to TerrainPreloadItem 8 years ago
scrawl 42e9891504 Fix issues caused by loading multiple views into the same terrain View 8 years ago
scrawl 97ed999097 Fix cleanup issue 8 years ago
scrawl c22fde2bcd Preload terrain while reading savegame 8 years ago
scrawl 59bf100907 Fill exteriorPositions in preloadFastTravel 8 years ago
scrawl 03c07d3bd5 Remove old code 8 years ago
scrawl 86e75f0987 Preload terrain even when cell preloading is disabled 8 years ago
scrawl 6ccb6009ee Use the View-based preloading for TerrainGrid as well 8 years ago
scrawl 3c29e2dbeb Refactor ownership of terrain views 8 years ago
scrawl 4549196b31 Use the new way of terrain preloading in CellPreloader/Scene 8 years ago
scrawl 4dbd224249 Hide the terrain in non-exterior cells 8 years ago
scrawl 0fc465da59 Store the min/max height in LandData 8 years ago
scrawl 35d53acc65 Factor out terrain chunk loading/caching into a new resource manager 8 years ago
scrawl 9a3a64f0c4 Add resource manager for ESM::Land to allow data to be unloaded when no longer required 8 years ago
scrawl b898315962 cellpreloader: abort all tasks first before waiting 8 years ago
scrawl 804f873649 terrain: factor out texture caching into a separate class 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
Koncord 690211ad99 [General] Extract BaseEvent & BasePlayer from packets to functions
Move Send and Read functions to BasePacket
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
Koncord cea1425db1 [Client] Remove redundant newlines & keep ~120 columns 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 a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 8 years ago
David Cernat 341ec28b1f [Client] Don't allow actors to cast spells that don't exist on client 8 years ago
David Cernat ff0d21ef38 [Client] Spawn in 0,0 if Pelagiad doesn't exist (for other master files) 8 years ago
David Cernat 328e3b6618 Merge pull request #167 from OpenMW/master
Add OpenMW commits up to 24 Feb 2017
8 years ago
scrawl 25ca89b560 Avoid redundant allocations in Store::search 8 years ago
David Cernat ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 8 years ago
David Cernat 38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl a5247394dc (Re)set the inventory listener outside of the Animation class 8 years ago
Koncord b0ebad8b83 [Client] Fix crash on Linux 8 years ago
David Cernat 67b67ce1c4 [Client] Don't automatically rescale objects on cell change 8 years ago
scrawl a45335ffc3 Do not reduce magicka in god mode 8 years ago
David Cernat a1988ac6ef Merge pull request #161 from OpenMW/master
Add OpenMW commits up to 21 Feb 2017
8 years ago
scrawl 9728a6967e Reset fall height when teleporting (Fixes #2629) 8 years ago
scrawl 7e02bb7348 Preload summoned creature models before the spell is cast 8 years ago
scrawl 22482b7eec Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes 8 years ago
David Cernat cdffbc05f7 Merge pull request #159 from OpenMW/master
Add OpenMW commits up to 19 Feb 2017
8 years ago
Rafael Moura 9963601484 Porting code to ConstContainerStoreIterator #1 8 years ago
Rafael Moura ecbde7b11e Added ConstContainerStoreIterator
using base template for ContainerStoreIterators

less template arguments for ContainerStoreIteratorBase
8 years ago
Allofich bc60421615 Change NPC equip logic to be more like original
(Bug #3754)
8 years ago
Koncord 74cfc4a821 [Client] Use enum instead magic values 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 c32c004516 Merge pull request #151 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017
8 years ago
scrawl 57b585570a Preload magic effect visuals of the player's selected weapon/spell 8 years ago
David Cernat 88f891b5bd [Client] Make it possible to easily iterate through container items 8 years ago
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl a495b9b884 Fix wasteful allocations in Store<Land>::search 8 years ago
scrawl 026a05718f Construct the WorkQueue in Engine 8 years ago
scrawl 325bf66653 Return const Land in ESMStore 8 years ago
David Cernat a5d7c5fd39 Merge pull request #148 from OpenMW/master
Add OpenMW commits up to 13 Feb 2017
8 years ago
Marc Zinnschlag 93c5630e02 Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents' 8 years ago
MAtahualpa c46eadae90 Update actionread.cpp
*grrr* Forgot to change the latter "mSkillID" in line 47...
8 years ago
scrawl cdf65ef681 Merge pull request #1201 from Allofich/hit
Prevent AI actors from hitting unintended targets
8 years ago
scrawl 342c25dffa Fix weather sounds playing at full volume before fading in 8 years ago
MAtahualpa 7bc65ce05b Update actionread.cpp
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
Allofich 6b53541571 Prevent AI actors from hitting unintended targets
(Fixes #3254)
8 years ago
David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
8 years ago
scrawl 6ecc008813 Fix an issue uncovered by the last commit related to changing actor position without properly moving the actor 8 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl 3f3d00ffc9 Add CellPreloader::clear to avoid potential dangling CellStore pointer and to more aggressively clear preload state from a previous game 8 years ago
scrawl 0be86f69bc Write the player object first to increase the chance of preloading the player cells in time 8 years ago
scrawl 1d8a9ff622 Preload player cell as soon as the player is read from the savegame
Giving the worker thread something to do while the rest of the savegame is parsed.
8 years ago
scrawl 066aa2e60e Always run preloadCommonAssets even when the menu is skipped
Move to before the content files are loaded so we can do preloading in parallel with content file loading
8 years ago
scrawl c68f662c9a Predict player movement when preloading cells to better handle moving at high speed 8 years ago
scrawl a46593fa74 Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread 8 years ago
scrawl d62c4259bd CellPreloader: load the terrain first to match the order in the main thread 8 years ago
scrawl 43d9f3d5c7 Update bullet debug drawer even when the game is paused so the collision mesh will show instantly even when the console is up 8 years ago
scrawl 206e2bf975 Fix camera rotation not being set after save game load (regressed with 1eb3384043) 8 years ago
David Cernat 5038353792 [General] Rename BaseEvent's state into doorState & adjust related funcs 8 years ago
David Cernat e703dd42aa [Client] Rename LocalEvent into WorldEvent 8 years ago
David Cernat 3a29b2d41d Merge pull request #141 from OpenMW/master
Add OpenMW commits up to 5 Feb 2017
8 years ago
David Cernat 9c76b805b2 [Client] Send ID_CONTAINER when starting to drag a container item 8 years ago
scrawl 1447bfa215 Improve scene loading performance by creating collision objects with the correct rotation right away instead of adjusting it later 8 years ago
David Cernat a2e3fe18fe [Client] Send ID_PLAYER_CELL_STATE to server at end of CharGen
Also, allow requests for ID_PLAYER_CELL_STATE from the server.
8 years ago