Brad Hefta-Gaub
6061330826
Merge pull request #2973 from matsukaze/master
...
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
2014-06-02 22:41:02 -07:00
barnold1953
863e2c56ae
Fixed mirror mode for non-headless models.
2014-06-02 10:41:10 -07:00
matsukaze
46d45a2d43
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
...
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.
Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
2014-06-02 05:55:58 -04:00
AndrewMeadows
5b74829318
Merge pull request #2955 from ey6es/cascade
...
Basic cascaded shadow maps for increased shadow draw distance.
2014-05-29 18:57:44 -07:00
Andrzej Kapolka
1eace78e47
Hide distances; they no longer need to be publicly visible.
2014-05-29 17:46:25 -07:00
ZappoMan
ac22cebde1
more performance stats debugging
2014-05-29 17:41:40 -07:00
Andrzej Kapolka
34091128d8
Distance tweak.
2014-05-29 17:22:59 -07:00
Andrzej Kapolka
67921c474e
Merge branch 'master' of https://github.com/highfidelity/hifi into cascade
2014-05-29 17:09:09 -07:00
Andrzej Kapolka
0b4484a153
Trying a different way of determining the cascade threshold distances.
2014-05-29 16:49:51 -07:00
Andrzej Kapolka
09231f01f3
Retain "simple" shadows, supply cascaded as option.
2014-05-29 12:48:41 -07:00
ZappoMan
e6966c2155
add improved detailed rendering and FPS debugging stats
2014-05-29 12:12:23 -07:00
AndrewMeadows
b849c07faf
Merge pull request #2945 from huffman/19725
...
Code Review for Job #19725
2014-05-29 09:06:43 -07:00
AndrewMeadows
31237003db
Merge pull request #2944 from Barnold1953/master
...
Disable oculus overlay until it is curved.
2014-05-29 09:01:52 -07:00
AndrewMeadows
21f045ebe0
Merge pull request #2939 from huffman/19648
...
Code Review for Job #19648
2014-05-29 08:53:31 -07:00
Andrzej Kapolka
ff77644caa
Progress on selecting cascades.
2014-05-28 18:35:30 -07:00
Andrzej Kapolka
698ecbf9c5
Fix for shadow map rendering.
2014-05-28 15:58:45 -07:00
Ryan Huffman
8f6ad2faab
Add 'Load default scripts' button to preferences
2014-05-28 15:27:50 -07:00
Andrzej Kapolka
c3f6cab199
Working on cascading shadow maps.
2014-05-28 15:20:09 -07:00
barnold1953
9311eeb8f5
Fixed compiler warning
2014-05-28 14:41:30 -07:00
barnold1953
ebfb11c1ce
Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory
2014-05-28 10:46:46 -07:00
barnold1953
35e63757ed
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-28 09:25:55 -07:00
Andrzej Kapolka
62eeeaa1c6
Fix for Windows build failure.
2014-05-27 18:12:15 -07:00
barnold1953
5665e4d278
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f
Made Overlay appear as flat image in front of camera in Oculus Rift. It
...
needs to be a curved surface instead.
2014-05-27 16:13:56 -07:00
Andrzej Kapolka
2b54d627c0
Try rounding to nearest texel unit to reduce shimmer.
2014-05-27 14:25:27 -07:00
Andrzej Kapolka
3f478b1939
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 12:31:12 -07:00
Andrzej Kapolka
edaa251e5f
Provide option to disable avatar shadowing.
2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b
Merge branch master from upstream
2014-05-28 00:02:15 +05:30
barnold1953
d1a4192ac5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d
Added OverlayRenderer class and moved displayOverlay from Application to
...
OverlayRenderer.
2014-05-27 11:19:45 -07:00
Andrzej Kapolka
70ab33b65b
Some tricks to avoid shadow artifacts: render back faces to shadow buffer,
...
use polygon offset.
2014-05-27 10:54:18 -07:00
Ryan Huffman
099777ef8c
Merge branch 'master' of git://github.com/highfidelity/hifi into 19648
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-26 10:01:44 -07:00
Ryan Huffman
c362731226
Add support to load script engines not based on a file
2014-05-26 09:57:37 -07:00
Clément Brisset
6bb933996f
Merge pull request #2920 from ZappoMan/aacube
...
Add RayPick support for models
2014-05-24 17:03:59 -07:00
Stephen Birarda
fe05beb88d
remove an unneeded debug
2014-05-23 17:41:58 -07:00
Stephen Birarda
714e29c887
fix credit amount in window title
2014-05-23 17:37:36 -07:00
Stephen Birarda
1e9589c19e
fix an implicit cast to float
2014-05-23 16:18:21 -07:00
Stephen Birarda
1b00cda068
don't use powf for credit conversions
2014-05-23 16:12:34 -07:00
Brad Hefta-Gaub
50e812a82b
Merge pull request #2913 from talentraspel/19680
...
locking against crash
2014-05-23 15:08:20 -07:00
Kai Ludwig
7fb9e3a7e6
spaces instead of tabs.
2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532
_voxelFades needs locking.
2014-05-23 20:21:00 +02:00
ZappoMan
ee523ff373
Merge branch 'master' of https://github.com/worklist/hifi into aacube
2014-05-23 11:17:59 -07:00
ZappoMan
39ed7f7b65
renaming of AABox to AACube, introduction of actual AABox
2014-05-23 10:45:04 -07:00
Stephen Birarda
164d3c5fb3
make sure balance is cleared on logout and re-launch
2014-05-22 15:06:16 -07:00
Stephen Birarda
79f09605d5
show credit balance in window title
2014-05-22 14:55:43 -07:00
Atlante45
ea1359c10f
Clean up log
2014-05-22 11:11:22 -07:00
Mohammed Nafees
ad49b5c2e1
Show OS notification when user is not logged in
2014-05-22 16:53:07 +05:30
barnold1953
5b366fe714
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
2014-05-21 16:01:28 -07:00
barnold1953
97c0a2fc98
Made mirror view remain constant no matter what the avatar scale is set to.
2014-05-21 15:32:23 -07:00
barnold1953
21f03a4fb5
Made oculus camera modes only active when AllowOculusCameraModeChange is checked.
2014-05-21 12:43:44 -07:00
