AnyOldName3
|
3dddd97a91
|
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-dicking-around-with-cascading-shadow-maps
|
2018-05-22 00:14:51 +01:00 |
|
AnyOldName3
|
9ff31cc80d
|
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
|
2018-05-22 00:14:07 +01:00 |
|
AnyOldName3
|
aa9eec485f
|
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-dicking-around-with-cascading-shadow-maps
|
2018-05-21 23:58:21 +01:00 |
|
AnyOldName3
|
9093ab59f6
|
Restore water object refractions and reflections.
|
2018-05-21 23:57:38 +01:00 |
|
AnyOldName3
|
86ce33f437
|
Update documentation
|
2018-05-21 16:00:51 +01:00 |
|
Bret Curtis
|
5775f420e2
|
Merge pull request #1714 from ananace/patch-9
Switch Appveyor CI to x64 VS2015 / 2017
|
2018-05-21 00:03:07 +02:00 |
|
Alexander "Ananace" Olofsson
|
d05de8e411
|
Give boost the correct toolset for 2017
|
2018-05-20 18:51:28 +02:00 |
|
Alexander "Ananace" Olofsson
|
4f758bdd48
|
Use different environments for 2015 and 2017
|
2018-05-20 18:24:06 +02:00 |
|
Alexander "Ananace" Olofsson
|
3bd8dc3ef6
|
Use the right boost version for Appveyor
|
2018-05-20 18:22:02 +02:00 |
|
Alexander "Ananace" Olofsson
|
bcfa2a13a6
|
Use the VS2017 packaging of Qt5 for Appveyor
|
2018-05-20 18:09:31 +02:00 |
|
Alexander "Ananace" Olofsson
|
e1e7a4b11a
|
Change Appveyor to use Visual Studio 2017
|
2018-05-20 18:04:59 +02:00 |
|
Alexander "Ananace" Olofsson
|
12b201348a
|
Switch to the supported VS versions on Appveyor
|
2018-05-20 17:17:04 +02:00 |
|
Alexander "Ananace" Olofsson
|
ea6c73333b
|
Bumping Qt to 5.10 for Appveyor
|
2018-05-20 17:14:32 +02:00 |
|
Alexander "Ananace" Olofsson
|
f8304a52c4
|
Enable verbose logging for CI
|
2018-05-20 17:04:52 +02:00 |
|
AnyOldName3
|
feac7bd88e
|
Use 3 shadow maps by default as 1 sucks.
|
2018-05-20 00:17:06 +01:00 |
|
AnyOldName3
|
2c30bc1b4f
|
Accidentally fix the one remaing case where shadows look awful while refactoring some stuff.
|
2018-05-18 22:39:57 +01:00 |
|
Marc Zinnschlag
|
ec900ef4ad
|
Merged pull request #1710)
|
2018-05-18 12:34:16 +02:00 |
|
AnyOldName3
|
9f0a49c303
|
Disable CSM when disabled in the settings.
|
2018-05-17 20:27:10 +01:00 |
|
AnyOldName3
|
84284a60a7
|
Make CSM shader changes controllable by the setting.
|
2018-05-17 17:35:55 +01:00 |
|
AnyOldName3
|
5d05aadb37
|
Begin to let settings toggle between CSM and PSSM
|
2018-05-17 16:57:01 +01:00 |
|
Capostrophic
|
4e485dbd44
|
Rename Original Creature column to Parent Creature (fixes #2897)
|
2018-05-17 13:00:48 +03:00 |
|
AnyOldName3
|
7255c266ba
|
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-dicking-around-with-cascading-shadow-maps
|
2018-05-16 21:21:05 +01:00 |
|
AnyOldName3
|
fc1aee10f4
|
Remove function declaration that somehow snuck in.
|
2018-05-16 21:20:17 +01:00 |
|
AnyOldName3
|
aa68af4f8b
|
Make shaders pick the correct shadow cascade level and blend near cascade edges.
|
2018-05-16 18:20:21 +01:00 |
|
Bret Curtis
|
67c381df4e
|
Merge pull request #1708 from akortunov/refidfix
fix GCC warnings
|
2018-05-16 15:59:31 +02:00 |
|
Andrei Kortunov
|
a68de93308
|
Initialize srate variable in openal_output
|
2018-05-16 16:34:58 +04:00 |
|
Andrei Kortunov
|
e5db5e2651
|
Fix 'maybe-uninitialized' warning in openal_output
|
2018-05-16 16:13:22 +04:00 |
|
Andrei Kortunov
|
df459199dd
|
Avoid left shift of negative value
|
2018-05-16 12:59:05 +04:00 |
|
Bret Curtis
|
caf1760251
|
Merge pull request #1707 from akortunov/weaponreach
Display weapon reach on tooltips in feet
|
2018-05-16 10:27:53 +02:00 |
|
Andrei Kortunov
|
164e3d12fe
|
Display weapon reach on tooltips in feet.
|
2018-05-16 11:18:22 +04:00 |
|
Bret Curtis
|
e410c47660
|
Merge pull request #1706 from akortunov/refidfix
Fix compiler warning in getNestedData()
|
2018-05-16 09:00:25 +02:00 |
|
Andrei Kortunov
|
6a3ff5ed81
|
Fix compiler warning in getNestedData
|
2018-05-16 10:10:42 +04:00 |
|
Bret Curtis
|
c75d774356
|
Merge pull request #1692 from akortunov/playsound
Prevent PlaySound overlapping
|
2018-05-15 19:03:01 +02:00 |
|
AnyOldName3
|
1b30d47d7f
|
Add a hacky temporary version of cascading shadow maps
|
2018-05-13 12:56:40 +01:00 |
|
Marc Zinnschlag
|
bdfa430857
|
updated credits file
|
2018-05-13 09:24:24 +02:00 |
|
Marc Zinnschlag
|
0f22600a98
|
Merged pull request #1703
|
2018-05-13 09:08:40 +02:00 |
|
AnyOldName3
|
44b2cf2b7f
|
Merge upstream.
|
2018-05-11 19:15:04 +01:00 |
|
AnyOldName3
|
166e7df778
|
Improve debug HUD frustum
|
2018-05-11 19:08:42 +01:00 |
|
Marc Zinnschlag
|
b7cce1a665
|
Merged pull request #1702
|
2018-05-11 10:11:17 +02:00 |
|
Marc Zinnschlag
|
6630a02c3f
|
updated credits file
|
2018-05-11 09:56:44 +02:00 |
|
Alf Henrik Sauge
|
d4f278a113
|
Replacing tab with spaces
|
2018-05-09 18:02:02 +02:00 |
|
David Cernat
|
32d71de2f5
|
Update MapWindow every frame, not just when it's open (bug #4279)
|
2018-05-09 07:33:45 +03:00 |
|
Alf Henrik Sauge
|
feeee50a88
|
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
|
2018-05-09 00:25:07 +02:00 |
|
Marc Zinnschlag
|
3197ebd8e7
|
Merged pull request #1694
|
2018-05-08 12:19:14 +02:00 |
|
Andrei Kortunov
|
2f89080b36
|
Load default markers definitions in editor
|
2018-05-07 22:32:04 +04:00 |
|
Andrei Kortunov
|
b15bed8e22
|
Avoid excessive loadSound calls
|
2018-05-07 20:40:53 +04:00 |
|
Marc Zinnschlag
|
53b6ef6f8c
|
minor code cleanup
|
2018-05-07 09:54:42 +02:00 |
|
Marc Zinnschlag
|
57ee5f9b53
|
updated credits file
|
2018-05-07 09:51:09 +02:00 |
|
Marc Zinnschlag
|
e661e3cf74
|
Merged pull request #1677
|
2018-05-07 09:42:41 +02:00 |
|
Marc Zinnschlag
|
f5f8f62e8e
|
updated credits file
|
2018-05-07 09:34:46 +02:00 |
|