David Rowe
|
e339f966d9
|
Remove reference to a function no longer in the API
Noticed in passing.
|
2018-10-18 17:11:48 +13:00 |
|
David Rowe
|
1610d79023
|
Remove now redundant mouse pointer code that tried to do the same thing
|
2018-10-18 17:11:26 +13:00 |
|
David Rowe
|
c41ce5d484
|
Make tablet have priority over drawInFront overlays rendered behind it
|
2018-10-18 17:10:48 +13:00 |
|
David Back
|
f13008dbe9
|
tabs
|
2018-10-17 20:04:28 -07:00 |
|
David Back
|
6b5e616d2a
|
Merge branch 'master' into entityPropertiesRefactor
|
2018-10-17 20:01:15 -07:00 |
|
David Back
|
ad920ddc86
|
fix double min, unique collides subproperty ids
|
2018-10-17 19:44:38 -07:00 |
|
Thijs Wenker
|
b9cfa28c08
|
style fixes
|
2018-10-17 19:42:47 -07:00 |
|
Thijs Wenker
|
684f7d5689
|
move export selection button to bottom of the list
|
2018-10-17 19:37:56 -07:00 |
|
David Back
|
9e35af0c4a
|
remove space
|
2018-10-17 18:24:09 -07:00 |
|
David Back
|
9cd3c35cc6
|
style changes and fix hidden top row
|
2018-10-17 18:18:51 -07:00 |
|
SamGondelman
|
de4dff5202
|
fix highlight weirdness
|
2018-10-17 16:18:55 -07:00 |
|
John Conklin II
|
8e5bc1678f
|
Merge pull request #14219 from SamGondelman/materialCull
QueryAACube fixes and materials expand to include their parent
|
2018-10-17 15:15:23 -07:00 |
|
Clement
|
a7855dcf70
|
Only track stats for compatible packets
|
2018-10-17 15:13:29 -07:00 |
|
Wayne Chen
|
fd3c0d2f76
|
pushing with new fix
|
2018-10-17 15:03:09 -07:00 |
|
Roxanne Skelly
|
d4bc192be2
|
Fix for Case 19395
High Fidelity Console in client only install downloads default content assets for non-existent sandbox.
|
2018-10-17 14:09:55 -07:00 |
|
Sam Gondelman
|
3f117cd3e0
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:57:21 -07:00 |
|
NissimHadar
|
952ffe5d23
|
Updated link to Installer.
|
2018-10-17 13:36:53 -07:00 |
|
NissimHadar
|
abef242248
|
Updated user manual.
|
2018-10-17 13:33:25 -07:00 |
|
Brad Hefta-Gaub
|
0e0542ec6e
|
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
|
2018-10-17 13:29:20 -07:00 |
|
Sam Gondelman
|
e3543cf098
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:10:29 -07:00 |
|
Andrew Meadows
|
3b1b64b057
|
fix logic in readyToAnimate()
|
2018-10-17 11:45:39 -07:00 |
|
Andrew Meadows
|
da0d70af3f
|
don't use string comparison when polling for changed animation URL
|
2018-10-17 11:45:39 -07:00 |
|
Andrew Meadows
|
0c61779331
|
remove deprecated cruft; stub setAnimationURL() override
|
2018-10-17 11:45:39 -07:00 |
|
Andrew Meadows
|
148944814b
|
consolidate two bad string checks into one
|
2018-10-17 11:45:39 -07:00 |
|
David Back
|
001601d28f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
|
2018-10-17 11:30:10 -07:00 |
|
John Conklin II
|
7b226aa559
|
Merge pull request #14124 from SamGondelman/particle
Don't render particles without textures
|
2018-10-17 11:17:23 -07:00 |
|
John Conklin II
|
72c9f697ab
|
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
|
2018-10-17 11:16:28 -07:00 |
|
John Conklin II
|
e59e3720fe
|
Merge pull request #14139 from SamGondelman/animation
Fix various ResourceCache bugs
|
2018-10-17 11:13:35 -07:00 |
|
John Conklin II
|
eb088772d0
|
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
Fix "Good" collision not honoring mesh groups in OBJ files
|
2018-10-17 11:12:21 -07:00 |
|
Thijs Wenker
|
4ef2ad041b
|
Merge pull request #14136 from thoys/feat/create/exportSelection
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
|
2018-10-17 19:50:37 +02:00 |
|
SamGondelman
|
c5a94a415d
|
fix material entity opacity maps
|
2018-10-17 09:59:43 -07:00 |
|
John Conklin II
|
9f0b4fb437
|
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
|
2018-10-17 09:50:00 -07:00 |
|
David Back
|
c71deab5c4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
|
2018-10-17 09:04:20 -07:00 |
|
amantley
|
cd7af8b605
|
changed the name of sumuserheightsensorspace to averageuserheightSensorSpace
|
2018-10-17 08:51:40 -07:00 |
|
Sam Gondelman
|
cba4a4139a
|
fix compile error
|
2018-10-16 18:25:17 -07:00 |
|
Sam Gondelman
|
19fd7b5ac7
|
cr
|
2018-10-16 18:24:14 -07:00 |
|
amantley
|
baeccebfb9
|
changed the transition times to make the sit longer and the stand shorter
|
2018-10-16 17:45:55 -07:00 |
|
Anthony Thibault
|
27c495406e
|
Disable user hand controllers if they are too far away or not moving.
|
2018-10-16 17:24:47 -07:00 |
|
amantley
|
02f499e9f7
|
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
|
2018-10-16 16:56:10 -07:00 |
|
amantley
|
1764531822
|
removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr
|
2018-10-16 16:31:55 -07:00 |
|
Anthony Thibault
|
cd3bb1fad2
|
Merge pull request #14165 from luiscuenca/fixSmallStep
Increase velocity increments when the avatar is really small.
|
2018-10-16 16:31:13 -07:00 |
|
Anthony Thibault
|
7f102727f2
|
Merge pull request #14166 from luiscuenca/fixJumpWhenSmall
Allow avatar to fly when its scale is very small
|
2018-10-16 16:28:00 -07:00 |
|
amantley
|
cf7dc49499
|
removed a commment and changed the sanity check to be a const instead of a magic number
|
2018-10-16 16:04:31 -07:00 |
|
amantley
|
952b112271
|
changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing.
|
2018-10-16 15:10:26 -07:00 |
|
SamGondelman
|
a8a0671d6c
|
fix heap use after free
|
2018-10-16 15:00:19 -07:00 |
|
SamGondelman
|
49b496046b
|
queryAACube fixes
|
2018-10-16 14:35:39 -07:00 |
|
David Back
|
a2aa63e9ed
|
adjust no entities message
|
2018-10-16 14:28:52 -07:00 |
|
Simon Walton
|
0b77eb5e9c
|
Control UUID inclusion in avatar data with new param
Increase estimate of avatars to be sent; remove start/end segment
in avatar identity writes.
|
2018-10-16 14:25:38 -07:00 |
|
David Back
|
5ae4425729
|
Merge branch 'entityListTypeFilter' of github.com:dback2/hifi into entityListTypeFilter
|
2018-10-16 14:20:48 -07:00 |
|
David Back
|
58e8d4071d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
|
2018-10-16 13:52:27 -07:00 |
|