David Cernat
|
6cb5ac6e63
|
Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
|
6 years ago |
Andrei Kortunov
|
c77c50e92b
|
Make Equip console command to bypass most of restrictions (bug #4460)
|
6 years ago |
David Cernat
|
78234f9071
|
[General] Rename Event into ObjectList & WorldObject into BaseObject
|
6 years ago |
David Cernat
|
17678ee60f
|
Merge pull request #407 from OpenMW/master
Add OpenMW commits up to 17 Apr 2018
|
6 years ago |
Andrei Kortunov
|
174b3d2249
|
Reset an inventory filter after reload or a new game start (bug #4392)
|
6 years ago |
David Cernat
|
9e10eb9c84
|
Merge pull request #389 from OpenMW/master
Add OpenMW commits up to 24 Feb 2018
|
6 years ago |
Capostrophic
|
089666dd68
|
Round up displayed encumbrance
|
6 years ago |
David Cernat
|
f2a6957e16
|
Merge pull request #331 from OpenMW/master while resolving conflicts
|
7 years ago |
scrawl
|
e6303c578c
|
Merge pull request #1530 from rexelion/curseitemfix
Trigger OnActivate when item is picked up through the inventory (Issue #3726)
|
7 years ago |
rexelion
|
8c2cc0f42f
|
break invisibility first
|
7 years ago |
rexelion
|
bcbfa5fe1e
|
prevent activation, leave the rest to the script
|
7 years ago |
rexelion
|
a9e5e19482
|
OnActivate is triggered when the item is picked up
|
7 years ago |
David Cernat
|
a31d43965f
|
Merge pull request #328 from OpenMW/master
Add OpenMW commits up to 31 Oct 2017
|
7 years ago |
rexelion
|
e8743f3f79
|
check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords
|
7 years ago |
Miloslav Číž
|
3c65bdaf14
|
weapon cycle fix
|
7 years ago |
rexelion
|
4e6f53d6f1
|
item added to the player and OnActivate is triggered when the inventory is closed
|
7 years ago |
David Cernat
|
360cf2ead7
|
Merge pull request #321 from OpenMW/master
Add OpenMW commits up to 22 Oct 2017
|
7 years ago |
lukago
|
b6cb3b445c
|
use getIndex to handle other windows, nullsafe fixes
|
7 years ago |
lukago
|
a3225364ff
|
refactor, use dragItem method
|
7 years ago |
lukago
|
43f94a8890
|
simplify drag and drop on avatar for potions and ingredients
|
7 years ago |
David Cernat
|
38247ff086
|
Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
|
7 years ago |
scrawl
|
2b03bc0c56
|
Call WindowBase::onFrame() for every active window
|
7 years ago |
scrawl
|
01391b7eed
|
Rename WindowBase's open/close to onOpen/onClose
|
7 years ago |
David Cernat
|
4d4eb1bb9f
|
Merge pull request #292 from OpenMW/master
Add OpenMW commits up to 18 Sep 2017
|
7 years ago |
Andrei Kortunov
|
10a0136b4a
|
Cycle only through weapons which can be equipped by player (bug #4104)
|
7 years ago |
David Cernat
|
b64f379949
|
Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
|
7 years ago |
David Cernat
|
4468e6ec4a
|
Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
7 years ago |
Andrei Kortunov
|
91dcd5bc6e
|
Do not allow to unequip weapon from inventory during attack
|
7 years ago |
Andrei Kortunov
|
fb45995a41
|
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445)
|
7 years ago |
David Cernat
|
721b218cc2
|
Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
|
7 years ago |
Andrei Kortunov
|
487e72fd23
|
Play Up sounds instead of Down ones in trade window (bug #3982)
|
7 years ago |
David Cernat
|
e3929df38a
|
Merge pull request #239 from OpenMW/master
Add OpenMW commits up to 14 Jul 2017
|
7 years ago |
Andrei Kortunov
|
54b4d93f79
|
Added a special function for GUI sounds playing
|
7 years ago |
David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
7 years ago |
Bret Curtis
|
d785344fad
|
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
|
7 years ago |
David Cernat
|
dcc61a095a
|
[Client] Allow multiple WorldObjects to be added to a WorldEvent
|
7 years ago |
David Cernat
|
a82646a130
|
[Client] Delineate tes3mp-only code more clearly, part 2
|
7 years ago |
David Cernat
|
a5484d237b
|
Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
|
7 years ago |
David Cernat
|
edb155869b
|
Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
|
7 years ago |
Andrei Kortunov
|
f0f1df3a96
|
Properly clear inventory
|
7 years ago |
scrawl
|
30081393a6
|
Add InventoryWindow::clear() as part of world cleanup
|
7 years ago |
Andrei Kortunov
|
95ce7637f3
|
Adds persisted pin (feature #2834, bug #2489)
|
7 years ago |
David Cernat
|
9759764699
|
[Client] Clean up getting and resetting of WorldEvent
|
7 years ago |
David Cernat
|
4abe295a80
|
[Client] Simplify sending of world packets by adding WorldEvent methods
|
7 years ago |
David Cernat
|
2bd81c3de0
|
[Client] Use mpNum for every WorldObject
|
7 years ago |
Koncord
|
690211ad99
|
[General] Extract BaseEvent & BasePlayer from packets to functions
Move Send and Read functions to BasePacket
|
7 years ago |
David Cernat
|
a58601fb2b
|
[Client] Delineate tes3mp-only code more clearly, part 1
|
7 years ago |
David Cernat
|
ed2176c984
|
[Client] Reuse 1 BaseEvent over and over instead of creating new ones
|
7 years ago |
David Cernat
|
e703dd42aa
|
[Client] Rename LocalEvent into WorldEvent
|
7 years ago |
David Cernat
|
25d79dbcfe
|
[Client] Revert c0d67f67fb after discovering its negative consequences
|
7 years ago |