samcake
27dab5c4ba
COmbining more intrumentation, mip generation on cpu and an improved blit for the derez case
2017-02-03 12:03:59 -08:00
samcake
6e3c58faf4
Merge branch 'cap-fbx-texture-size' of https://github.com/AndrewMeadows/hifi into blue
2017-02-03 11:29:41 -08:00
Andrew Meadows
56911bdf1b
sliding texture caps for models
2017-02-03 11:14:40 -08:00
Ryan Huffman
1ddafa3cee
Merge pull request #9584 from birarda/bug/freeze-dont-move
...
don't auto-bid for sim ownership on entity creation in ESI
2017-02-03 10:08:48 -08:00
samcake
87e2936a05
Merge pull request #9592 from samcake/blue
...
Adding instrumentation for traces regarding Image and texture loading and preparation
2017-02-02 22:16:07 -08:00
sam
c4ec0cc069
fixing a bad cDebug
2017-02-02 22:09:52 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Seth Alves
998fbfb909
Merge pull request #9596 from sethalves/fix-equip-from-other-pov
...
fix -- don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 15:49:10 -08:00
Seth Alves
6b44f62982
don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 14:20:21 -08:00
Andrew Meadows
2f8823d103
name change: maxSize to maxNumPixels
2017-02-02 14:09:47 -08:00
Andrew Meadows
64dbfd0819
cap size of textures from FBX files
2017-02-02 13:38:08 -08:00
Andrew Meadows
b4cef787d9
cleanup whitespace
2017-02-02 13:38:08 -08:00
Andrew Meadows
6dc2cee95d
use type definition
2017-02-02 13:38:08 -08:00
howard-stearns
4499a92a82
filter gets isAdd argument
2017-02-02 13:07:08 -08:00
samcake
446aaf3bce
Turn off cpu mip map to add instrumentation to master
2017-02-02 11:58:02 -08:00
samcake
e77b920592
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-02 10:08:05 -08:00
sam
3aa239b004
More instrumentation during texture load
2017-02-01 22:00:03 -08:00
Howard Stearns
4c9d8199b7
Merge pull request #9588 from zfox23/PAL_FixIdentityChangeSpam
...
PAL: Fix Spam upon Identity Change
2017-02-01 20:23:03 -08:00
Anthony J. Thibault
de55a5dfe6
tablet-ui: reduced volume of button click
2017-02-01 18:47:50 -08:00
Zach Fox
5ea3c5dffd
Skipped this line
2017-02-01 18:13:24 -08:00
sam
2ecda8b64e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-01 18:03:07 -08:00
Zach Fox
4af5118654
First pass
2017-02-01 17:04:21 -08:00
Stephen Birarda
823d74d2d4
don't auto-bid for sim ownership on entity creation in ESI
2017-02-01 16:53:37 -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
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
Anthony J. Thibault
e2e19884bb
Tablet should work even when not connected to any domain.
...
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.
I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.
There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08: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
