Commit Graph

726 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
David Cernat 2597f018d2 Merge pull request #272 from TES3MP/0.6.0
Add hotfix commits for 0.6.0 up to 23 Aug 2017
7 years ago
David Cernat a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 7 years ago
Andrei Kortunov 7c80ddc9de Owned crosshair improvements (bug #2789) 7 years ago
Andrei Kortunov bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 7 years ago
Andrei Kortunov f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 7 years ago
David Cernat fbec0d9443 [Client] Remove inertia from players who are teleported via a packet 8 years ago
David Cernat 500bff9911 Merge pull request #250 from OpenMW/master
Add OpenMW commits up to 27 Jul 2017
8 years ago
Julian d7aa2a882d improve dialogue window performance 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 a629d48df6 Update the facedObject after the camera is updated 8 years ago
David Cernat e3929df38a Merge pull request #239 from OpenMW/master
Add OpenMW commits up to 14 Jul 2017
8 years ago
David Cernat 708d3723eb [Client] Fix client script messagebox buttons that had always broken in tes3mp 8 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 8 years ago
David Cernat 71313c5aa6 [General] Implement PlayerMap packet, part 1 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
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 70d9374a6a [General] Implement PlayerKillCount packets 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
Andrei Kortunov 3190f28710 Spell priority: make AI do not cast target spells under water 8 years ago
David Cernat 906b263a2d [Client] Update topics in current dialogue screen when receiving PlayerTopic packets 8 years ago
David Cernat 7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 8 years ago
Koncord 7af73782f3 [OpenMW] Implement MWWorld::createRecord for Creatures 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
Allofich 60c67bc327 Run scripts for voiced dialogue
(Fixes #3787)
8 years ago
David Cernat 9beaf9b7a1 [Client] Initialize and update LocalActors while their cells are active 8 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 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 a5d7c5fd39 Merge pull request #148 from OpenMW/master
Add OpenMW commits up to 13 Feb 2017
8 years ago
Allofich 6b53541571 Prevent AI actors from hitting unintended targets
(Fixes #3254)
8 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
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
David Cernat 9f8f62b765 Merge pull request #137 from OpenMW/master
Add OpenMW commits up to 1 Feb
8 years ago
scrawl 34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 8 years ago
David Cernat fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
NeveHanter e82d542d89 Merge remote-tracking branch 'upstream/master' into bugfix-3617 8 years ago
NeveHanter 811e9ad9f3 Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater.
Also allowed projectiles to fly through the dead bodies as in vanilla.
8 years ago
David Cernat fba4878fee Merge pull request #118 from OpenMW/master
Add OpenMW changes up to 27 Dec
8 years ago
NeveHanter 8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 8 years ago
David Cernat 973db7c78a Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
8 years ago
Leon Krieg c7b4b2cdd7 Fixed multiple spelling mistakes 8 years ago
David Cernat 1feec58ed2 Merge pull request #108 from OpenMW/master
Add OpenMW changes up to 20 Nov, part 3
8 years ago
scrawl 16a913c549 Add emission of water ripple particles for water-walking actors (Fixes #3608) 8 years ago
David Cernat b028f0b51f Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
8 years ago
MiroslavR 5e46121046 Implement fleeing AI (Closes #1118) 8 years ago
David Cernat bdb53e1cb4 Implement ID_WORLD_DOOR_ACTIVATE and send it from MWBase::World 8 years ago
MiroslavR 301dd77efb Save controls state (Fixes #3598) 8 years ago
Allofich df03b32205 Coverity fixes 8 years ago
Allofich f8270f6bd5 Consolidations and cleanup for multi-effect spells 8 years ago
Allofich 37f07f7435 Combine into one multi-effect magic projectile 8 years ago
Allofich 10842462c7 Send lists of models and sounds to launchMagicBolt 8 years ago
Allofich a6216d883f Don't allow casting Water Walking in deep water 8 years ago
MiroslavR b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 9 years ago
Allofich 4e54338ce0 Implement and use getDistanceToFacedObject() 9 years ago
scrawl 4acfe1a7e4 Move cleanupSummonedCreature to the mechanics manager (Bug #3439) 9 years ago
scrawl f417d7780a Fix the enemy nearby check (Bug #3423) 9 years ago
Austin Salgat 84179c262f Update manual wandering to prevent actor from leaving/entering water
Water creatures will stay in the water, while land creatures will stay on land when wandering.
9 years ago
scrawl 5bd8ef247d Do not adjust the player position when loading a savegame (Fixes #2089) 9 years ago
scrawl 92c2a10de4 Fall back to 'warrior' for not found class images (Fixes #3228) 9 years ago
scrawl 79eb2d20e0 Cleanup 9 years ago
scrawl 12ec90f9e7 Change default argument, fix GetDisposition 9 years ago
scrawl bc5adfa4fe Merge pull request #913 9 years ago
scrawl a0cc9de088 Make the creation of save file directories even more explicit 9 years ago
ae-g-i-s c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 9 years ago
ae-g-i-s 2f1c6c740c Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)"
This reverts commit 000597236e.
9 years ago
ae-g-i-s 000597236e Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233) 9 years ago
scrawl 6df71f6250 Factor out safePlaceObject function 9 years ago
scrawl 11f00e3aa9 Rename safePlaceObject to placeObject 9 years ago
scrawl c3ef387208 Vanilla-compatible creature/NPC respawning (Fixes #2369, Fixes #2467) 9 years ago
scrawl 383524c688 Run physics in fixed timesteps, use the remainder to interpolate between current and previous state
Based on http://gafferongames.com/game-physics/fix-your-timestep/
9 years ago
scrawl 1cda2bf796 Preload sky & water from the main menu 9 years ago
scrawl bd655c20fd Refactor local map updates
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.

Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
9 years ago
scrawl 300379617e Accept a const CellStore in findInteriorPositionInWorldSpace 9 years ago
scrawl 41ebf62fb1 Accept a const CellStore in getNorthVector 9 years ago
scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
Conflicts:
	apps/opencs/view/render/instancemode.cpp
9 years ago
scrawl 4e6a60672d When a spell explodes on an actor do not apply it to that actor twice (Fixes #3142) 9 years ago
scrawl 6546c05428 Move Fallback map to components/ 9 years ago
scrawl f315a4386f Accept an implicit reference in Journal (Fixes #3135) 9 years ago
scrawl 4f8f166f69 Fix GetPcInJail to work as in the original engine 9 years ago
scrawl f052c05018 Move werewolf functions from World to MechanicsManager 9 years ago
scrawl 29d0f448b4 Add const version of World::getAnimation 9 years ago
scrawl 53f4b92426 AiEscort do not follow target through doors
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
9 years ago
scrawl 604b5d24e9 Use a ConstPtr in SoundManager 9 years ago
scrawl a0fb31e3b1 Accept a ConstPtr in getLOS 9 years ago
scrawl 029d467ea5 Accept a ConstPtr in getItemsOwnedBy, getContainersOwnedBy 9 years ago
scrawl 388aed1748 Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions 9 years ago
scrawl c9ca5bc946 Accept a ConstPtr in placeObject 9 years ago
scrawl 6c505ca06f Accept a ConstPtr in getHitContact 9 years ago
scrawl 0796f49c17 Accept a ConstPtr in various physics getters 9 years ago
scrawl 553132cb51 Accept a ConstPtr in launchProjectile 9 years ago
scrawl 271fcb80c6 Remove container scripts before deleting container 9 years ago
Chris Robinson 808f701013 Use the actor's Head position for Say streams 9 years ago
scrawl 965bea45c0 AiEscort makes the actor side with target in fights (Bug #2697)
Also will follow the player through teleport doors.
9 years ago
Marc Zinnschlag e0c9265148 Merge remote-tracking branch 'origin/master' 9 years ago
scrawl 86881bcf39 In first person mode, attach sound listener to the camera 9 years ago
Chris Robinson 1ce3e7f5b9 Use a separate type for streams
They're basically the same, but it's to help avoid accidents with passing non-
streaming sounds to the stream functions, or vice-versa.
9 years ago
Chris Robinson 816015d6e6 Avoid inheriting from Sound for sound types 9 years ago
Chris Robinson 5f8a09df97 Play player sounds (except footsteps) local to the listener 9 years ago
Chris Robinson 82f3651f81 Treat the sound offset as the offset in seconds 9 years ago
Chris Robinson aac903484c Remove a really unnecessary method 9 years ago
Chris Robinson 73448c72f6 Replace Play_NoTrack with playManualSound3D, and rename the latter 9 years ago
scrawl 3453353091 AiCombat distance check takes into account collision box (Fixes #1699) 9 years ago
scrawl b4ce73f179 Rotations: remove LocalRotation
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
9 years ago
scrawl 13c7235b6b Remove old FPS setting code 9 years ago
scrawl c4b5a41ac3 Improve combat AI vertical aiming (Fixes #1366, Fixes #1330) 9 years ago
scrawl fd48c1d6f4 Make the Equip script function "use" items (drink potion, use alchemy, etc) 9 years ago
scrawl d11952c48a Stop rendering when the window is minimized 9 years ago
slothlife 4fd00a75d5 Merge advanceTime and advanceTimeByFrame 9 years ago
slothlife 54fa5273dc Refactor weather transitions to act more like MW
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl b583a2ec33 Make SetDelete a no-op for items in containers (Fixes #2864) 10 years ago
Arthur Moore 5e6fcc2aef Alert the user if attempting to play an animation fails
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
10 years ago
scrawl 278a078e9d Unify magic effect tick functions
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
10 years ago
Jiří Kuneš 4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 10 years ago
Jiří Kuneš e68b388d16 removed setCrosshairOwned from windowmanager 10 years ago
Jiří Kuneš c019f8e23d use correct mechanics manager 10 years ago
Jiří Kuneš 66edae9b93 change collor of crosshair 10 years ago
scrawl 882e359008 Move attackStrength to the CharacterController, where it should have been to begin with
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
scrawl 7bacb9418d Various math code ported to osg 10 years ago
scrawl 2a85a22dba Write savegame screenshot 10 years ago
scrawl de8e5f0db1 Restore projectiles 10 years ago
scrawl a066b24303 Restore WeaponAnimation 10 years ago
scrawl c811ac6afe Port fog of war
Not optimized yet, need to work on fog texture's DataVariance.
10 years ago
scrawl 3dcb167066 Map rendering 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 85345e663a Restore getHitContact 10 years ago
scrawl 8bcfac1ea3 Fix adjustPosition not always working correctly (Fixes #2563)
moveObject was returning an incorrect Ptr for cell movements.
10 years ago
scrawl 7a3bc69df7 Readded sound listener 10 years ago
scrawl 19988d5e45 Remove RefData::getHandle 10 years ago
scrawl 47758c11cd Readded collision objects and movement physics 10 years ago
scrawl 9cf9c2876e Pathgrid rendering 10 years ago
scrawl 8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 10 years ago
scrawl 82c4d01b37 Add back resource handling workarounds to the gui code 10 years ago
scrawl 223e3a53f5 Move OEngine::Gui::Layout to MWGui 10 years ago
scrawl 7809caf9dc Dead code removal 10 years ago
scrawl 68f93294da Port EffectManager 10 years ago
scrawl d00c75d428 Remove more outdated TODO comments. 10 years ago
scrawl 48ea6286fd Book/scroll window refactoring 10 years ago
scrawl 37a6d7da76 WindowManager refactoring 10 years ago
dteviot 407cd50890 fixed warning C4099:
type name first seen using 'class' now seen using 'struct'
10 years ago
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
10 years ago
scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
10 years ago
Digmaster 1e4a845b6f Minor code cleanup 10 years ago
Marc Zinnschlag 4c5bba2947 Merge remote-tracking branch 'dteviot/SpellCastingFixes' 10 years ago
dteviot 8d7de7d1ec Telekinesis allows safe opening of traps (Fixes #1916)
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
10 years ago
scrawl 3ccf4642b4 Implement ToggleScripts 10 years ago
Marc Zinnschlag e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 10 years ago