ericrius1
1387f5f322
Fixed bug where lack of 0 as prefix for numbers would throw an error
2016-02-01 16:44:55 -08:00
Seth Alves
67c95a00a0
Merge branch 'hdr' of github.com:samcake/hifi into dressing-room
2016-02-01 16:42:42 -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
Seth Alves
c570f4af67
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-01 16:15:42 -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
Seth Alves
e4ef3ae869
automatically save adjustments to offset of equipped items
2016-02-01 15:06:53 -08:00
James B. Pollack
bad6a15f09
light update
2016-02-01 14:48:17 -08:00
Seth Alves
793b0f400f
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-01 14:35:37 -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
Seth Alves
0aaacac103
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-01 13:23:22 -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
howard-stearns
ae10d4343c
Add data for a 2k triangle model.
2016-02-01 11:47:33 -08:00
Seth Alves
9dc6f08ae2
Merge pull request #6995 from imgntn/removeHighFreqMsg
...
Remove high frequency messages from grab script
2016-02-01 11:44:43 -08:00
Howard Stearns
d8069b6dbf
Whitespace and jslinting.
2016-02-01 11:28:51 -08:00
Anthony Thibault
17851dd129
Merge pull request #6990 from howard-stearns/better-head-joint-setup
...
Better head joint setup
2016-02-01 11:28:35 -08:00
Zach Pomerantz
5d49eacf83
Move pipeline init to separate file
2016-02-01 11:12:11 -08:00
Brad Davis
27c38599a9
Snapshot dialogs
2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef
Cleaning up unused code
2016-02-01 11:07:46 -08:00
Howard Stearns
11d80cdc94
Merge branch 'master' of https://github.com/highfidelity/hifi into performance-stats-repro-scripts
2016-02-01 10:38:13 -08:00
Anthony Thibault
b345df8002
Merge pull request #6987 from AndrewMeadows/better-ik
...
reduce hand-IK coupling to hip offset
2016-02-01 10:36:21 -08:00
Zach Pomerantz
df894d364a
Move DrawOverlay3D to use ShapePlumber
2016-02-01 10:30:14 -08:00
Zach Pomerantz
671f27e5bc
Move DrawStencil to use ShapePlumber
2016-02-01 10:30:08 -08:00
Seth Alves
aa6742a844
merge from james/removeHighFreqMsg
2016-02-01 10:01:50 -08:00
Seth Alves
d034850c49
Merge branch 'equip-via-parenting' of github.com:sethalves/hifi into dressing-room
2016-02-01 09:59:52 -08:00
Seth Alves
182ae22b44
merge James' doppelganger changes into Tony's
2016-02-01 09:58:35 -08:00
Seth Alves
6ca17a904a
merge James' doppelganger changes into Tony's
2016-02-01 09:58:24 -08:00
Seth Alves
a65ff76da1
Merge branch 'tony/mirrored-doppelganger' of github.com:hyperlogic/hifi into dressing-room
2016-02-01 09:56:52 -08:00
Seth Alves
7c5b0ec46e
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting
2016-02-01 09:52:30 -08:00
howard-stearns
24f53492f5
Back out changes to reader.
2016-02-01 09:52:03 -08:00
Atlante45
5ac0350993
Don't fall through in switch case
2016-02-01 18:50:01 +01:00
