Seth Alves
68de18a3bb
Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again
...
use tablet models from s3 until relative model urls work
2017-02-03 18:34:28 -08:00
Seth Alves
81bf5ee655
another AVATAR_SELF_ID adjustment
2017-02-03 16:47:03 -08:00
Seth Alves
ad83f20199
make findAncestorOfType understand AVATAR_SELF_ID
2017-02-03 16:43:36 -08:00
Dante Ruiz
dd8f095bd8
minimize diff
2017-02-04 00:36:41 +00:00
Seth Alves
22f9fc7061
don't call stepKinematicMotion on kinematic entities when they are children of avatars
2017-02-03 16:36:06 -08:00
Seth Alves
c7200d2d3a
make hasAncestorOfType understand AVATAR_SELF_ID
2017-02-03 16:14:15 -08:00
Dante Ruiz
0c28776ea2
some tweaks to users and menus got tablet
2017-02-04 00:13:39 +00:00
Seth Alves
174c674fd3
don't call stepKinematicMotion on kinematic entities
2017-02-03 15:50:59 -08:00
Seth Alves
9edaef82aa
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-fix-equipping
2017-02-03 15:42:26 -08:00
Seth Alves
9f04a72a38
Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order
...
tablet-ui: Added sortOrder property to buttons
2017-02-03 15:20:53 -08:00
Seth Alves
f635cd8a07
use tablet models from s3 until relative model urls work
2017-02-03 15:17:33 -08:00
Seth Alves
37de4aefa6
don't send AVATAR_SELF_ID over wire
2017-02-03 14:05:23 -08:00
Anthony J. Thibault
6738c0eade
More consistent haptics on web overlays and entities
2017-02-03 12:05:30 -08:00
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
Dante Ruiz
2a3d0b6b17
enforce more button clicking logic
2017-02-03 19:13:57 +00:00
Anthony J. Thibault
f8e6bd8c6b
Allow multiple instances to run if environment variable is set
...
If the environment variable HIFI_ALLOW_MULTIPLE_INSTANCES is present, the value is ignored,
then you can have multiple copies of interface running on the same machine.
2017-02-03 10:53:26 -08:00
Ryan Huffman
aba441ee14
Fix compilation issues
2017-02-03 10:11:51 -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
Ryan Huffman
55df6f8f76
Add tracing to ScriptEngine and EntitiesScriptingInterface
2017-02-03 09:45:33 -08:00
Ryan Huffman
ce9f8bed1b
Remove duplicate fps/downloads PROFILE_COUNTER
2017-02-03 09:41:48 -08:00
Ryan Huffman
9d4fdfa38a
Add Test.profileRange
2017-02-03 09:19:10 -08:00
Ryan Huffman
e181c2a16e
Add script_udpate_rate to trace
2017-02-03 09:19:03 -08:00
Ryan Huffman
f2638637f7
Add thread names to traces
2017-02-03 09:18:58 -08:00
Ryan Huffman
a5e61184bf
Add support for adding thread names to a trace
2017-02-03 09:18:51 -08:00
David Kelly
8612302f07
Revert "I like this better"
...
This reverts commit 069c85c7c2
2017-02-03 10:08:46 -07:00
David Kelly
069c85c7c2
I like this better
2017-02-03 08:52:33 -07:00
David Kelly
93fee0cf83
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/deadlockPrevention
2017-02-03 08:29:28 -07: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
samcake
b440ccad28
Improving the IMage class
2017-02-02 17:53:48 -08:00
Chris Collins
bac5bd5c0e
Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
...
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony Thibault
3a36410f7c
Merge pull request #9571 from hyperlogic/bug-fix/tablet-ui-no-domain
...
Tablet should work even when not connected to any domain.
2017-02-02 17:49:40 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Anthony J. Thibault
85e01e3922
tablet-ui: Added sortOrder property to buttons
...
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -08:00
Seth Alves
f40285c688
Merge pull request #9597 from druiz17/tabletStylus
...
better scrolling and fixed button touching
2017-02-02 16:56:13 -08:00
Anthony Thibault
be4fbb63cf
Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons
...
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-02 16:01:56 -08:00
Anthony Thibault
59b33bbc53
Merge pull request #9585 from sethalves/use-local-tablet-model
...
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -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
David Kelly
72153f6b3e
Merge pull request #9593 from howard-stearns/filter-gets-isAdd-argument
...
filter gets isAdd argument
2017-02-02 16:41:17 -07:00
Seth Alves
9dfaf3026b
Merge pull request #9591 from druiz17/master
...
fixed issue of tablets buliding up when flying fast
2017-02-02 15:21:29 -08:00
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00: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
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -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
