Commit Graph

2629 Commits (0.7.1-build-fixes)

Author SHA1 Message Date
David Cernat cc25612b8d Add OpenMW commits up to 18 Sep 2019
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
5 years ago
Andrei Kortunov d58f93f388 Use sayDone() only for scripting backward compatibility 5 years ago
David Cernat ca67587b89 Add OpenMW commits up to 5 Sep 2019
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
Andrei Kortunov c059bf04cc Rename getWeaponPart() function 5 years ago
David Cernat 353e7d530a Add OpenMW commits up to 18 Aug 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat b57c0bcafe Add OpenMW commits up to 6 June 2019
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat f671c0bddc Add OpenMW commits up to 1 Apr 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
5 years ago
David Cernat 8729c3c5e3 Add OpenMW commits up to 9 Mar 2019
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat 95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
5 years ago
David Cernat 6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat 68886e7539 Add OpenMW commits up to 2 Dec 2018
# Conflicts:
#	.travis.yml
#	README.md
5 years ago
David Cernat cbba81df03 Add OpenMW commits up to 14 Nov 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat 3efffe92e3 Add OpenMW commits up to 5 Nov 2018
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
5 years ago
David Cernat fba07194cf Add OpenMW commits up to 29 Oct 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 056591b957 Add OpenMW commits up to 14 Sep 2018
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 889bcec7f8 Add OpenMW commits up to 1 Sep 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/difficultyscaling.cpp
#	apps/openmw/mwscript/transformationextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 84cab59057 Add OpenMW commits up to 19 Aug 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
5 years ago
David Cernat 0339958e21 [General] Rename Log class into TimedLog 5 years ago
Andrei Kortunov fe71ce9cb2 Optimize custom bones search visitor 5 years ago
Andrei Kortunov d0bc06b849
Merge pull request #2438 from Capostrophic/camera
Rewrite messed up playerlooking switch handling (bug #5078)
5 years ago
Andrei Kortunov 6156ab45de [Regression] inject bones for NPC's with custom animation models 5 years ago
Alexei Dobrohotov e10bbea7c0
Revert 3.4-breaking 8b1ed6c 5 years ago
Julien Valentin 8b1ed6c357
fix Sunglare bug with osg 3.6 5 years ago
Andrei Kortunov 1f7d2f8da0 Revert "Do not use a separate GlowUpdater for every arrow in quiver"
This reverts commit b7c214b1bc.
5 years ago
Andrei Kortunov fcd6e915d4 Fallback for long animation groups 5 years ago
Andrei Kortunov afaff8231d Use the Weapon Bone as fallback 5 years ago
Andrei Kortunov f0cef772fa Refactor weapon types behaviour
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
5 years ago
Andrei Kortunov b7c214b1bc Do not use a separate GlowUpdater for every arrow in quiver 5 years ago
Andrei Kortunov 8557346fbd Use glow for enchanted arrows (feature #5122) 5 years ago
Andrei Kortunov 1eed511b4e Use enchanted glow for pulled arrows 5 years ago
Andrei Kortunov 4c92f0c4e1 Move getEnchantmentColor() from Animation to Class 5 years ago
Capostrophic 0b074f2211 Rewrite messed up playerlooking switch handling (bug #5078) 6 years ago
Alexei Dobrohotov 8ebecb7584 Merge branch '7' into 'master'
fixes pitch black ripples in shadow

See merge request OpenMW/openmw!123
6 years ago
bzzt 403171e083 fixes pitch black ripples in shadow 6 years ago
Alexei Dobrohotov e0fb411fc8 Merge branch '2' into 'master'
stop making new reflacttetures at intext change

See merge request OpenMW/openmw!116
6 years ago
bzzt 6c310c64d2 stop making new reflacttetures at intext change 6 years ago
Andrei Kortunov fae5843347 Setup the ICO settings only once instead of every loading (bug #5025) 6 years ago
Alexei Dobrohotov 4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders
Minor water shader fixes
6 years ago
Alexei Dobrohotov 216f908a07
Merge pull request #2286 from akortunov/map
Do not re-render maps for all active cells during cell transitions
6 years ago
Alexei Dobrohotov e4ef7e8d3f
Merge pull request #2355 from akortunov/transparency
Use the StateSetUpdater to modify alpha for Animation objects
6 years ago
Alexei Dobrohotov a737935748
Merge pull request #2363 from akortunov/herbalism
Additional herbalism-related tweaks
6 years ago
Andrei Kortunov c01153569d Add missing Organic flag check for herbalism 6 years ago
Alexei Dobrohotov 74112976b2
Merge pull request #2085 from akortunov/herbalism
Native graphics herbalism support
6 years ago
Andrei Kortunov 5876a417c3 Use the StateSetUpdater to modify alpha for Animation objects (bug #5001) 6 years ago
Andrei Kortunov 861d41f4a4 Native graphics herbalism support (feature #5010) 6 years ago
Andrei Kortunov c3fdccac1f Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004) 6 years ago
Capostrophic f2638b58c1 Tweak object VFX scaling (bug #4989) 6 years ago
Capostrophic 0333cd2dd4 Fix frozen rain when water refractions are disabled 6 years ago
Bret Curtis f4e113e7c1
Merge pull request #2277 from akortunov/terrain
Camera-related fixes
6 years ago