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
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
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
Capostrophic
56539fee4f
Partially revert "Get rid of redundant setKeyFocusWidget() method"
2019-06-09 02:12:44 +03:00
Andrei Kortunov
faf940546b
Get rid of redundant setKeyFocusWidget() method
2019-05-17 19:09:40 +04:00
Capostrophic
272df29a12
Exit waiting at the correct time when the player is in air
2019-05-14 20:38:41 +03:00
Capostrophic
7202f45771
Only allow resting in air when a bed is used
2019-04-04 17:22:24 +03:00
Andrei Kortunov
fcdb0c16bf
Update jail state once instead of for every single hour
2019-02-23 09:17:06 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Sergey Fukanchik
44bcd9b25f
Fix tab characters
2018-09-23 02:46:29 +03:00
Sergey Fukanchik
c50ee22772
Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest().
2018-09-23 01:52:56 +03:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
David Cernat
6ff7fa525e
[Client] Disable autosaving when waiting
2018-07-08 23:04:30 +03:00
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
2018-07-04 01:52:29 +03:00
Capostrophic
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
2018-06-10 18:42:18 +03:00
David Cernat
031a80ed5a
[Client] Don't advance time when waiting, traveling, training or jailed
2018-05-23 05:49:51 +03:00
scrawl
e42bd71081
Add missing WaitDialog::clear() ( Fixes #4196 )
2017-11-08 00:24:04 +00:00
scrawl
3d2ad2d339
Include cleanup
2017-09-27 12:56:09 +00:00
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'.
2017-09-27 12:56:03 +00:00
scrawl
843106fc61
Handle the wait progress bar as part of the GUI mode
2017-09-25 00:47:06 +02:00
scrawl
e7d2a8a4dc
Call clear() for every window
2017-09-24 19:08:15 +02:00
scrawl
32f9c8058a
Remove redundant RestBed gui mode
2017-09-24 19:08:14 +02:00
scrawl
4fff2e2e34
Refactor exitCurrentGuiMode
2017-09-24 19:08:13 +02:00
scrawl
01391b7eed
Rename WindowBase's open/close to onOpen/onClose
2017-09-24 19:08:12 +02:00
Andrei Kortunov
c542ae6875
Create autosave when waiting (bug #1452 )
2017-08-12 09:06:31 +04:00
MiroslavR
80f2ae0ca7
Apply magic effects while waiting/sleeping
2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4
Player's death now interrupts waiting/sleeping
2016-07-06 00:15:25 +02:00
scrawl
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
2015-09-07 22:31:11 +02:00
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
scrawl
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
2015-08-15 16:09:53 +02:00
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
2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
1b41f6c4c5
Sleep interruption fix
2015-05-16 12:29:26 +02:00
scrawl
58a2ad663c
Fix regression of sleep interruption chance
2015-05-11 16:38:16 +02:00
scrawl
8c810e3620
Move rng to components
2015-04-22 17:58:55 +02:00
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.
2015-03-15 14:07:47 +13:00
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
2015-03-08 13:07:29 +13:00
MiroslavR
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
2015-02-07 04:05:28 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
scrawl
5b9d10f851
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
scrawl
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
2015-01-10 03:01:01 +01:00
scrawl
eecea4131f
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
Alexander "Ace" Olofsson
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
2014-12-19 11:26:54 +01:00
scrawl
cfc57d0fe0
Use MyGUI's castType for widget casts
2014-09-13 04:07:40 +02:00
scrawl
c6bcd75058
Add various custom widgets used in OpenMW to the MyGUI plugin
2014-09-12 05:14:21 +02:00
scrawl
5335f00958
Don't show Until Healed button when only fatigue is not full ( Fixes #1798 )
2014-08-11 20:40:02 +02:00
scrawl
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
2014-08-01 16:25:41 +02:00
