80f2ae0ca7
Apply magic effects while waiting/sleeping
9 years ago
41484432b4
Player's death now interrupts waiting/sleeping
9 years ago
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
9 years ago
77a1d947cc
extracted MWMechanics::getPlayer()
10 years ago
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
10 years ago
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
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
1b41f6c4c5
Sleep interruption fix
10 years ago
58a2ad663c
Fix regression of sleep interruption chance
10 years ago
8c810e3620
Move rng to components
10 years ago
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
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
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
10 years ago
0c6e2170db
Include cleanup
10 years ago
5b9d10f851
Reduce includes in MWGui
10 years ago
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
10 years ago
eecea4131f
Reduce MyGUI includes
10 years ago
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
10 years ago
cfc57d0fe0
Use MyGUI's castType for widget casts
10 years ago
c6bcd75058
Add various custom widgets used in OpenMW to the MyGUI plugin
10 years ago
5335f00958
Don't show Until Healed button when only fatigue is not full ( Fixes #1798 )
11 years ago
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago
a5cfa8a049
Removes add behavior when pressing escape while waiting.
11 years ago
e3e51324a4
Esc button exits all non-modal GUI windows
11 years ago
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
11 years ago
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
c6c254d279
Do not trigger levelup if rest was interrupted
11 years ago
18bba6bcec
Fix layout glitch when autosaving
11 years ago
5b681e2199
Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.
11 years ago
05b21c92af
Moved quick save into statemanager class. Kept loader as is as it's rather specalized.
11 years ago
6a8bf71c4c
Moved autosave to before you rest, not after it.
11 years ago
a598060071
Added autosave on rest, as well as an option in the settings menu
11 years ago
367919200f
moved CellRefList into a separate file
11 years ago
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
11 years ago
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
11 years ago
82146e7f8d
Use GMSTs for levelup
11 years ago
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
11 years ago
a432661b8a
Minor correction
11 years ago
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
11 years ago
95651857f3
Fix code duplication
11 years ago
0d0005c433
Fix fatigue not restoring when waiting
11 years ago
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
11 years ago
2bb21f2f76
Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.
11 years ago
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
11 years ago
623cdef69f
Code cleanup
11 years ago
99ea63dc4a
factored out code for generating month names
11 years ago
46bc7bd9c8
Some cleanup since NpcStats is now also CreatureStats
...
This isn't a thorough cleaning, so keep an eye out for more
12 years ago
6110a0ee3b
Don't allow resting as a werewolf
12 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
da01ec4f52
Only show the "Rest until healed" button when stats are not full
12 years ago
MiroslavR
scrawl
dteviot
Rohit Nirmal
dteviot
Alexander "Ace" Olofsson
Digmaster
Digmaster
Emanuel Guevel
Marc Zinnschlag
Chris Robinson