sam
569378bdeb
REcompiling for windows...
2017-02-02 01:57:43 -08:00
sam
387621e586
Merge branch 'blue' of https://github.com/samcake/hifi into purple
2017-02-01 22:01:39 -08:00
sam
3aa239b004
More instrumentation during texture load
2017-02-01 22:00:03 -08:00
sam
2ecda8b64e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-01 18:03:07 -08:00
samcake
6bdf50f2db
moving mip map gen to cpu
2017-02-01 15:16:37 -08:00
Anthony J. Thibault
ffaf7a10e8
tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode.
2017-02-01 14:44:14 -08:00
samcake
edcba1b7c5
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
2017-02-01 10:12:47 -08:00
howard-stearns
6f4441028d
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-02-01 09:41:08 -08:00
Seth Alves
ab8be15ce0
Merge pull request #9570 from highfidelity/tablet-ui
...
Tablet ui
2017-02-01 09:38:13 -08:00
samcake
23af56c41f
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-01 09:27:21 -08:00
David Kelly
f25bbc9649
Merge pull request #9574 from howard-stearns/delete-failed-entity-adds
...
cleanly log failed entity adds, and tell the client to delete his copy
2017-02-01 10:12:17 -07:00
Brad Hefta-Gaub
0c7a181d33
Merge pull request #9573 from birarda/bug/whitelist-starts-with
...
drop empty parts when splitting script whitelist
2017-02-01 07:38:02 -08:00
Seth Alves
e7ec651bb1
Merge pull request #9576 from hyperlogic/bug-fix/tablet-ui-image-urls
...
tablet-ui: button icon images now work with http urls.
2017-01-31 21:03:05 -08:00
Anthony J. Thibault
cf855391af
Added jsdocs for all button properties
2017-01-31 16:54:15 -08:00
howard-stearns
e42853a96c
cleanly log failed entity adds, and tell the client to delete his copy
2017-01-31 16:05:38 -08:00
Stephen Birarda
d4a161041e
drop empty parts when splitting script whitelist
2017-01-31 15:32:47 -08:00
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
howard-stearns
18f8c2b866
comment
2017-01-31 13:31:33 -08:00
howard-stearns
8d8b338c66
dry up custom setters, per code review
2017-01-31 12:07:48 -08:00
Thijs Wenker
3608998877
use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership
2017-01-31 21:01:03 +01:00
Thijs Wenker
1a36d9a698
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:59:21 +01:00
samcake
c88d070868
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-01-31 11:49:25 -08:00
samcake
04d5173328
Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda
...
compute Model's local bounds outside pending changes queue
2017-01-31 11:40:21 -08:00
Thijs Wenker
e445af74aa
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:39:39 +01:00
Brad Hefta-Gaub
3bbb57599b
Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
...
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
howard-stearns
1ddc804e10
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-01-31 10:58:49 -08:00
samcake
0b139c906c
Assigniing default textures that make sense
2017-01-31 10:56:30 -08:00
Brad Hefta-Gaub
cff49ea5f3
Merge pull request #9556 from samcake/blue
...
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Brad Hefta-Gaub
c1834a033c
Merge pull request #9563 from birarda/entity-script-server
...
avoid recursion to unchanged octree elements with frustumless queries too
2017-01-31 09:40:20 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098
Merge pull request #9267 from AndrewMeadows/report-all-collision-events
...
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Brad Hefta-Gaub
6b97db66d5
Merge pull request #9458 from zzmp/audio/threaded-local
...
local audio bypass
2017-01-31 08:49:49 -08:00
Brad Hefta-Gaub
5287c94786
Merge pull request #9555 from huffman/fix/entity-is-child-of-crash
...
Fix Entities.isChildOfParent crashing if given unknown ID
2017-01-31 08:42:45 -08:00
Brad Hefta-Gaub
619bcdeed8
Merge pull request #9553 from huffman/fix/polyvox-import
...
Fix importing of PolyVox entities
2017-01-31 08:42:28 -08:00
Seth Alves
7d80679652
Merge pull request #9566 from sethalves/tablet-ui
...
Tablet ui
2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Brad Hefta-Gaub
87805fe4eb
Merge pull request #9559 from Atlante45/fix/animation-jitter
...
Fix animation jitter
2017-01-30 20:27:21 -08:00
Ken Cooke
2ce357db3a
Fix bug that causes GCC not to detect AVX2
2017-01-30 17:11:48 -08:00
Stephen Birarda
1b1ae48650
don't recurse on octree elements that have not changed
2017-01-30 17:01:45 -08:00
Thijs Wenker
c3f9663ab0
- Fix for simulation owned entities moving to 0,0,0 after cache reload
...
- Fix for simulation priority, use SCRIPT_GRAB_SIMULATION_PRIORITY in EntityItem::grabSimulationOwnership()
2017-01-31 01:25:59 +01:00
howard-stearns
fe8fe816f4
accept forced physics results from entity server (e.g., when filtered)
2017-01-30 16:14:40 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
samcake
249ec80d74
Writting a better version of the no texture case
2017-01-30 15:48:48 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
samcake
3c56bd2960
Adding support for disabling texturing from the material
2017-01-30 15:03:04 -08:00
Anthony Thibault
5a0990fbe4
Merge pull request #9550 from hyperlogic/tablet-ui2
...
tablet-ui -> master, PR feedback
2017-01-30 14:20:28 -08:00
Ryan Huffman
e58c9326a0
Fix Entities.isChildOfParent crashing if given unknown ID
...
If an entity was not in the local tree a null deref crash would occur.
This commit makes sure the entity pointer is checked for null before it is used.
2017-01-30 13:48:33 -08:00
Ryan Huffman
f553656e36
Fix importing of PolyVox entities
...
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
2017-01-30 13:33:42 -08:00