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
|
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
|
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
|
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
|
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 |
|
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 |
|
David Cernat
|
ab93b5ddc5
|
[General] Use PlayerItemUse packets when using items through quick keys
|
2019-08-16 05:50:07 +03:00 |
|
ArgonianAccount
|
53facf7baa
|
Class quiz fixes
|
2019-08-12 00:54:02 +12:00 |
|
capostrophic
|
26f59e47db
|
Improve readability
|
2019-08-09 19:56:21 +03:00 |
|
capostrophic
|
a9c4b18d38
|
Make sure cast chance checks mana when necessary (bug #5112)
|
2019-08-09 19:27:25 +03:00 |
|
capostrophic
|
6928adcee1
|
Prevent front() and operator[] from causing undefined behavior
|
2019-08-04 14:47:33 +03:00 |
|
capostrophic
|
2affb8ed63
|
Human-readable light source duration (feature #5091)
|
2019-07-31 21:37:20 +03:00 |
|
Alexei Dobrohotov
|
1a2f51ef6f
|
Merge pull request #2415 from Assumeru/unix-console
Unix console hotkeys
|
2019-07-31 21:34:09 +03:00 |
|
Artem Nykolenko
|
d996b565a5
|
Improve character window resizing (bug #4276)
|
2019-07-17 00:44:36 -04:00 |
|
David Cernat
|
57f84914c3
|
[Client] Prevent permanent deletion of player markers on cell changes
|
2019-07-14 22:42:55 +03:00 |
|
Evil Eye
|
cb4664b31b
|
Remove arrow key behaviour as it's in MyGUI now
|
2019-07-03 22:38:07 +02:00 |
|
Evil Eye
|
405c556ce9
|
Merge branch 'master' of https://github.com/OpenMW/openmw into unix-console
|
2019-07-03 21:58:06 +02:00 |
|
David Cernat
|
94a9292cc6
|
[Client] Use correct index when unassigning quickkeys from WindowManager
|
2019-07-01 13:48:45 +03:00 |
|
Andrei Kortunov
|
a62b6910ba
|
Merge pull request #2411 from Capostrophic/fader
Make sure fade operations properly end (bug #4639)
|
2019-06-10 08:58:26 +04:00 |
|
Capostrophic
|
56539fee4f
|
Partially revert "Get rid of redundant setKeyFocusWidget() method"
|
2019-06-09 02:12:44 +03:00 |
|
David Cernat
|
49fa35a516
|
[Client] Use ObjectActivate packets when picking up items from inventory
|
2019-06-09 01:00:01 +03:00 |
|
Evil Eye
|
67fb19c2b9
|
fix deletion when not at end of line and implement ^LEFT and ^RIGHT
|
2019-06-07 18:41:35 +02:00 |
|
Evil Eye
|
4aca8240e5
|
implement ^W and ^U in the console
|
2019-06-06 22:09:54 +02:00 |
|
Capostrophic
|
596dbbe70b
|
Make sure fade operations properly end (bug #4639)
|
2019-06-06 12:25:01 +03:00 |
|
Andrei Kortunov
|
34fe896f4e
|
Merge pull request #2400 from Capostrophic/colorcode
Escape number signs in cell/region names (bug #5047)
|
2019-06-02 08:06:40 +04:00 |
|
Andrei Kortunov
|
1ce370e7fa
|
Make console to do not hide other GUI windows (bug #1515)
|
2019-05-29 17:10:57 +04:00 |
|
Capostrophic
|
9a19af5b33
|
Escape number signs in cell/region names (bug #5047)
|
2019-05-28 23:02:30 +03:00 |
|
Andrei Kortunov
|
fae5843347
|
Setup the ICO settings only once instead of every loading (bug #5025)
|
2019-05-24 08:04:20 +04:00 |
|
Alexei Dobrohotov
|
7c46102f0c
|
Merge pull request #2389 from akortunov/fmt
Introduce a custom format() function
|
2019-05-21 21:45:52 +03:00 |
|
Andrei Kortunov
|
e679190f31
|
Introduce a custom format() function to get rid of boost::format() and hackish replace()
|
2019-05-20 09:20:01 +04:00 |
|
Alexei Dobrohotov
|
0ee73d89f0
|
Correct selling prices of creature merchants
|
2019-05-19 23:43:40 +03:00 |
|
Andrei Kortunov
|
faf940546b
|
Get rid of redundant setKeyFocusWidget() method
|
2019-05-17 19:09:40 +04:00 |
|
Andrei Kortunov
|
675be20a0f
|
Get rid of redundant ControllerRepeatClick class
|
2019-05-17 10:49:00 +04:00 |
|
Andrei Kortunov
|
ac8fa54e6e
|
Get rid of redundant MWScroll class
|
2019-05-17 10:23:34 +04:00 |
|
Capostrophic
|
3f73766304
|
Make enchanting make more sense (bug #5038)
|
2019-05-15 18:40:52 +03:00 |
|
Capostrophic
|
272df29a12
|
Exit waiting at the correct time when the player is in air
|
2019-05-14 20:38:41 +03:00 |
|
Capostrophic
|
485ed903c4
|
Enchanting window stays open after a failed attempt (feature #5034)
|
2019-05-14 17:16:37 +03:00 |
|
Andrei Kortunov
|
a79955352f
|
Revert MR !103 and !105 since they cause issues with dialogue window
|
2019-05-14 14:22:54 +04:00 |
|
Andrei Kortunov
|
27737d4258
|
Fix an exception during reload when container windows is active.
It is a regression in the animated containers feature.
|
2019-05-13 17:59:32 +04:00 |
|