Capostrophic
|
af47ec7756
|
Skip extra text after variable declaration (bug #4867)
|
6 years ago |
Bret Curtis
|
5e12073b47
|
Merge pull request #2272 from akortunov/optimize_terrain
Do not block loading while compiling composite maps
|
6 years ago |
|
Bret Curtis
|
0c11f903ab
|
Merge pull request #2274 from akortunov/terrain
Enable light sources directly to avoid virtual calls
|
6 years ago |
Andrei Kortunov
|
b466bfee40
|
Enable light sources directly to avoid virtual calls
|
6 years ago |
|
Andrei Kortunov
|
0e1f5f68b6
|
Do not allow different threads to compile the same composite map
|
6 years ago |
|
Andrei Kortunov
|
cad45e96ac
|
Remove redundant mCompile set - we do not use data from it anyway
|
6 years ago |
Chris Djali
|
e14682e353
|
Merge pull request #2273 from AnyOldName3/conformant-comparator
Use irreflexive, asymmetric comparator as required by the spec.
|
6 years ago |
AnyOldName3
|
32da9a8ab1
|
Use irreflexive, asymmetric comparator as required by the spec.
|
6 years ago |
|
Bret Curtis
|
a38c5cd240
|
Merge pull request #2271 from Capostrophic/animation
Minor NpcAnimation cleanup
|
6 years ago |
bzzt
|
c2986b3bd7
|
Do not block the loading thread while compiling composite maps in the
draw thread
|
6 years ago |
|
Capostrophic
|
695cd5bb49
|
Minor NpcAnimation cleanup
|
6 years ago |
|
Bret Curtis
|
7ccfec4d21
|
Merge pull request #2270 from akortunov/animfix
Fixes for werewolf animations
|
6 years ago |
|
Andrei Kortunov
|
be12d241da
|
Reset current attack during force update (bug #4922)
|
6 years ago |
|
Andrei Kortunov
|
e171d34192
|
Init NPC type properly in the NpcAnimation
|
6 years ago |
|
Bret Curtis
|
cc43315fad
|
Merge pull request #2269 from elsid/fix_warnings
Add override to fix warnings
|
6 years ago |
elsid
|
ccb325c663
|
Add override to fix warnings
|
6 years ago |
|
Bret Curtis
|
fa8e7b8037
|
Merge pull request #2246 from Capostrophic/osgqt
Merge upstream osgQt changes
|
6 years ago |
|
Bret Curtis
|
26feedfcae
|
Merge pull request #2268 from akortunov/scanfix
Fix some issues from the Coverity Scan report
|
6 years ago |
|
Bret Curtis
|
19dcbf2b3d
|
Merge pull request #2266 from Capostrophic/vsync
Vsync tweaks
|
6 years ago |
|
Andrei Kortunov
|
7501f18d21
|
Avoid the 'structurally dead code' warning
|
6 years ago |
|
Andrei Kortunov
|
b2fca46206
|
Fix a couple of minor issues in shadows
|
6 years ago |
|
Andrei Kortunov
|
7995a92672
|
Initialize missing variables
|
6 years ago |
|
Andrei Kortunov
|
fd5e9cf271
|
Catch possible boost::bad_any_cast exception
|
6 years ago |
|
Bret Curtis
|
0c95ffab8f
|
Merge pull request #2265 from Capostrophic/material
Fix shader specular lighting (again)
|
6 years ago |
|
Capostrophic
|
9b65f0dbca
|
Vsync tweaks
Try to use adaptive vsync if available
Don't use vsync if unavailable
|
6 years ago |
|
Capostrophic
|
02242ce66b
|
Fix shader specular lighting (again)
|
6 years ago |
|
Bret Curtis
|
b819690e82
|
Merge pull request #2264 from akortunov/optimize_terrain
Delete composite map layers in the background thread
|
6 years ago |
|
bzzt
|
aa5a071aef
|
Delete composite map layers in the background thread
|
6 years ago |
|
Bret Curtis
|
e2ed90e67b
|
Merge pull request #2262 from akortunov/guifixes
[Regression] Fix missing \n characters on the active effects tooltips
|
6 years ago |
|
Bret Curtis
|
d56733149c
|
Merge pull request #2201 from akortunov/optimize_terrain
Optimize terrain
|
6 years ago |
|
Bret Curtis
|
4e3de9b00c
|
Merge pull request #2206 from Capostrophic/title
Loop title screen music (bug #4896)
|
6 years ago |
|
Bret Curtis
|
45221418bd
|
Merge pull request #2260 from elsid/fix_clean_unused_navmeshes
Fix clean unused navmeshes
|
6 years ago |
|
Bret Curtis
|
b80e55fd3e
|
Merge pull request #2261 from elsid/navigator_stats
Navigator stats
|
6 years ago |
|
Andrei Kortunov
|
c6cb91ce61
|
Limit maximum FOV value
|
6 years ago |
|
Andrei Kortunov
|
540709fdae
|
Add a changelog entry for terrain optimization
|
6 years ago |
|
bzzt
|
6029ed4ecc
|
Reject empty quad tree nodes at the cell level without land data
|
6 years ago |
|
bzzt
|
36fa51b6ad
|
Fix bounding box calculation for terrain shapes
|
6 years ago |
|
Andrei Kortunov
|
80e0fbdd88
|
Fix missing \n characters on the active effects tooltips
|
6 years ago |
|
elsid
|
4624f31788
|
Report navigator stats
|
6 years ago |
|
elsid
|
8adc83f6e2
|
Fix clean unused navmeshes
weak_ptr doesn't have constructor for shared_ptr&& type, so ptr wasn't
moved, just copied.
|
6 years ago |
|
Capostrophic
|
abae35e88b
|
Loop title screen music (bug #4896)
|
6 years ago |
|
elsid
|
2c78d530a2
|
Use static vector to store stat names
|
6 years ago |
|
Bret Curtis
|
ab69ad65ed
|
Merge pull request #2234 from Capostrophic/terrain
Some more improvements from bzzt's branch
|
6 years ago |
|
Bret Curtis
|
8cf41be45d
|
Merge pull request #2257 from Capostrophic/slider
Correct look and behavior of some setting sliders
|
6 years ago |
|
Bret Curtis
|
bafc67dcdb
|
Merge pull request #2259 from Capostrophic/optimizer
Update optimizer with upstream improvements
|
6 years ago |
|
Capostrophic
|
de572226e4
|
Update optimizer with upstream improvements
|
6 years ago |
|
bzzt
|
b42ad0f610
|
Inline certain terrain storage functions
|
6 years ago |
|
bzzt
|
e131e6699c
|
Match vertex colors data type to source
|
6 years ago |
|
Capostrophic
|
168e758921
|
Correct look and behavior of some setting sliders
|
6 years ago |
|
Capostrophic
|
5f86933dc6
|
Merge upstream osgQt changes
|
6 years ago |