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 |
|
David Cernat
|
ab93b5ddc5
|
[General] Use PlayerItemUse packets when using items through quick keys
|
2019-08-16 05:50:07 +03:00 |
|
David Cernat
|
ae5200cbb2
|
[General] Implement light records for RecordDynamic packets
|
2019-08-14 21:10:53 +03:00 |
|
David Cernat
|
6160293e86
|
[Client] Don't clear placeholder summons in CastSpell::inflict()
|
2019-08-12 15:12:34 +03:00 |
|
David Cernat
|
1d09763bad
|
[Client] Allow blanking out the enchantment IDs of records using a base
|
2019-08-08 08:05:10 +03:00 |
|
David Cernat
|
14af0be657
|
[General] Include AI alarm & flee for creatures/NPCs in RecordDynamic
|
2019-08-07 11:21:22 +03:00 |
|
David Cernat
|
ef432d1419
|
[General] Include AI services for creatures/NPCs in RecordDynamic
|
2019-08-07 10:44:07 +03:00 |
|
David Cernat
|
18e2a14645
|
[General] Implement tool-related records for RecordDynamic packets
|
2019-08-04 17:53:18 +03:00 |
|
David Cernat
|
4100d93dea
|
[General] Implement ingredient records for RecordDynamic packets
|
2019-08-03 06:19:22 +03:00 |
|
Alexei Dobrohotov
|
56c9c72bc7
|
Merge pull request #2459 from Capostrophic/fight
Don't clamp semi-final actor fight rating to 0 (bug #5105)
|
2019-08-02 18:12:30 +03:00 |
|
capostrophic
|
ff133bd740
|
Don't clamp final actor fight rating to 0 (bug #5105)
Fix werewolf aggro distance
|
2019-08-02 18:11:48 +03:00 |
|
Alexei Dobrohotov
|
3d5d5d8b44
|
Merge pull request #2454 from Capostrophic/modregion
Ignore an extra number argument in ModRegion (bug #5110)
|
2019-08-02 18:07:29 +03:00 |
|
David Cernat
|
300cef0073
|
[Server] Allow setting of container record flags in SetRecordFlags()
|
2019-08-01 21:28:03 +03:00 |
|
capostrophic
|
168e5050bb
|
Ignore an extra number argument in ModRegion (bug #5110)
|
2019-08-01 20:48:58 +03:00 |
|
Alexei Dobrohotov
|
3f2b63122d
|
Merge pull request #2467 from Capostrophic/stream
[Regression] Editor: Avoid locale-related settings parsing issues
|
2019-08-01 20:39:06 +03:00 |
|
Alexei Dobrohotov
|
3a0f893f53
|
Merge pull request #2468 from elsid/aitravel_fastforward_fix
Reset path after AiTravel is fast forwarded (bug #5037)
|
2019-08-01 16:33:25 +03:00 |
|
elsid
|
4ad04a28f9
|
Reset path after AiTravel is fast forwarded
Otherwise actor will keep going to the first path point that may be
unreachable.
|
2019-08-01 15:13:03 +02:00 |
|
David Cernat
|
0189d19d14
|
[Server] Clear new types of records in ClearRecords()
|
2019-08-01 15:47:13 +03:00 |
|
Alexei Dobrohotov
|
1fdc5151ca
|
Merge branch '5055fix' into 'master'
Fix Non-swimming enemies entering water if player is water walking (bug #5099)
See merge request OpenMW/openmw!136
|
2019-08-01 10:02:36 +00:00 |
|
Artem Nykolenko
|
610e87cb24
|
Fix Non-swimming enemies entering water if player is water walking (bug #5099)
|
2019-08-01 10:02:35 +00:00 |
|
Andrei Kortunov
|
264a769827
|
Merge pull request #2466 from Capostrophic/doll
[Regression] Avoid confusing inventory doll with player in non-uniform scaling
|
2019-08-01 13:10:40 +04:00 |
|
capostrophic
|
5341ca4e22
|
[Regression] Avoid locale-related conversion issues in editor
|
2019-08-01 11:47:31 +03:00 |
|
David Cernat
|
247d2fad30
|
[General] Implement activator & static records for RecordDynamic packets
|
2019-08-01 09:48:57 +03:00 |
|
Alexei Dobrohotov
|
1a2f51ef6f
|
Merge pull request #2415 from Assumeru/unix-console
Unix console hotkeys
|
2019-07-31 21:34:09 +03:00 |
|
capostrophic
|
dcbe76d888
|
[Regression] Avoid confusing inventory doll with player
|
2019-07-31 17:34:32 +03:00 |
|
Alexei Dobrohotov
|
cad4ba0423
|
Merge branch 'unity_fix' into 'master'
Fix build with `OPENMW_UNITY_BUILD` enabled
See merge request OpenMW/openmw!132
|
2019-07-28 18:46:27 +00:00 |
|
Grigory
|
28e54c25ee
|
Add -DMYGUI_DONT_REPLACE_NULLPTR
|
2019-07-28 21:04:37 +03:00 |
|
AnyOldName3
|
d460e407ab
|
Merge branch 'framelimit' into 'master'
Default framelimit
See merge request OpenMW/openmw!54
|
2019-07-27 12:54:36 +00:00 |
|
wang ryu
|
d4ec446141
|
default framelimit
|
2019-07-27 13:37:00 +00:00 |
|
David Cernat
|
e9336e53fc
|
[General] Implement container and door records for RecordDynamic packets
|
2019-07-27 03:45:50 +03:00 |
|