Commit Graph

99 Commits (0.7.1-build-fixes)

Author SHA1 Message Date
David Cernat ed05125f6a Add OpenMW commits up to 2 Aug 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
5 years ago
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
5 years ago
David Cernat 5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
Capostrophic 56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 6 years ago
Andrei Kortunov faf940546b Get rid of redundant setKeyFocusWidget() method 6 years ago
Capostrophic 272df29a12 Exit waiting at the correct time when the player is in air 6 years ago
Capostrophic 7202f45771 Only allow resting in air when a bed is used 6 years ago
Andrei Kortunov fcdb0c16bf Update jail state once instead of for every single hour 6 years ago
Andrei Kortunov e06f0b797a Replace all NULLs to nullptr 6 years ago
Sergey Fukanchik 44bcd9b25f Fix tab characters 6 years ago
Sergey Fukanchik c50ee22772 Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest(). 6 years ago
Capostrophic 7ef6fa9f61 Remove deprecated GMST get* functions 6 years ago
David Cernat 6ff7fa525e [Client] Disable autosaving when waiting 7 years ago
David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
7 years ago
Capostrophic d43766d3c9 Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629) 7 years ago
David Cernat 031a80ed5a [Client] Don't advance time when waiting, traveling, training or jailed 7 years ago
scrawl e42bd71081 Add missing WaitDialog::clear() (Fixes #4196) 7 years ago
scrawl 3d2ad2d339 Include cleanup 7 years ago
scrawl 05814c0929 Add key focus handling for WaitDialog
Default is 'until healed'. Up/Down arrows change the hour slider and implicitely change the button to 'Wait'.
7 years ago
scrawl 843106fc61 Handle the wait progress bar as part of the GUI mode 7 years ago
scrawl e7d2a8a4dc Call clear() for every window 7 years ago
scrawl 32f9c8058a Remove redundant RestBed gui mode 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 01391b7eed Rename WindowBase's open/close to onOpen/onClose 7 years ago
Andrei Kortunov c542ae6875 Create autosave when waiting (bug #1452) 7 years ago
MiroslavR 80f2ae0ca7 Apply magic effects while waiting/sleeping 9 years ago
MiroslavR 41484432b4 Player's death now interrupts waiting/sleeping 9 years ago
scrawl 0442bc98f3 Update sleep interruption formula according to wiki, thanks Hrnchamd 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
scrawl c57e72fe03 Adjust the sleep interruption chance (Fixes #2781) 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 1b41f6c4c5 Sleep interruption fix 10 years ago
scrawl 58a2ad663c Fix regression of sleep interruption chance 10 years ago
scrawl 8c810e3620 Move rng to components 10 years ago
dteviot 3f28634d1f consolidate random number logic
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
MiroslavR 1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl 5b9d10f851 Reduce includes in MWGui 10 years ago
scrawl 728b842e72 Use MyGUI::utility in favor of boost lexical_cast 10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 years ago
Alexander "Ace" Olofsson 462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 10 years ago
scrawl cfc57d0fe0 Use MyGUI's castType for widget casts 10 years ago
scrawl c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 10 years ago
scrawl 5335f00958 Don't show Until Healed button when only fatigue is not full (Fixes #1798) 11 years ago
scrawl a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 11 years ago