James Stephens
|
b33429001c
|
Fixes the offset question mark in the alchemy tooltip when the effect is not known
|
2019-09-02 17:13:56 +00:00 |
|
Andrei Kortunov
|
626e943c43
|
Merge branch 'FocusLostESCSaveConfirmationDialog' into 'master'
Fixes bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog
See merge request OpenMW/openmw!145
|
2019-09-02 17:11:24 +00:00 |
|
James Stephens
|
1cd1bfca74
|
Fixes bug #4650
|
2019-09-02 16:49:29 +02:00 |
|
David Cernat
|
95967ea289
|
[General] Rename unused ObjectReset packet into ObjectHit
|
2019-09-01 08:30:03 +03:00 |
|
Capostrophic
|
cf0c71c651
|
Water shader cleanup
|
2019-08-30 22:32:48 +03:00 |
|
Alexei Dobrohotov
|
a8f5fe3eff
|
Merge pull request #2508 from akortunov/counter
Handle death event manually if needed before disposing a corpse
|
2019-08-28 13:51:38 +03:00 |
|
David Cernat
|
6dccdfe0c1
|
[Client] Load up TES3MP's settings in the same map as OpenMW's settings
This allows the "font size" property to be read when the chat window is created.
|
2019-08-28 06:37:33 +03:00 |
|
David Cernat
|
9b1fbcc6f9
|
[General] Use correct packet ID in PacketActorCast
|
2019-08-28 06:35:19 +03:00 |
|
Roman Siromakha
|
3b47e9039c
|
Merge pull request #2509 from OpenMW/revert-2494-ai_open_door
Revert "[WIP] Open door when it is on the way to a next path point (bug #5073)"
|
2019-08-27 20:55:33 +02:00 |
|
Roman Siromakha
|
41ad23ebdc
|
Revert "[WIP] Open door when it is on the way to a next path point (bug #5073)"
|
2019-08-27 20:55:03 +02:00 |
|
Roman Siromakha
|
ea04fcbd09
|
Merge pull request #2494 from elsid/ai_open_door
[WIP] Open door when it is on the way to a next path point (fix bug #5073)
|
2019-08-27 20:54:58 +02:00 |
|
elsid
|
b4ec444057
|
Open door when it is on the way to a next path point
|
2019-08-27 20:49:35 +02:00 |
|
elsid
|
97cd9d434a
|
Do not open doors when actor has no path
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
|
2019-08-27 20:49:35 +02:00 |
|
elsid
|
389f5dfb9b
|
Check for AiPackage type before find nearby door
|
2019-08-27 20:49:35 +02:00 |
|
elsid
|
cb0a609d59
|
Merge branch 'master' into HEAD
|
2019-08-27 20:49:12 +02:00 |
|
elsid
|
69b4fe8545
|
Revert "Open door when it is on the way to a next path point"
This reverts commit c32872fb16.
|
2019-08-27 20:49:07 +02:00 |
|
Andrei Kortunov
|
b6044d231a
|
Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146)
|
2019-08-27 22:42:41 +04:00 |
|
David Cernat
|
3a1e3cf0f5
|
[Client] Prevent chat key from switching to chat window while in console
|
2019-08-27 15:23:12 +03:00 |
|
David Cernat
|
a9f1481e5c
|
[Client] Revert changes to key focus setting as per 56539fee4f
|
2019-08-27 15:22:11 +03:00 |
|
David Cernat
|
63f55ce762
|
[GUI] Fix chat window layout after 1ce370e7fa made it stop working
|
2019-08-27 10:53:26 +03:00 |
|
David Cernat
|
a52d32602d
|
[Client] Fix code style in PlayerList
|
2019-08-27 09:29:43 +03:00 |
|
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 |
|