Commit Graph

80 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
Capostrophic c79f96d0d2 Implement ranged crits (feature #3703) 6 years ago
David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
6 years ago
Capostrophic bccba24c40 Make unarmed creature attacks not affect armor condition (fixes #2455) 6 years ago
David Cernat a86c68c5a1 [General] Add sync for ranged weapon & projectile strike enchantments 6 years ago
David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
6 years ago
Capostrophic baaf65bc2c Add vanilla enchanted weaponry behavior option, on by default (fixes #4136) 6 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
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
Koncord 6222c20e82 [Client] Convert MechanicsHelper to namespace 7 years ago
David Cernat 809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 7 years ago
David Cernat 2e8714afaa [Client] Rethink and restructure tes3mp combat code so it works for NPCs 7 years ago
David Cernat 014ff7a059 [Client] Replace usage of Networking::isDedicatedPlayer() 7 years ago
David Cernat 07c2d4251e [Client] Add and use mwmp::PlayerList::isDedicatedPlayer() 7 years ago
David Cernat 0aaf68c994 [Client] Rename mwmp::Players into mwmp::PlayerList for clarity 7 years ago
David Cernat 2565816b22 [Client] Delimit and clarify combat changes made by tes3mp
Additionally, revert unneeded small changes to the formatting of OpenMW code
7 years ago
David Cernat c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
Andrei Kortunov 14b59e0e4b Vanilla-like tgm (fixes #3798) 7 years ago
David Cernat 63c8a98083 [General] Stop using virtual functions in BasePlayer 7 years ago
David Cernat fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
7 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.
7 years ago
Koncord 536715cf46 Cleanup tes3mp headers 8 years ago
David Cernat b028f0b51f Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
8 years ago
David Cernat 3a733eb122 Make tes3mp includes consistent 8 years ago
MiroslavR 5e46121046 Implement fleeing AI (Closes #1118) 8 years ago
David Cernat fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 8 years ago
Koncord 799842b5da Reduce using of the CPU 8 years ago
David Cernat e27d1857ef Fix formatting in previous changes made by tes3mp to OpenMW's core 8 years ago
David Cernat 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
Allofich bce0166931 Don't play blood effects for resisted hits 8 years ago
Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
8 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
8 years ago
Allofich b1be3596dc Cleanup of #include statements 8 years ago
scrawl d05603c7fe Directly apply On Target 'When Strikes' enchantments instead of launching a projectile (Fixes #3212) 8 years ago
scrawl 62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 9 years ago
dteviot 0ee7407101 extracted common sub-expressions. 9 years ago
dteviot ff5ef7055e extracted function CreatureStats::isParalyzed() 9 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.
9 years ago
scrawl 5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 9 years ago
scrawl de8e5f0db1 Restore projectiles 9 years ago
scrawl fd50be0fb8 Restore various gameplay 9 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
9 years ago
scrawl 5abeab21ed Various integer/floating point roll adjustments based on wiki 9 years ago
scrawl 8c810e3620 Move rng to components 9 years ago
scrawl 68f93294da Port EffectManager 9 years ago
scrawl c92592493e OpenMW: create a window and render the starting cell(s) 9 years ago
Marc Zinnschlag 86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 9 years ago
dteviot 3f28634d1f consolidate random number logic
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
9 years ago
dteviot 1d7f3474fa Fixed more MSVC 2013 warnings. 9 years ago