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
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
Glorf
aebd9a3700
Weather to pull
2013-03-10 00:24:14 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
Chris Robinson
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
2012-12-18 06:01:21 -08:00
