Andrei Kortunov
|
84b3aaedaa
|
Merge pull request #2506 from akortunov/refactor
Rename getWeaponPart() function
|
2019-08-27 10:05:44 +04:00 |
|
Andrei Kortunov
|
c059bf04cc
|
Rename getWeaponPart() function
|
2019-08-27 09:55:02 +04:00 |
|
Alexei Dobrohotov
|
ceff1defb4
|
Merge pull request #2504 from elsid/door_state_enum
Add enum type for door state
|
2019-08-27 02:05:17 +03:00 |
|
Alexei Dobrohotov
|
06c792e434
|
Merge pull request #2505 from Capostrophic/crashfix
Avoid using getPtr() on empty geometry data
|
2019-08-26 23:07:18 +03:00 |
|
Capostrophic
|
c0438a0c6b
|
Avoid using getPtr on empty geometry data
|
2019-08-26 23:01:58 +03:00 |
|
David Cernat
|
3e1c96a49c
|
[Client] Fix crash by not trying to enable markers for invalid players
|
2019-08-26 21:10:02 +03:00 |
|
David Cernat
|
78a9a428a6
|
[Client] Remove unnecessary mwmp::Main::pressedKey() function
Additionally, add comment around where it was originally used.
|
2019-08-26 15:41:45 +03:00 |
|
David Cernat
|
e0f623fb87
|
[Client] Move check for preventing auto equipping to correct spot
|
2019-08-26 15:39:56 +03:00 |
|
David Cernat
|
e15428e139
|
[General] Remove "created by" stamps added by IntelliJ
|
2019-08-26 12:33:28 +03:00 |
|
elsid
|
16170131b7
|
Add enum type for door state
|
2019-08-25 15:21:00 +02:00 |
|
David Cernat
|
9350e1d484
|
[General] Split up Attack packets into Attack and Cast ones
Create an entirely new PlayerCast packet for that purpose, but rename the already existing but unused ActorInteraction into ActorCast.
|
2019-08-25 09:35:23 +03:00 |
|
Alexei Dobrohotov
|
64fde2d7c2
|
Fix crash when NiGeometry lacks NiGeometryData
|
2019-08-24 22:34:56 +03:00 |
|
Alexei Dobrohotov
|
43a58e181f
|
Merge pull request #2455 from Capostrophic/input
Revert questionable input manager decisions
|
2019-08-24 15:02:50 +03:00 |
|
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
|
2019-08-22 22:44:00 +03:00 |
|
David Cernat
|
ed05125f6a
|
Add OpenMW commits up to 2 Aug 2019
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
|
2019-08-22 15:38:15 +03:00 |
|
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
|
2019-08-22 11:42:02 +03:00 |
|
David Cernat
|
5181c601c0
|
Add OpenMW commits up to 2 May 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
|
2019-08-22 08:40:32 +03:00 |
|
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
|
2019-08-21 23:54:39 +03:00 |
|
David Cernat
|
de16b8118c
|
[CI] Fix execution permission for before_script_linux.sh
|
2019-08-21 20:09:10 +03:00 |
|
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
|
2019-08-21 19:04:04 +03:00 |
|
David Cernat
|
95a5607509
|
Add OpenMW commits up to 22 Feb 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
|
2019-08-21 17:29:24 +03:00 |
|
David Cernat
|
6205ff6b04
|
Add OpenMW commits up to 30 Jan 2019
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
|
2019-08-21 15:48:07 +03:00 |
|
David Cernat
|
d439edce70
|
[CI] Fix oversight in before_script_linux.sh
|
2019-08-21 14:46:13 +03:00 |
|
David Cernat
|
6fdef4fd0a
|
Add OpenMW commits up to 1 Jan 2019
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2019-08-21 14:37:54 +03:00 |
|
David Cernat
|
68886e7539
|
Add OpenMW commits up to 2 Dec 2018
# Conflicts:
# .travis.yml
# README.md
|
2019-08-21 13:08:56 +03:00 |
|
David Cernat
|
1b9842c175
|
[CI] Fix oversights in .travis.yml and before_script_linux.sh
|
2019-08-21 11:23:49 +03:00 |
|
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
|
2019-08-21 09:04:36 +03:00 |
|
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
|
2019-08-21 05:08:50 +03:00 |
|
David Cernat
|
7de1a3d016
|
[CI] Assign execution permissions to Linux .sh files
|
2019-08-20 13:33:08 +03:00 |
|
David Cernat
|
7edfca06cf
|
[CI] Fix issues in before_install.linux.sh
|
2019-08-20 13:15:57 +03:00 |
|
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
|
2019-08-20 13:15:00 +03:00 |
|
David Cernat
|
056591b957
|
Add OpenMW commits up to 14 Sep 2018
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2019-08-20 12:14:57 +03:00 |
|
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
|
2019-08-20 11:31:51 +03:00 |
|
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
|
2019-08-20 10:06:15 +03:00 |
|
David Cernat
|
0339958e21
|
[General] Rename Log class into TimedLog
|
2019-08-19 21:39:33 +03:00 |
|
Alexei Dobrohotov
|
cec9e25902
|
Fix changelog
|
2019-08-18 21:47:45 +03:00 |
|
Andrei Kortunov
|
bd18655d23
|
Merge pull request #2439 from Capostrophic/jumping
Fix jumping mechanics framerate dependency (bug #4991)
|
2019-08-18 10:57:11 +04:00 |
|
Andrei Kortunov
|
b58c632c20
|
Merge pull request #2502 from akortunov/master
Optimize custom bones search visitor
|
2019-08-18 10:36:01 +04:00 |
|
Andrei Kortunov
|
fe71ce9cb2
|
Optimize custom bones search visitor
|
2019-08-18 10:30:21 +04:00 |
|
Andrei Kortunov
|
ed8828d3bc
|
Merge pull request #2457 from Capostrophic/sneak
Sneaking consistency fixes (bug #5103)
|
2019-08-18 08:57:22 +04:00 |
|
Andrei Kortunov
|
661d11c83e
|
Merge pull request #2465 from Capostrophic/duration
Human-readable light source duration (feature #5091)
|
2019-08-18 08:43:51 +04:00 |
|
Andrei Kortunov
|
d0bc06b849
|
Merge pull request #2438 from Capostrophic/camera
Rewrite messed up playerlooking switch handling (bug #5078)
|
2019-08-17 23:15:21 +04:00 |
|
Andrei Kortunov
|
f5d4642529
|
Merge pull request #2501 from Capostrophic/colorcode
Escape number signs in object names for tooltips
|
2019-08-17 23:10:46 +04:00 |
|
capostrophic
|
e5331aab28
|
Escape number signs in object names for tooltips
|
2019-08-17 21:53:52 +03:00 |
|
Alexei Dobrohotov
|
ee5b81470c
|
Merge pull request #2500 from elsid/horker_evade_stuck
Use 3d coordinates to detect stuck (bug #5127)
|
2019-08-17 19:53:50 +03:00 |
|
elsid
|
ad05de44ae
|
Use 3d coordinates to detect stuck
To able water and flying creatures move to player going up or down.
|
2019-08-17 18:09:00 +02:00 |
|
elsid
|
7b94183d83
|
Revert "Take in account actor half extents for obstacle check"
This reverts commit 5434e92437.
|
2019-08-17 17:55:49 +02:00 |
|
Andrei Kortunov
|
f7917964a0
|
Merge pull request #2484 from Capostrophic/fallbackanim
Allow SwimRunForward state WalkForward fallback (bug #5126)
|
2019-08-17 12:45:25 +04:00 |
|
Andrei Kortunov
|
ca724d45a1
|
Merge pull request #2498 from akortunov/master
[Regression] inject bones for NPC's with custom animation models
|
2019-08-17 12:21:34 +04:00 |
|
Andrei Kortunov
|
6156ab45de
|
[Regression] inject bones for NPC's with custom animation models
|
2019-08-17 12:17:13 +04:00 |
|