Anthony J. Thibault
9351d5edca
Rig: warning fix & comments
2016-03-10 12:55:01 -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
Brad Hefta-Gaub
1547fc15aa
Merge pull request #7305 from PhilipRosedale/editHandles
...
Adjust edit handle sizes
2016-03-10 09:46: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
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
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
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
Atlante45
f6e01bbd36
Fix messed up LogDialog multi-lines
2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120
Update the watchdog heartbeat manually during startup
2016-03-09 17:00:45 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222
Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements
...
Hand controller mouse improvements
2016-03-09 16:34:35 -08:00
Chris Collins
690d877e93
Merge pull request #7292 from zzmp/fix/cache-loaded
...
Mark Resource loaded after postprocessing
2016-03-09 16:31:45 -08:00
Seth Alves
fbbc27213d
Merge pull request #7287 from PhilipRosedale/fireflies
...
Fireflies
2016-03-09 15:20:27 -08:00
James B. Pollack
7c44556234
Merge pull request #7301 from ericrius1/growingPlant
...
Remove prematurely added VRVJ folder from examples folder
2016-03-09 15:17:17 -08:00
ericrius1
05d26be300
delete file
2016-03-09 15:15:20 -08:00
ericrius1
7b20fdcc1a
add file before delete
2016-03-09 15:14:51 -08:00
James B. Pollack
7cdd3d5b3e
Merge pull request #7296 from imgntn/cellscience
...
Various Cellscience Fixes
2016-03-09 15:11:58 -08:00
ericrius1
974189b546
deleted cartridge spawner
2016-03-09 15:10:35 -08:00
Brad Davis
23a89a63d8
Set deadlock thread name
2016-03-09 14:51:19 -08:00
Brad Davis
6d090895b7
Don't crash on QML menu creation failure
2016-03-09 14:48:20 -08:00
PhilipRosedale
5230d3a705
Added header
2016-03-09 14:45:26 -08:00
Seth Alves
d95d0f59cb
keep removed attachment models around for one extra call to fixupModelsInScene
2016-03-09 14:36:50 -08:00
Brad Davis
3145069a10
Merge pull request #7295 from birarda/raleway-installer-fix
...
manually rename Raleway font with incorrect casing after install
2016-03-09 14:31:13 -08:00
Brad Davis
98f791a723
Merge pull request #7299 from zzmp/fix/deadlock-debug
...
Wait 10m for a deadlock when debugging
2016-03-09 14:10:02 -08:00
Zach Pomerantz
21719b3980
Wait 10m for DEBUG deadlocks
2016-03-09 14:07:36 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0
Safer shutdown code in deadlock thread
2016-03-09 13:45:01 -08:00
Brad Davis
b2be54a179
Ensure we don't get trapped in the QML rendering loop on shutdown
2016-03-09 13:45:00 -08:00
Brad Hefta-Gaub
975f0f049c
Merge pull request #7297 from jherico/upload_fix
...
Fix edit.js upload button
2016-03-09 13:14:35 -08:00
Andrew Meadows
4ae94c0611
fine tuning for when to make simulation bid
2016-03-09 13:06:34 -08:00
Stephen Birarda
0c45ed038c
attempt rename to change casing of Raleway font
2016-03-09 12:58:23 -08:00
Stephen Birarda
bdc2ac73f6
manually remove Raleway font that has incorrect casing
2016-03-09 12:30:09 -08:00
Howard Stearns
7f7ea8b672
Merge pull request #7289 from ZappoMan/bugfixes
...
fix a couple bugs
2016-03-09 12:21:58 -08:00
Brad Davis
6e24b66b38
Fix edit.js upload button
2016-03-09 12:21:31 -08:00
James B. Pollack
5a54bc548b
remove ungrabbable signal
2016-03-09 12:19:02 -08:00
James B. Pollack
dee532e84f
try to make loading of nav buttons more realiable, etc
2016-03-09 12:14:53 -08:00
James B. Pollack
5daacdf952
set offset to zeros
2016-03-09 12:01:22 -08:00
Brad Hefta-Gaub
e038c8a43c
Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes
2016-03-09 11:47:55 -08:00
Seth Alves
143d8a0929
Merge pull request #7267 from ericrius1/growingPlant
...
Plant that blooms flowers when it is watered by a water can
2016-03-09 11:28:38 -08:00
Zach Pomerantz
d06b99967e
Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-loaded
2016-03-09 11:18:05 -08:00
Zach Pomerantz
5f5f2d22a7
Merge pull request #7271 from samcake/orange
...
Trying to consolidate the FBX reader for Blender /maya
2016-03-09 14:14:03 -05:00
