mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:19:55 +00:00
Code Issues Releases Wiki Activity
24503 commits 38 branches 54 tags 122 MiB
Commit graph

213 commits

Author SHA1 Message Date
slothlife
cd8ec5c11e Improve checking for older weather records 2015-08-27 13:44:06 -05:00
slothlife
7817c52cbb Discard old save game weather records 2015-08-27 09:57:32 -05:00
slothlife
c907ed517d Remove C++11 explicit on conversion operator 2015-08-26 23:34:15 -05:00
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
 2015-08-26 22:59:21 -05:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
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.
 2015-08-15 23:38:49 -05:00
scrawl
56b7196bea Remove incorrect implementation of "Clouds Maximum Percent" weather setting 2015-08-07 15:34:01 +02:00
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.
 2015-08-07 00:08:18 -05:00
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.
 2015-08-04 21:07:42 -05:00
slothlife
67a63cc662 Add some const correctness to MoonModel 2015-07-30 14:00:08 -05:00
slothlife
24ba54f4fe Implement accurate moon settings (fixes #672) 2015-07-29 23:57:45 -05:00
Marc Zinnschlag
ba9a9d16bb Merge remote-tracking branch 'scrawl/master' 2015-07-10 09:06:04 +02:00
scrawl
f12619b86a Implement fStromWindSpeed (Fixes #2764) 2015-07-10 02:34:00 +02:00
Alexander "Ace" Olofsson
b3b55a5842 Explicitly instantiate MWWorld::Store 2015-07-09 19:22:04 +02:00
scrawl
38d90f47a6 Moon fading fix (Bug #2713) 2015-06-19 18:15:23 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +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
627fee07bc Minor cleanup 2015-05-22 04:36:33 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
13a1ba0aab Moon rendering 2015-04-15 18:50:50 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +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
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.
 2015-02-10 15:32:54 +01:00
Jordan Ayers
ec3487b669 Sun trajectory: handle mNightStart <= mSunriseTime 
OMW Bug #781
Note:  mNightStart == mSunriseTime is treated as 24-hour night.
 2015-02-08 14:31:45 -06:00
Jordan Ayers
23024d2beb Re-work the sun's trajectory. 
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
 2015-02-07 12:36:27 -06:00
Jordan Ayers
2d17eaa5ea Fix argument name for setSunDirection. 2015-02-06 22:26:58 -06:00
scrawl
72f7c2e555 Move weather reset to clear() method 2015-01-24 16:45:36 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
fadbb5ad21 Add particle and sound fading for weather transitions (Fixes #2130) 2014-12-01 23:09:47 +01:00
Internecine
470d375177 Removed duplicate functions and moved pause check in weather.cpp 2014-10-10 23:29:51 +13:00
Internecine
782e851eb1 Better fix, now allows for teleporting to change weather while still paused. 2014-10-09 19:41:51 +13:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
002b41ba51 Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5) 2014-09-14 08:38:54 +02:00
MiroslavR
baa14511cf Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision 2014-08-12 12:18:38 +02:00
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwrender/sky.hpp
 2014-06-26 04:29:03 +02:00
scrawl
f6a568c995 Implement rain (Feature #41) 2014-06-25 18:20:21 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
693a097b21 Implement idlestorm animation (Feature #41) 2014-06-24 18:37:38 +02:00
scrawl
36132e054a Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41) 2014-06-24 15:00:15 +02:00
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
 2014-06-16 17:08:02 -04:00
scrawl
92467ba6bc Fix sunlight for interiors 2014-05-02 21:20:27 +02:00
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.
 2014-04-28 11:29:57 +02:00
slothlife
6eab9c5179 Move weather state save/load to a new class 2014-03-21 01:19:40 -05:00
slothlife
1acd1bd913 Feature #1173: Saved Game: include weather state 
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
 2014-03-20 01:25:52 -05:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
scrawl
d0500e8124 Some unneeded includes cleanup 2014-01-15 14:53:28 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
Marc Zinnschlag
1f4c192bf6 Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 2014-01-01 19:47:11 +01:00
Lukasz Gromanowski
722469d57b Correction to the e9844e1 commit. 
Restored interrior check in WeatherManager::update().

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-01-01 16:45:39 +01:00
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
 2014-01-01 14:57:14 +01:00
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>
 2013-12-31 20:40:23 +01:00
scrawl
79a440e94a Many additions to 900bc06d2c: 
- 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
 2013-12-30 17:57:41 +01:00
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>
 2013-12-29 12:47:44 +01:00
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>
 2013-12-28 16:15:34 +01:00
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>
 2013-12-10 23:48:49 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
scrawl
c8e31725dc Fix weather sounds persisting on a new game 2013-08-29 15:16:08 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Chris Robinson
c94653dc49 Implement the ModRegion script function 2013-07-27 07:10:18 -07:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
Marc Zinnschlag
cd538538b5 fixed weather code 2013-06-28 09:00:21 +02:00
Marc Zinnschlag
8b909ff838 killed a stray srand 2013-06-21 08:58:52 +02:00
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
 2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d Correction of sigsegv. 2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd Static for nextWeather() 2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c Removal of duplicit exterior checking and unneded string copiing. 2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a WeatherResult added as member variable. 2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e Simpler statistical calculation of next weather; minus before parens. 2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47 Type of weather changed from string to enum. 2013-06-19 03:24:30 +02:00
Glorf
9fa2dd5277 Playing with moons part 2 2013-05-14 19:58:08 +02:00
Glorf
6aaa8d6dc0 Fixed fading problem 2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81 Playing with moons part 1 2013-05-10 18:55:56 +02:00
Glorf
6417fa504e Fixed constness 2013-05-09 13:56:13 +02:00
Glorf
c605f15a15 Another weather cleanup 2013-05-09 00:36:58 +02:00
Glorf
68f249e8f4 Small weather cleanup 2013-05-07 10:27:37 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
Marc Zinnschlag
738a54337d removed redundant case smashing 2013-04-28 14:07:53 +02:00
scrawl
fdf80c1c4f Fix unused variable 2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4 Fix changeWeather 2013-04-28 11:02:30 +02:00
scrawl
2509b34ace Enabled bloodmoon weather 2013-03-20 02:48:10 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
scrawl
21cc7483e4 Fix broken weather transitions 2013-03-20 01:20:56 +01:00
Glorf
5922637c58 Unblocked Solstheim weather that should work now. 2013-03-17 20:12:26 +01:00
Glorf
f3fd3a7691 Much more moons fallbacks 2013-03-17 19:36:14 +01:00
Glorf
1369090a80 More moons fallbacks, minor weather fixes 2013-03-17 14:50:02 +01:00
Marc Zinnschlag
66a2df68db some cleanup 2013-03-15 10:26:04 +01:00
Glorf
727a598cbe Last tabulator died 2013-03-15 10:32:03 +01:00
Glorf
542c1bcc53 Some other tabulators deleted 2013-03-15 10:28:39 +01:00
Glorf
e1c6c3fe02 Tabulators deleted 2013-03-15 10:22:02 +01:00
Glorf
521bebd2f4 Fallback system rewritten, added light fallbacks 2013-03-15 10:17:30 +01:00
Marc Zinnschlag
bdec87e51b some cleanup 2013-03-10 11:30:50 +01:00
Glorf
d5ca00c927 Another fix 2013-03-10 12:11:38 +01:00
Glorf
81338d3b23 Weather code fixes 2013-03-10 11:30:24 +01:00