samcake
729890342e
Fixing the linux warning for unused variable
2016-03-11 00:27:56 -08:00
samcake
24d712b7b4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 18:14:22 -08:00
samcake
58b84b67ea
Fixing the outside the octree bug
2016-03-10 18:14:11 -08:00
Philip Rosedale
e87ef52a4c
Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay
...
More reliable and usable UI sphere overlay location
2016-03-10 17:43:50 -08:00
Howard Stearns
8a36df13df
Merge pull request #7314 from samcake/color
...
Fix a potentially bad access to RenderItem case from Overlay
2016-03-10 16:19:56 -08:00
samcake
a88f22fa3c
Removing white spaces
2016-03-10 15:58:04 -08:00
Brad Davis
bbc298f1e4
Merge pull request #7306 from zzmp/fix/px-rapid
...
Allow procedural shaders to be reused, and prevent crashes from rapid updates
2016-03-10 15:34:48 -08:00
Zach Pomerantz
505ae71e30
Pass px userData by const ref
2016-03-10 15:22:19 -08:00
samcake
fb68c09941
Before merging upstream
2016-03-10 15:10:34 -08:00
samcake
3944a7f297
Exposing thread safe number of allocated items for a ascene
2016-03-10 15:03:20 -08:00
samcake
ad7d567932
Fixing the overlay renderItem access issue
2016-03-10 14:09:34 -08:00
samcake
f97c7b00de
Removing old modifications
2016-03-10 14:06:07 -08:00
samcake
1e96c9e2ca
Merging back with master
2016-03-10 14:03:37 -08:00
samcake
9fa1a4a478
Merging back with master
2016-03-10 14:01:58 -08:00
Philip Rosedale
7275674d69
Merge pull request #7313 from ZappoMan/hmdFixes
...
remove hmdDefaults and hmdControls scripts, since they are borked
2016-03-10 13:47:09 -08:00
Philip Rosedale
e1f91ae8b0
Merge pull request #7311 from hyperlogic/tony/raise-your-hands-in-the-air
...
MyAvatar: Allow user to raise hands directly overhead.
2016-03-10 13:45:15 -08:00
Brad Hefta-Gaub
509abbf1d4
remove inspect.js from default scripts
2016-03-10 13:31:27 -08:00
Eric Levin
8828b93062
Merge pull request #7261 from imgntn/newfishes
...
Home Fishtank
2016-03-10 13:23:36 -08:00
Anthony J. Thibault
6d11dd465c
Application: reset avatar on displayMode change
...
but not HMD sensor.
2016-03-10 13:12:09 -08:00
Andrew Meadows
a5e94ec087
Merge pull request #7307 from ctrlaltdavid/update-glyphs
...
Update HiFi glyphs font file
2016-03-10 12:55:32 -08:00
Anthony J. Thibault
9351d5edca
Rig: warning fix & comments
2016-03-10 12:55:01 -08:00
Brad Hefta-Gaub
6ed1ad10a1
remove hmdDefaults and hmdControls scripts, since they are borked
2016-03-10 12:12:24 -08:00
Zach Pomerantz
64042327ec
Use version tmp var
2016-03-10 11:08:15 -08:00
James B. Pollack
c05e996913
remove lifetime
2016-03-10 10:38:49 -08:00
Anthony J. Thibault
4a78300607
MyAvatar: Allow user to raise hands directly overhead.
...
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head. Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
2016-03-10 10:20:17 -08:00
Zach Pomerantz
9b89e46e65
Make procedural userData thread-safe
2016-03-10 10:12:55 -08:00
Zach Pomerantz
1640314076
Use one procedural for skybox (avoid copies)
2016-03-10 10:12:22 -08:00
Brad Hefta-Gaub
1547fc15aa
Merge pull request #7305 from PhilipRosedale/editHandles
...
Adjust edit handle sizes
2016-03-10 09:46:43 -08:00
Anthony Thibault
153f7fc3aa
OpenVR: adjusted translation of UI sphere overlay
2016-03-10 09:45:47 -08:00
samcake
f40d390cc9
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 09:40:43 -08:00
samcake
a26f522f33
Merge pull request #7308 from jherico/shaders
...
Fix link problem with shaders that use transparency and normal maps
2016-03-10 09:35:35 -08:00
samcake
0543bb22e2
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 09:31:30 -08:00
samcake
f6276615f7
Trying to fix the bound out of the octree volume problem
2016-03-10 09:31:05 -08:00
Brad Hefta-Gaub
99d26e0ef5
Merge pull request #7310 from jherico/crashes
...
Addressing thread safety issues
2016-03-10 09:26:49 -08:00
Brad Hefta-Gaub
ee727b0632
Merge pull request #7304 from Atlante45/master
...
Fix messed up LogDialog multi-lines
2016-03-10 09:23:35 -08:00
Philip Rosedale
ee1e4b898e
Merge pull request #7278 from AndrewMeadows/simulation-priority
...
adjust simulation priorities
2016-03-10 08:52:18 -08:00
Brad Davis
ee017cf0a5
Make script cache thread safe
2016-03-10 08:47:11 -08:00
Brad Davis
f97e61e305
Make scripting interface members thread safe
2016-03-10 08:46:09 -08:00
Brad Hefta-Gaub
aaed1d333b
Merge pull request #7309 from jherico/compositor_threading_fix
...
Handle fake mouse events properly when triggered from a script
2016-03-10 08:37:30 -08:00
Brad Hefta-Gaub
82ca78b37b
Merge pull request #7300 from sethalves/fix-detach-crash
...
fix removing attachments
2016-03-10 08:23:52 -08:00
Brad Davis
f04d1b4998
Handle fake mouse events properly when triggered from a script
2016-03-09 22:11:40 -08:00
Brad Davis
aad2aaa764
Fix link problem with shaders that use transparency and normal maps
2016-03-09 20:01:18 -08:00
Zach Pomerantz
74e1d32221
Reuse procedural on skybox
2016-03-09 19:40:27 -08:00
Zach Pomerantz
4022474b48
Constrain procedural updates to render thread
2016-03-09 19:39:38 -08:00
Chris Collins
f98b6c3a28
Merge pull request #7303 from jherico/watchdog
...
Update the watchdog heartbeat manually during startup
2016-03-09 19:11:30 -08:00
Anthony Thibault
42d27557a1
OpenVR: remove 180 y rotation for UI bounds.
...
Turns out the room I was using was misconfigured.
2016-03-09 18:42:58 -08:00
David Rowe
4c3f374f02
Update HiFi glyphs font file
...
Has some new, soon to be used characters, but no other changes.
2016-03-10 15:10:44 +13:00
PhilipRosedale
c11487735f
Adjust grab handle sizes
2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31
Adjust grab handle sizes
2016-03-09 17:43:44 -08:00
James B. Pollack
a8ac556103
merge
2016-03-09 17:41:14 -08:00
