Commit graph

8321 commits

Author SHA1 Message Date
scrawl
77cb438714 Fix potential case smashing issue 2015-10-05 15:41:07 +02:00
Marc Zinnschlag
9279ae4ba0 Merge remote-tracking branch 'zelurker/removed_items' 2015-09-26 11:24:56 +02:00
Marc Zinnschlag
bebd442b49 Merge remote-tracking branch 'scrawl/godmode' 2015-09-26 11:23:33 +02:00
Emmanuel Anne
6ec8f9123e Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items 2015-09-26 09:24:56 +02:00
scrawl
899e35591c Escape MyGUI markup codes in console output 2015-09-26 02:08:23 +02:00
scrawl
387624e158 Add a threshold to AiFollow distance
Idle animations can move the actor around slightly, which sometimes causes AiFollow to constantly toggle between "arrived" and "following" state even when the player isn't moving. Could be observed by summoning a bonelord.
2015-09-26 02:02:50 +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
Marc Zinnschlag
8a37d3ad8c Merge remote-tracking branch 'scrawl/sky' 2015-09-22 08:33:33 +02:00
scrawl
385f4f729c Implement SunDiscSunsetColor, fade the sun during sunrise & sunset 2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87 Minor cleanup 2015-09-21 17:50:36 +02:00
scrawl
d812434fee Add a subtle fading effect to the sun flash texture 2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05 Remove dead code 2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288 Improve accuracy of sun occlusion query (use circular shape) 2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba Scale the sun flash texture depending on occlusion query 2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71 Add the full-screen sun glare effect 2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405 Render the sun flash (not adjusted based on occlusion yet) 2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b Document RenderBin numbers in a common header to keep them organised 2015-09-21 17:20:08 +02:00
scrawl
d191a52847 Create occlusion query nodes for the sun flash 2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4 Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture 2015-09-21 17:19:53 +02:00
scrawl
8de3ce90a7 Add comments for weather IDs 2015-09-19 18:04:24 +02:00
dteviot
60d0ad9283 When stuck, try moving backwards as well as to side. 2015-09-19 16:14:00 +12:00
dteviot
5369d20682 Moved pathfinding logic from AiCombat to Pathfinding. 2015-09-19 15:34:02 +12:00
scrawl
a37dee09e2 Fix invisibility effect disappearing after a view mode switch 2015-09-18 21:30:02 +02:00
Marc Zinnschlag
b58a63e14e Merge remote-tracking branch 'scrawl/deathanim' 2015-09-17 14:54:29 +02:00
Marc Zinnschlag
96880b4dfe Merge remote-tracking branch 'scrawl/tabs' 2015-09-17 09:30:31 +02:00
Marc Zinnschlag
c35ce88ee7 Merge remote-tracking branch 'scrawl/aiming' 2015-09-17 09:25:33 +02:00
Marc Zinnschlag
ed373aa320 Merge remote-tracking branch 'scrawl/animation' 2015-09-17 09:24:11 +02:00
scrawl
a7f898057b Don't activate the initial death animation when skipAnim is set (Fixes #2513) 2015-09-17 04:38:42 +02:00
scrawl
c4b5a41ac3 Improve combat AI vertical aiming (Fixes #1366, Fixes #1330) 2015-09-17 03:41:15 +02:00
Emmanuel Anne
29a84452ab durations in tooltips : use "show effect duration" setting 2015-09-16 22:42:54 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6 durations in tooltips : water walking effects is seen differently
so move the duration info out of this block...
2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583 add duration to spell icons too
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce show duration of light sources in tooltip
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
2015-09-16 17:53:06 +02:00
scrawl
f8d4bc378f Move setAlpha from NpcAnimation to Animation (Fixes #2917) 2015-09-16 16:15:55 +02:00
scrawl
126960261f Keep playing IdleSneak on the lower body when casting spells / using weapons 2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae Add convenience operator [] to AnimPriority 2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7 Use the actual sneak state to determine visibility of indicator (Fixes #2915) 2015-09-16 15:37:36 +02:00
Marc Zinnschlag
c693656307 Merge branch 'localvarfix' 2015-09-15 14:01:45 +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
dteviot
0feae19140 AiCombat use evadeObstacles() from AiPackage. 2015-09-14 19:57:22 +12:00
Marc Zinnschlag
2c37731494 Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d Fixed errors pointed out by Zini.
1. Removed "Actor" from name of function  isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12: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
10eabc9d51 actorutil.hpp includes mwworld/ptr.hpp
As pointed out by Scrawl, fixes compiler error if getPlayer() is called before MWWorld::Ptr is defined, because getPlayer() returns a Ptr by value.
2015-09-11 18:43:06 +12:00
dteviot
6f97187bb6 Fix travis warning about no newline at end of file. 2015-09-10 22:26:33 +12:00