Commit Graph

48 Commits (master)

Author SHA1 Message Date
David Cernat 7f435ceeac Add OpenMW commits up to 1 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
4 years ago
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
David Cernat 5b4db83d61 [Client] Once again allow beds to be used even if waiting is disallowed
This had been broken by rest-related commits in OpenMW.
5 years ago
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
5 years ago
Andrei Kortunov 3032b177a1 Remove redundant includes 6 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 7 years ago
David Cernat 3508a16836 [General] Use GameSettings packet to set ability to rest and wait 7 years ago
scrawl 32f9c8058a Remove redundant RestBed gui mode 7 years ago
scrawl ad4b91131f toggleGui renamed to toggleHud, remove unused variable 7 years ago
scrawl 07b064f616 Rename to lowerCaseInPlace 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
Alexander "Ace" Olofsson fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
10 years ago
scrawl a619cff615 Implement EnableLevelupMenu to trigger level-up 10 years ago
scrawl 8103d25b09 Make ToggleMenus close open windows (Fixes #2045) 10 years ago
scrawl 9a26cf22e6 Implement toggleMenus 11 years ago
scrawl 3788fb042e Implement MenuTest script instruction (Fixes #1454) 11 years ago
scrawl 028e00c98f Add missing status report for some toggle commands 11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
scrawl d0500e8124 Some unneeded includes cleanup 11 years ago
scrawl 768d9f7237 Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception) 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 7b33f6f2ac Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this. 11 years ago
vorenon 3bf3bd4b8c Silenced some warnings 12 years ago
Alex de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
scrawl f0f521a4e0 enableRestMenu -> enableRest 12 years ago
greye 11567663a7 applying new interface vol.4, inconsistent 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
greye 18cc435aa1 resolving conflicts 12 years ago
scrawl 98c1dc1151 ShowMap & FillMap commands, merged next 12 years ago
scrawl bf5e30b24f everything done except health/mana restore 12 years ago
scrawl 896428c129 enableRestMenu & enableLevelupMenu 12 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag e2a77037eb fixed a type in a script instruction 13 years ago
scrawl 7ebbc099b3 allow stacking gui modes 13 years ago
scrawl 1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
13 years ago
Marc Zinnschlag 35f478071e Issue #255: deleted the old environment class and using the new one instead 13 years ago
scrawl f5ab127a39 toggleFullHelp 13 years ago
scrawl 8d224f009f toggleFogOfWar script command 13 years ago
Marc Zinnschlag aded4608c0 added GetButtonPressed function 14 years ago
Jan Borsodi 1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager.
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
15 years ago
Nicolay Korslund c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 15 years ago
Nicolay Korslund c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 15 years ago
Nicolay Korslund 4d74f85ae0 Moved mwgui manager to components, ready for testing 15 years ago
Marc Zinnschlag 0efe4742a6 added script-gui interface and gui-related script instructions 15 years ago