AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
2018-06-12 16:07:36 +04:00
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
2018-06-08 17:04:15 +04:00
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
2018-06-05 18:09:10 +03:00
scrawl
cfdf99f601
Revert "Merged pull request #1573 "
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
2018-05-26 11:39:30 +00:00
Marc Zinnschlag
7324bd368f
Merged pull request #1573
2018-05-23 17:00:29 +02:00
AnyOldName3
9ff31cc80d
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-05-22 00:14:07 +01:00
AnyOldName3
9093ab59f6
Restore water object refractions and reflections.
2018-05-21 23:57:38 +01:00
Andrei Kortunov
df459199dd
Avoid left shift of negative value
2018-05-16 12:59:05 +04:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
Andrei Kortunov
22fb1f3403
Play spellcasting effects from objects
2018-04-30 17:12:06 +04:00
scrawl
b995584ad2
Merge pull request #1688
2018-04-29 14:27:55 +00:00
Capostrophic
6b47f72959
Set character preview scene ambient to 0, 0, 0
2018-04-25 15:31:49 +03:00
scrawl
bdf1070852
Merge pull request #1688
2018-04-25 11:54:26 +00:00
Capostrophic
bfcdf660f2
Utilize inventory character preview lighting rotation fallback settings
2018-04-23 22:48:15 +03:00
Capostrophic
b69e812a52
Utilize inventory character preview lighting color fallback settings
2018-04-22 22:37:27 +03:00
scrawl
0982d2175a
Merge pull request #1473
2018-04-09 20:23:43 +00:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
Chris Robinson
01dbac7b15
Don't use a different setting for distant viewing distance
2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae
Make settings for distant fog parameters
2018-03-04 11:37:57 -08:00
Chris Robinson
154cc8c659
Use alternate fog parameters when distant land is enabled
...
This allows the distant land to actually be seen when the user enables it. The
values used are replicated from MGE XE's default settings and should probably
be exposed somewhere.
2018-03-04 11:37:57 -08:00
Chris Robinson
6d557fec8e
Increase the far clip plane when distant terrain is enabled
2018-03-04 11:37:57 -08:00
AnyOldName3
6d29375d5e
Turning on shadows will now force shaders on
2018-03-03 15:50:36 +00:00
AnyOldName3
e46bf28e5f
Add object shadows setting
2018-03-03 15:13:36 +00:00
AnyOldName3
d4b37ad6b1
Apply Scrawl's fix for the local map
2018-03-03 15:06:05 +00:00
AnyOldName3
d6a7aec971
Make RenderingManager::configureAmbient do what it was intended to.
2018-03-03 01:54:21 +00:00
scrawl
839196e4fa
Force normal polygon mode for the map camera ( Fixes #4235 )
2018-03-03 00:15:57 +00:00
AnyOldName3
cfad38b869
Make masks consecutive and ordered.
2018-03-01 17:32:45 +00:00
AnyOldName3
6f582f5411
Make indoor shadows do something meaningful.
2018-03-01 17:30:53 +00:00
AnyOldName3
3fe8dc6309
Remove leftover import
2018-02-27 16:05:11 +00:00
AnyOldName3
d1a2955fa1
Merge upstream
2018-02-27 14:29:14 +00:00
AnyOldName3
f9cf1ac94b
Separate indoor and outdoor shadow casting masks.
2018-02-27 00:13:51 +00:00
AnyOldName3
e233dae1cd
Hook up the new shadow technique
2018-02-26 22:27:09 +00:00
AnyOldName3
02d0ee3485
Rename old shadow class to shadow manager
2018-02-26 14:29:31 +00:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
scrawl
899d464b0d
Cap the rain emitter's frame time ( Fixes #4314 )
2018-02-10 23:14:41 +00:00
AnyOldName3
c3d7c7de21
Prevent first-person meshes disappearing.
2018-01-23 20:13:37 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
.
2018-01-01 13:28:14 +01:00
AnyOldName3
8d4b32166c
Remove outdated comments
2017-12-27 02:35:25 +00:00
AnyOldName3
c3e0398d1c
Add settings
2017-12-27 02:32:17 +00:00
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-12-26 23:52:25 +00:00