Commit graph

2278 commits

Author SHA1 Message Date
scrawl
de97a8a3da Do not allow disabling the player object 2015-11-03 17:53:57 +01:00
scrawl
802620a86b Use TimeOfDayInterpolator for Land Fog Depth
Fixes the sudden fog jump at nightfall.
2015-11-01 23:03:16 +01:00
scrawl
45bf3e6788 Create TimeOfDayInterpolator class to refactor time handling in WeatherManager 2015-11-01 22:59:26 +01:00
scrawl
8da4530957 Use INI-imported underwater fog settings (Fixes #2907, Fixes #1511) 2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 2015-11-01 21:45:58 +01:00
scrawl
e13eb625d3 New water WIP
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader

Still to do: see comments...
2015-10-29 00:25:23 +01:00
scrawl
f36d463617 Enchantment error handling fix (Fixes #2959)
Catch errors about missing enchantments before they propagate up the stack and interrupt the whole frame update.
2015-10-13 18:15:39 +02:00
Marc Zinnschlag
379d13c7b9 Merge remote-tracking branch 'scrawl/unstack_script' 2015-10-07 08:12:02 +02:00
scrawl
91bf5ae237 Add new script instance when a container item is unstacked (Bug #2962) 2015-10-07 02:43:21 +02:00
scrawl
7b6fe149f2 getSpellSuccessChance return 0 for used powers (Fixes #2944) 2015-10-05 15:41:43 +02:00
Marc Zinnschlag
9279ae4ba0 Merge remote-tracking branch 'zelurker/removed_items' 2015-09-26 11:24:56 +02:00
scrawl
b9c6a6862a Don't reset god mode, scripts enabled and sky enabled flags when loading a save game
These flags aren't stored in the save file, so it makes no sense to reset them to their default each time a save game is loaded. Instead, reset on "new game".
2015-09-26 01:49:58 +02:00
Emmanuel Anne
2fff6b06cc removed items by mods do not break cell loading
like fortify intelligence potions removed by sris_alchemy which break the
loading of the firewatch mages guild
2015-09-25 14:23:49 +02:00
Alexander "Ace" Olofsson
caa119f13c Fix instantiation on non-Visual Studio 2015-09-24 15:55:38 +02:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
scrawl
385f4f729c Implement SunDiscSunsetColor, fade the sun during sunrise & sunset 2015-09-21 19:43:48 +02:00
scrawl
a2a4532e71 Add the full-screen sun glare effect 2015-09-21 17:20:08 +02:00
scrawl
8de3ce90a7 Add comments for weather IDs 2015-09-19 18:04:24 +02:00
Marc Zinnschlag
96880b4dfe Merge remote-tracking branch 'scrawl/tabs' 2015-09-17 09:30:31 +02:00
scrawl
c4b5a41ac3 Improve combat AI vertical aiming (Fixes #1366, Fixes #1330) 2015-09-17 03:41:15 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
Marc Zinnschlag
2a981a5272 make sure local variables are loaded when trying to access them from outside of a script (Fixes #2659) 2015-09-15 13:58:07 +02:00
Marc Zinnschlag
2c37731494 Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-09-12 08:41:12 +02:00
Marc Zinnschlag
0ff786bebd Merge remote-tracking branch 'origin/master' 2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
dteviot
e9c796166a Added MWMechanics::isPlayerInCombat() 2015-09-10 18:48:34 +12:00
scrawl
cd0f8e556b Merge pull request #753 from slothlife/thunderstorm-support
Improve thunderstorm support.
2015-09-09 14:44:36 +02:00
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.
2015-09-08 22:05:33 -05:00
scrawl
e5d54fb539 Check for actor being the player in various actions 2015-09-07 22:15:17 +02:00
scrawl
acbea2461b Fix a typo 2015-09-04 23:27:33 +02:00
Marc Zinnschlag
69b9eadb52 refactored loading of land data 2015-08-31 16:13:26 +02:00
Marc Zinnschlag
4b7a034cf9 Merge remote-tracking branch 'slothlife/weather-transition-fix' 2015-08-31 09:03:04 +02:00
slothlife
2b48a20b76 Fix weather transition bugs 2015-08-28 23:12:39 -05:00
slothlife
d9a7986b3a Remove redundant fast forward check 2015-08-28 18:04:22 -05:00
slothlife
4fd00a75d5 Merge advanceTime and advanceTimeByFrame 2015-08-27 14:53:52 -05:00
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
scrawl
b509a18065 Remove code setting PcRace (Fixes #2886)
This is already handled by the RaceCheck script.
2015-08-23 14:30:23 +02:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
scrawl
542c648e69 Fix incorrect assignment of PcRace, need to sort race IDs (Fixes #2884) 2015-08-22 22:53:06 +02:00
Marc Zinnschlag
50ec8b10f5 Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-22 10:37:43 +02:00
scrawl
ba8e4c22aa Avoid using loops to wrap angle values (Fixes #2882) 2015-08-21 20:17:42 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb replaced FLT_MAX with numeric_limits. 2015-08-21 19:34:28 +12:00
dteviot
ff5ef7055e extracted function CreatureStats::isParalyzed() 2015-08-20 18:12:37 +12:00
scrawl
67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
Marc Zinnschlag
e888fd7034 Merge remote-tracking branch 'scrawl/delete_noop' 2015-08-17 18:21:56 +02:00
Marc Zinnschlag
3992125b61 Merge remote-tracking branch 'scrawl/master' 2015-08-17 14:05:51 +02:00