Commit Graph

230 Commits (master)

Author SHA1 Message Date
Chris Robinson 816015d6e6 Avoid inheriting from Sound for sound types 9 years ago
scrawl c9bfe01120 Fix applying of weather changes after serving a jail sentence 9 years ago
scrawl d97dda05c9 Don't attempt to play unset weather sounds 9 years ago
Chris Robinson aac903484c Remove a really unnecessary method 9 years ago
scrawl 5f143dee2d Fix lighting incontinuity at nightfall and sunrise 9 years ago
scrawl 71d9e7dc52 Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file 9 years ago
scrawl 802620a86b Use TimeOfDayInterpolator for Land Fog Depth
Fixes the sudden fog jump at nightfall.
9 years ago
scrawl 45bf3e6788 Create TimeOfDayInterpolator class to refactor time handling in WeatherManager 9 years ago
scrawl 8da4530957 Use INI-imported underwater fog settings (Fixes #2907, Fixes #1511) 9 years ago
Alexander "Ace" Olofsson 7d4125d97f Fixes for building with unity build 9 years ago
scrawl 385f4f729c Implement SunDiscSunsetColor, fade the sun during sunrise & sunset 9 years ago
scrawl a2a4532e71 Add the full-screen sun glare effect 9 years ago
scrawl 8de3ce90a7 Add comments for weather IDs 9 years ago
slothlife 29d74f0249 Improve thunderstorm support.
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
9 years ago
slothlife 2b48a20b76 Fix weather transition bugs 9 years ago
slothlife d9a7986b3a Remove redundant fast forward check 9 years ago
slothlife 4fd00a75d5 Merge advanceTime and advanceTimeByFrame 9 years ago
slothlife cd8ec5c11e Improve checking for older weather records 9 years ago
slothlife 7817c52cbb Discard old save game weather records 9 years ago
slothlife c907ed517d Remove C++11 explicit on conversion operator 9 years ago
slothlife 54fa5273dc Refactor weather transitions to act more like MW
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
slothlife 3d419a612a Corrected some weather transition calculations
Reversed some formulas for Transition Delta and Clouds Maximum Percent
and implemented them. Refactored Weather some to encapsulate those
formulas (to more closely match MoonModel). Did some small cleanup of
WeatherManager.
10 years ago
scrawl 56b7196bea Remove incorrect implementation of "Clouds Maximum Percent" weather setting 10 years ago
slothlife 3235cecddf Use Glare View for visibility of celestial bodies
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
10 years ago
slothlife ea2f88a355 Fix several sky rendering bugs, maybe also #639
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
10 years ago
slothlife 67a63cc662 Add some const correctness to MoonModel 10 years ago
slothlife 24ba54f4fe Implement accurate moon settings (fixes #672) 10 years ago
Marc Zinnschlag ba9a9d16bb Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl f12619b86a Implement fStromWindSpeed (Fixes #2764) 10 years ago
Alexander "Ace" Olofsson b3b55a5842 Explicitly instantiate MWWorld::Store 10 years ago
scrawl 38d90f47a6 Moon fading fix (Bug #2713) 10 years ago
scrawl ccd95419e5 Restore various raycasting 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 627fee07bc Minor cleanup 10 years ago
scrawl 47758c11cd Readded collision objects and movement physics 10 years ago
scrawl 8c810e3620 Move rng to components 10 years ago
scrawl 13a1ba0aab Moon rendering 10 years ago
scrawl 5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 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
Alexander "Ace" Olofsson 1a19253158 Fix MSVC build due to missing M_PI define
Apparently the header guard on cmath only adds the defines if _USE_MATH_DEFINES is defined when cmath is included for the first time.

So enabling that define and moving cmath up to be the first include, so that nothing else includes it without the define set.
10 years ago
Jordan Ayers ec3487b669 Sun trajectory: handle mNightStart <= mSunriseTime
OMW Bug #781
Note:  mNightStart == mSunriseTime is treated as 24-hour night.
10 years ago
Jordan Ayers 23024d2beb Re-work the sun's trajectory.
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
10 years ago
Jordan Ayers 2d17eaa5ea Fix argument name for setSunDirection. 10 years ago
scrawl 72f7c2e555 Move weather reset to clear() method 10 years ago
scrawl c883a73d30 Several warning fixes 10 years ago
scrawl c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 10 years ago
scrawl fadbb5ad21 Add particle and sound fading for weather transitions (Fixes #2130) 10 years ago
Internecine 470d375177 Removed duplicate functions and moved pause check in weather.cpp 10 years ago
Internecine 782e851eb1 Better fix, now allows for teleporting to change weather while still paused. 10 years ago
scrawl e9ed0211c9 Attempt to fix Clang warnings 10 years ago
scrawl 002b41ba51 Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5) 10 years ago
MiroslavR baa14511cf Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision 11 years ago
scrawl 07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 11 years ago
scrawl 7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/sky.hpp
11 years ago
scrawl f6a568c995 Implement rain (Feature #41) 11 years ago
Marc Zinnschlag 85965bfd47 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 693a097b21 Implement idlestorm animation (Feature #41) 11 years ago
scrawl 36132e054a Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41) 11 years ago
Fil Krynicki cfea7736d9 WIP fix
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
11 years ago
scrawl 92467ba6bc Fix sunlight for interiors 11 years ago
scrawl 27a05027f4 Fixes #1172: Added basic loading/saving progress bar
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
11 years ago
slothlife 6eab9c5179 Move weather state save/load to a new class 11 years ago
slothlife 1acd1bd913 Feature #1173: Saved Game: include weather state
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
11 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
Marc Zinnschlag 7693f712bc started making CellStore into a proper class; encapsulated mCell member 11 years ago
scrawl d0500e8124 Some unneeded includes cleanup 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
Marc Zinnschlag 1f4c192bf6 Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 11 years ago
Lukasz Gromanowski 722469d57b Correction to the e9844e1 commit.
Restored interrior check in WeatherManager::update().

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag 5fa9aa5d1e Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
Lukasz Gromanowski e9844e1b37 Fixes #417: Apply weather instantly when teleporting
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 79a440e94a Many additions to 900bc06d2c236b:
- Fix indentation
 - Consider any kind of light, not just torch_infinite_time
 - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
 - Remove redundant code and don't add additional lights to the inventory
 - World::isDark returns false for interiors which are unaffected by weather
11 years ago
Lukasz Gromanowski faf8011c48 Fixes #417: Apply weather instantly when teleporting
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Lukasz Gromanowski 100edda8c0 Fixes #417: Apply weather instantly when teleporting
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Lukasz Gromanowski 91a4d9a2eb Fixes #845: NPCs hold torches during the day
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Lukasz Gromanowski bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl c8e31725dc Fix weather sounds persisting on a new game 12 years ago
scrawl 6164e5bae6 Restored window resizing 12 years ago
Chris Robinson c94653dc49 Implement the ModRegion script function 12 years ago
Chris Robinson 14e0c182f3 Allow specifying the sound type to playSound and playSound3D 12 years ago
Marc Zinnschlag cd538538b5 fixed weather code 12 years ago
Marc Zinnschlag 8b909ff838 killed a stray srand 12 years ago
Miroslav Puda 8da3494d74 Revert "Type of weather changed from string to enum."
This reverts commit 04d90b4c47.

Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/weather.hpp
12 years ago
Miroslav Puda 26a6bdb27d Correction of sigsegv. 12 years ago
Miroslav Puda f9940413fd Static for nextWeather() 12 years ago
Miroslav Puda bf31e5385c Removal of duplicit exterior checking and unneded string copiing. 12 years ago
Miroslav Puda 8a45686e0a WeatherResult added as member variable. 12 years ago
Miroslav Puda f01aa8f55e Simpler statistical calculation of next weather; minus before parens. 12 years ago
Miroslav Puda 04d90b4c47 Type of weather changed from string to enum. 12 years ago
Glorf 9fa2dd5277 Playing with moons part 2 12 years ago
Glorf 6aaa8d6dc0 Fixed fading problem 12 years ago
Glorf 9cc85cbe81 Playing with moons part 1 12 years ago
Glorf 6417fa504e Fixed constness 12 years ago
Glorf c605f15a15 Another weather cleanup 12 years ago
Glorf 68f249e8f4 Small weather cleanup 12 years ago
scrawl 67422c397c GetWindSpeed 12 years ago