ericrius1
19cd3ec152
checkboxes working
2016-02-17 13:12:17 -08:00
ericrius1
94fdf6b091
checkboxes working
2016-02-17 11:59:14 -08:00
ericrius1
f85916e808
checkbox keeps getting checked...
2016-02-17 10:27:53 -08:00
ericrius1
0f8f67ef0b
removing dynamic. need to add others
2016-02-16 19:34:32 -08:00
ericrius1
168fb67d67
making collidesWith a checkbox
2016-02-16 18:19:12 -08:00
ericrius1
7a3443968d
added collides with property
2016-02-16 15:55:11 -08:00
Chris Collins
05b9d88f08
Merge pull request #7108 from imgntn/moreprecision
...
More precision for edit.js
2016-02-16 15:03:10 -08:00
Andrew Meadows
80aee563fc
Merge pull request #7119 from sethalves/fix-linux-local-scriptnames
...
filenames on Linux are case-sensitive
2016-02-16 13:27:14 -08:00
samcake
a5b72bcbba
Merge pull request #7121 from AndrewMeadows/drawstatus-false
...
init debug octree rendering to be false
2016-02-16 12:15:29 -08:00
Andrew Meadows
fd8073f6b5
init drawstatus to false
2016-02-16 12:11:19 -08:00
Andrew Meadows
f932999b2c
Merge pull request #7113 from zzmp/rm/draw-on-hud
...
Remove drawOnHUD property from 3d overlays
2016-02-16 09:44:05 -08:00
Andrew Meadows
7dbb42c339
Merge pull request #7109 from zzmp/fix/edit-image-color
...
Remove image color in edit.js
2016-02-16 09:27:06 -08:00
Andrew Meadows
492c026f78
Merge pull request #7102 from zzmp/fix/model-tex-revert
...
Revert model texs when unset
2016-02-16 09:25:40 -08:00
Chris Collins
ad6b563130
Merge pull request #7116 from samcake/red
...
Fixing the rendering of the avatar skeleton
2016-02-16 09:22:20 -08:00
Andrew Meadows
3160776d65
Merge pull request #7089 from zzmp/fix/overlay-property-scene-updates
...
Update the scene on overlay3d updates
2016-02-16 09:21:57 -08:00
Seth Alves
164d5d9c7e
try, try again
2016-02-16 01:13:37 -08:00
Seth Alves
f2c9bbc32d
filenames on Linux are case-sensitive
2016-02-16 00:39:54 -08:00
samcake
29bacd23df
Fixing the rendering of the avatar skeleton
2016-02-15 18:56:46 -08:00
Anthony Thibault
6eda7aac6a
Merge pull request #7106 from AndrewMeadows/tighter-capsule
...
tighter bounding capsule for avatars
2016-02-15 17:16:43 -08:00
Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
Zach Pomerantz
8c01d5f82b
Remove camera tool's 3d hud overlays
2016-02-15 14:03:57 -08:00
Zach Pomerantz
fe6314c388
Merge branch 'fix/overlay-property-scene-updates' of github.com:zzmp/hifi into wip
2016-02-15 14:03:41 -08:00
Chris Collins
bf52d30216
Merge pull request #7107 from ericrius1/spraypaintFix
...
Fix for spraypaint orientation
2016-02-15 13:45:12 -08:00
Zach Pomerantz
8feace62b7
Conform text3d initializers to coding standard
2016-02-15 13:05:19 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Zach Pomerantz
01309ffd5f
Add resort for scene item keys
2016-02-15 13:02:29 -08:00
Zach Pomerantz
452b6f4e59
Fix opacity check for Overlay ItemKey
2016-02-15 13:02:29 -08:00
Zach Pomerantz
f2b716f90a
Alias text3d's backgroundAlpha to alpha
...
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
2016-02-15 13:02:29 -08:00
Brad Hefta-Gaub
4faeea7c3f
Merge pull request #7056 from samcake/red
...
Render Scene Octree : A Minute of Arc
2016-02-15 12:49:38 -08:00
Zach Pomerantz
b8e8859761
Remove image color in edit.js
...
This removes the warning generated by ImageOverlay.qml
for the unhandled property, color.
2016-02-15 11:51:11 -08:00
James B. Pollack
72186f916c
more precision
2016-02-15 11:35:28 -08:00
ericrius1
80a368933f
Fix for spraypaint orientation
2016-02-15 11:13:06 -08:00
Zach Pomerantz
0e9d696859
Cache renderable model orig texs as QVariantMap
2016-02-15 11:09:10 -08:00
samcake
0c0089f736
REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines
2016-02-15 11:08:12 -08:00
Andrew Meadows
d6a716a1aa
only head and torso for bounding capsule radius
2016-02-15 10:29:29 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
Brad Hefta-Gaub
376c23f1a3
Merge pull request #7100 from imgntn/edit_props
...
Hide hyperlink property for web entities
2016-02-12 18:29:35 -08:00
Brad Davis
b5cba79f0c
Merge pull request #7095 from ZappoMan/hmdHacking
...
Various bug fixes in related to HMD overlay support
2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
48fe638312
Merge pull request #7104 from howard-stearns/update-orbitingSound
...
update-orbitingSound.js
2016-02-12 17:44:47 -08:00
Brad Hefta-Gaub
c699c828cd
Merge pull request #7092 from birarda/assets-abs-path
...
add setting to DS for asset path, handle absolute paths
2016-02-12 17:43:23 -08:00
Howard Stearns
9a3972c43f
wait for sound to download
2016-02-12 17:42:44 -08:00
Brad Hefta-Gaub
e003fe5f4b
Merge pull request #7081 from zzmp/fix/mini-mirror-ao
...
Disable AO in mini mirror
2016-02-12 17:37:45 -08:00
Andrew Meadows
6baf181453
Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space
...
Controller Pose values are relative to Avatar.
2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9
Merge pull request #7103 from jherico/render-rate
...
Don't drop to half the vsync rate when we can't keep up
2016-02-12 17:11:03 -08:00
samcake
21c9b74a68
Cleaning up performance timers which are taking too much time...
2016-02-12 17:07:53 -08:00
samcake
bcd7876f6c
adding better performance stats
2016-02-12 16:53:24 -08:00
Andrew Meadows
33d49fecaf
Merge pull request #7085 from kencooke/master
...
Added AVX detection for Mac/Linux
2016-02-12 16:50:36 -08:00
Brad Davis
df225afd05
PR feedback
2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e
some CR feedback
2016-02-12 16:13:12 -08:00
Chris Collins
8317914070
Merge pull request #7097 from jherico/menuCleanup
...
Don't leave user data pointers around in objects after deletion
2016-02-12 16:12:20 -08:00
