samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd
Merge pull request #7697 from samcake/orange
...
Introduce a simple state sort for drawing opaque items
2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
a572ac31dc
Merge pull request #7704 from samcake/lemon
...
Exposing the CPU TIming of the Render Jobs to the JS API
2016-04-18 18:12:14 -07:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
5ae1e70197
Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests
...
Added avatar unit tests
2016-04-18 18:03:29 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
samcake
ca720efce6
Exposing the timing of the jobs by default
2016-04-18 14:53:06 -07:00
samcake
3887dfdf34
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-04-18 11:52:45 -07:00
samcake
d746fba142
Cleaning up the stats.qml
2016-04-18 11:18:28 -07:00
Anthony J. Thibault
efb6a5c3f6
hifi-boot.js: Coding convention update
2016-04-18 09:49:09 -07:00
Brad Davis
f3e5306f90
Working on an automated performance test
2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a
switch to QRect instead of vec4
2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807
code review feedback
2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
d5a46d3390
handle repositioning of qml windows
2016-04-15 20:01:14 -07:00
Anthony J. Thibault
9ab3255285
updated avatarUnitTests.js
2016-04-15 18:07:07 -07:00
samcake
298300e42f
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-15 14:16:02 -07:00
Howard Stearns
e4f8a67e60
Merge pull request #7649 from hyperlogic/tony/simplify-away-mode
...
away.js: fix for permanent disabling avatar IK
2016-04-15 13:35:14 -07:00
Anthony J. Thibault
700f548f44
Added stub jasmine unit tests for MyAvatar
2016-04-15 11:01:10 -07:00
Anthony J. Thibault
d02836a0cb
Add jasmine 2.4.1 unit test library
...
Along with a customized hifi-boot.js file that configures jasmine
reporting to run within hifi.
2016-04-15 10:58:45 -07:00
Brad Hefta-Gaub
d80bf58021
remove users.js from defaultScripts.js
2016-04-14 21:31:22 -07:00
Brad Hefta-Gaub
c7f58dc17c
first cut at exposing recommend overlay rectangle
2016-04-14 20:47:31 -07:00
Seth Alves
31270ebe6e
clear away-ness if the avatar walks a certain distance
2016-04-14 16:03:22 -07:00
samcake
f6dc7eb746
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-04-13 10:08:33 -07:00
samcake
e4d3e848f6
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-13 10:05:06 -07:00
Zach Pomerantz
bce33a7157
Merge pull request #7651 from imgntn/editmodelsurl
...
Remove model url placeholder text from edit.js import
2016-04-12 17:50:45 -07:00
Howard Stearns
e5a55ed9e5
Merge pull request #7616 from PhilipRosedale/golfclub
...
Simple golfclub that makes and jumps to balls
2016-04-12 17:45:34 -07:00
samcake
0477f89b1b
Justing exposing the timer correctly
2016-04-12 17:05:23 -07:00
James B. Pollack
ab7f8f27fe
clear stuff from edit
2016-04-12 16:22:53 -07:00
samcake
49af41afca
Merging with master
2016-04-12 16:14:24 -07:00
Anthony J. Thibault
87cba810a7
remove away states from avatar-animation.json
...
away.js: prefetch the kneel animation, so it is available when we need it.
2016-04-12 15:37:31 -07:00
samcake
ff1df0d45e
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb
Trying something a bit more radical for timing
2016-04-12 15:29:31 -07:00
Anthony J. Thibault
8d7bf87d74
away.js: simplify kneel animation handling
...
Instead of manually setting anim vars to play the kneel animation
and enable/disable IK, use the MyAvatar.overrideAnimation() and
MyAvatar.restoreAnimtion() functions, which did not exist when
away.js was written. This should make it more robust and eliminate
the issue with IK being stuck in the disabled state.
2016-04-12 14:52:22 -07:00
Seth Alves
460fdc0761
Merge pull request #7536 from samcake/orange
...
First pass at using compressed format when uploading textures
2016-04-12 11:59:10 -07:00
samcake
042a419669
Adding counters, not sure they are really useful or that this is the best way to do this...
2016-04-12 02:44:10 -07:00
samcake
90fd9d77a5
Merging with Master
2016-04-11 18:34:14 -07:00
Philip Rosedale
aab93d8a26
fixes per code review
2016-04-11 10:46:22 -07:00
samcake
ef70d41cf4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-04-08 09:41:35 -07:00
James B. Pollack
b407e20e4b
remove regexp
2016-04-08 00:52:09 -07:00
James B. Pollack
fba6a74cf6
remove refresh for now
2016-04-08 00:50:15 -07:00
Seth Alves
723af9bcbd
host voxel icons on s3 rather than hungry.com
2016-04-07 20:34:34 -07:00
PhilipRosedale
61f4009b22
Simple golfclub that makes and jumps to balls
2016-04-07 18:03:45 -07:00
Brad Hefta-Gaub
d79d66c34e
Merge pull request #7601 from ctrlaltdavid/20871
...
Entities editor fixes
2016-04-07 17:14:00 -07:00
David Rowe
86d314f31a
Clarify code comment
2016-04-08 10:47:45 +12:00
Brad Hefta-Gaub
e7d75cb22e
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
...
Update collision hulls of avatar children
2016-04-07 14:47:44 -07:00
Seth Alves
45733478da
make auto-unequip code smarter -- equipping a long thing by the end is now possible
2016-04-07 13:15:39 -07:00
Brad Hefta-Gaub
dc4751a95b
Merge pull request #7595 from ZappoMan/depthReticleWork
...
Fix a random case of the depth reticle hiding when it shouldn't
2016-04-07 12:06:20 -07:00
David Rowe
fd7a6ed042
Fix checkbox being clickable outside of checkbox and label extents
2016-04-07 17:20:40 +12:00
Brad Hefta-Gaub
89a7b5f731
Merge pull request #7548 from ericrius1/roomAudio
...
Add examples for entity scripts that set up audio reverb zones
2016-04-06 19:09:09 -07:00
