Howard Stearns
287d91d4b2
better
2016-02-03 20:57:35 -08:00
Howard Stearns
055de61ec6
update
2016-02-03 11:10:04 -08:00
Howard Stearns
59f1cdfc18
Reinit bestPromise with each proposal.
2016-02-02 16:18:33 -08:00
Howard Stearns
03244fbeb5
fix promise-sending.
2016-02-02 15:37:22 -08:00
Howard Stearns
fbcacbe14a
simpler betterNumber test.
2016-02-02 14:31:32 -08:00
Howard Stearns
3d01b3ec2b
watchdog
2016-02-02 14:15:03 -08:00
Howard Stearns
61393818fe
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton
2016-02-02 13:41:54 -08:00
Howard Stearns
38443af437
typo
2016-02-02 13:36:40 -08:00
Howard Stearns
cdff3323fb
typo
2016-02-02 13:25:42 -08:00
Howard Stearns
d0af2220dc
Virtual baton.
2016-02-02 13:20:41 -08:00
Ryan Huffman
759b1a347c
Merge pull request #7015 from birarda/audio-mute-crash
...
rename canAdjustLocks to isAllowedEditor, add debug for crash
2016-02-02 13:12:06 -08:00
James B. Pollack
43bf7cf679
Merge pull request #7014 from huffman/disable-edit-grid
...
Disable gridTool in edit.js
2016-02-02 11:44:46 -08:00
Stephen Birarda
79dc2d5d55
add some debug for mute environment crash
2016-02-02 11:40:15 -08:00
Ryan Huffman
57d92bcfa6
Stop creation of GridTool altogether in edit.js
2016-02-02 10:13:24 -08:00
Ryan Huffman
dad36b73fc
Disable gridTool in edit.js
2016-02-02 09:57:52 -08:00
Andrew Meadows
ee96341380
Merge pull request #7001 from imgntn/masterOffsets
...
Update reset scripts to use new offset style
2016-02-02 08:25:32 -08:00
Andrew Meadows
e394f64540
Merge pull request #6991 from seefo/master
...
Added camera sensitivity dialog preferences
2016-02-02 08:22:45 -08:00
James B. Pollack
d25dbfff9f
Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger
...
doppelganger.js: mirror joint rotations & translations about x-axis
2016-02-01 19:09:42 -08:00
James B. Pollack
8a70e53131
Merge pull request #7004 from jherico/qml
...
Small QML fixes
2016-02-01 19:08:38 -08:00
Bradley Austin Davis
4860c7d4f1
Give title to tool window
2016-02-01 18:28:23 -08:00
Bradley Austin Davis
aecf582593
Don't crash on GL error in present thread
2016-02-01 18:26:32 -08:00
James B. Pollack
43844dd0be
Merge pull request #7008 from ericrius1/editPropsDecimals
...
Fixed bug where lack of 0 as prefix for numbers would throw an error
2016-02-01 17:35:44 -08:00
Seth Alves
8d8e3520d5
Merge pull request #7007 from samcake/hdr
...
Fixing the darkening rendering bug
2016-02-01 16:46:32 -08:00
Stephen Birarda
095f0b9349
rename canAdjustLocks to isAllowedEditor for multi-purpose
2016-02-01 16:46:11 -08:00
ericrius1
1387f5f322
Fixed bug where lack of 0 as prefix for numbers would throw an error
2016-02-01 16:44:55 -08:00
samcake
e645f8a1f1
FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore
2016-02-01 16:25:55 -08:00
Brad Davis
1d4dc636af
Merge pull request #7002 from hyperlogic/tony/qml-overlay-delete-fix
...
QmlOverlay: Fix for issue use after delete
2016-02-01 16:03:58 -08:00
Brad Davis
3fcea102ed
Remove unused variable
2016-02-01 16:03:47 -08:00
Philip Rosedale
fb9df717b6
Merge pull request #7005 from sethalves/grab-user-controller-rotation
...
use controller hand rotation rather than IK hand rotation in grab script
2016-02-01 15:47:55 -08:00
Anthony J. Thibault
bea5ced3eb
QmlOverlay: remove unnecessary capture by value sigil from lambda
2016-02-01 15:46:49 -08:00
Anthony J. Thibault
db5e750fd7
Removed debug code
2016-02-01 15:45:57 -08:00
Seth Alves
3209ac4f68
use controller hand rotation rather than IK hand rotation in grab script
2016-02-01 15:42:32 -08:00
Bradley Austin Davis
c71a20b2f0
Move a QML window to the center of the desktop if it's completely off
2016-02-01 15:34:13 -08:00
Bradley Austin Davis
4393a754e2
File dialog polish
2016-02-01 15:34:10 -08:00
Bradley Austin Davis
9da0181b72
Don't try to be clever with coloring table rows
2016-02-01 15:34:07 -08:00
Bradley Austin Davis
093ccb483d
FontAwseome button polish
2016-02-01 15:34:04 -08:00
Bradley Austin Davis
4b9e5746cd
Removing some runtime warnings about null values
2016-02-01 15:34:01 -08:00
Bradley Austin Davis
7938270802
Fix modal frame decoration
2016-02-01 15:33:58 -08:00
Eric Levin
5b905402d5
Merge pull request #6992 from imgntn/cellscience
...
Add and Update CellScience Environment
2016-02-01 15:26:50 -08:00
James B. Pollack
bad6a15f09
light update
2016-02-01 14:48:17 -08:00
Anthony J. Thibault
64b56207f2
QmlOverlay: Fix for issue use after delete
...
Sometimes, it was possible to set the qmlElement bounds AFTER the qmlElement itself was deleted on another thread.
To fix this we use a shared_ptr to hold the qmlElement, then use a weak_ptr in the setProperties lambda, to verify that the qmlElement still exists.
The script that was previously causing this code to fail is: "users.js".
Because, it creates a textSizeOverlay then immediately deletes it.
2016-02-01 14:20:29 -08:00
samcake
1b52d700a0
Merge pull request #6871 from Atlante45/feat/draw-call-info
...
Unify normal and named draw paths
2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
6779bc4073
Merge pull request #7000 from jherico/qml
...
Snapshot UI in QML
2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
...
Animate iff visible with step2 billboard removal
2016-02-01 13:54:25 -08:00
James B. Pollack
d2bea1f32c
update reset scripts to use new offset style
2016-02-01 13:53:27 -08:00
Brad Hefta-Gaub
9361c1655e
Merge pull request #6980 from howard-stearns/performance-stats-repro-scripts
...
Performance stats repro scripts
2016-02-01 13:52:53 -08:00
Atlante45
ad215f23c6
Deactivate SSBOs for now
2016-02-01 22:41:01 +01:00
James B. Pollack
8e75ce8232
Merge pull request #6967 from zzmp/fix/render-count
...
Render the correct maxDrawnItems
2016-02-01 13:34:33 -08:00
James B. Pollack
cf441861cc
Merge pull request #6948 from sethalves/equip-via-parenting
...
equip via parenting rather than action
2016-02-01 13:22:09 -08:00
Seth Alves
2207588c01
merge from upstream
2016-02-01 13:19:45 -08:00
