Brad Hefta-Gaub
d82edaa36e
implement support for larger message payloads
2017-02-12 13:33:07 -08:00
Seth Alves
107442eea0
avoid extra sends to localPosition
2017-02-12 11:56:38 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
Seth Alves
0c2abc9883
fix handling of an avatar's parent changing
2017-02-12 10:01:30 -08:00
Seth Alves
1164a1b3bf
some fixes for when an avatar is a child of something else
2017-02-12 08:27:39 -08:00
humbletim
9b0bee92d1
add executeOnScriptThread
2017-02-11 06:21:11 -05:00
humbletim
0f7652e173
* integrate with latest master
...
* consolidate emit entityScriptDetailsUpdated calls
* limit maxRetries to 1 when isEntityServerScript()
2017-02-11 06:00:31 -05:00
humbletim
831bf93500
* refactor ScriptCache per FIXMEs
...
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
David Rowe
77f0fb1491
Change the "Mute" tablet button to "Audio"
2017-02-11 22:40:19 +13:00
David Rowe
98c1a18326
Fix accumulating signal connections
2017-02-11 21:02:23 +13:00
samcake
13d1642ace
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-02-10 15:46:33 -08:00
David Kelly
8a7a3926c5
rest of issues w/linux and mac
2017-02-10 15:57:27 -07:00
samcake
2da1801fbf
Fixing the failing shader
2017-02-10 14:40:39 -08:00
David Kelly
9891d7b7d2
build issue on linux/mac
2017-02-10 15:24:58 -07:00
David Kelly
2996298e79
First bit of cleanup
...
consolidate to one map, some minor other cleaning. More coming.
2017-02-10 14:57:09 -07:00
Andrew Meadows
66a315cb9c
cap number of avatar entities
2017-02-10 13:14:20 -08:00
Andrew Meadows
c551a41e0a
restore exposure of setAvatarEntityData() to JS
2017-02-10 13:14:20 -08:00
Andrew Meadows
0e504e9ec6
make methods private: avoid sanity check logic
2017-02-10 13:14:20 -08:00
David Rowe
b5b92c1508
Make the tablet's mic icon reflect the current mute state
2017-02-11 09:53:02 +13:00
David Kelly
1c1b0d1332
oops, debugging left in
2017-02-10 13:16:52 -07:00
David Kelly
7ec27cab13
Use EntityItem.contains
...
Cuz it works - seemed like it was broken but nope. Also, trim off the
filters for zones that no longer are in the tree.
2017-02-10 12:47:48 -07:00
samcake
b9102204ea
FIx the filtering problem on color and normals introduced since we generate mips with QImage
2017-02-10 11:40:39 -08:00
David Kelly
cf780b3b73
fixed persist issue, working much better
2017-02-10 11:42:56 -07:00
Brad Hefta-Gaub
765500ebce
remove debug and fix bug in test script
2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4
some debugging
2017-02-10 09:18:04 -08:00
Zach Pomerantz
9b0f9e8d33
log full i/o stats
2017-02-10 04:32:42 -05:00
Brad Hefta-Gaub
6a4f66677e
Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages
2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4
implement support for binary data over messages
2017-02-09 20:41:34 -08:00
David Kelly
5ca80803c0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-09 20:01:43 -07:00
David Kelly
415d71956f
minor logging crap
2017-02-09 19:59:55 -07:00
David Kelly
8d666854c7
working it seems
...
But, AABox for zones isn't very helpful (box is _small). Time to use
the shape of the zone.
2017-02-09 15:39:38 -07:00
Atlante45
3a30de79aa
CR
2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2
Factor LogDialog
2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10
First draft for entity script server log streaming
2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f
Merge pull request #9603 from huffman/feat/trace-thread-script
...
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub
bc22326ec8
Merge pull request #9640 from ZappoMan/avatarSimulationStats
...
New stats for avatar simulation
2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub
57e0dadd65
CR
2017-02-09 11:35:00 -08:00
samcake
850be620f9
Merge pull request #9606 from samcake/blue
...
More intrumentation, Pixel Format clean up and minor improvments in texture transfers
2017-02-09 11:18:09 -08:00
Seth Alves
b34341b48e
Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos
...
Remove avatarEntityData cruft from settings
2017-02-09 10:40:00 -08:00
Ryan Huffman
026c68c7de
Merge pull request #9625 from huffman/fix/server-script-entity-updates
...
Fix Server Entity Script w/ high update rate causing issues
2017-02-09 10:07:32 -08:00
samcake
c62108c3c8
Resolve merging conflict
2017-02-09 09:49:59 -08:00
Seth Alves
2ec4f118fd
Merge pull request #9639 from hyperlogic/feature/tablet-pal
...
Ported PAL to tablet
2017-02-08 21:17:38 -08:00
Anthony J. Thibault
e25ad0f332
Fix debug assert in FBXReader.
2017-02-08 18:56:58 -08:00
Anthony J. Thibault
b3a46c3518
Bug fix for TabletProxy::loadQMLSource()
2017-02-08 18:56:16 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
samcake
e11d10f5d4
Reparing broken normals and also fixing the ambient lighting bug
2017-02-08 16:56:59 -08:00
Brad Hefta-Gaub
c2171ca08f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats
...
Conflicts:
libraries/avatars/src/AvatarData.h
2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub
6c41a25032
more stats
2017-02-08 16:51:00 -08:00
Brad Hefta-Gaub
b399420190
CR
2017-02-08 15:42:59 -08:00
David Kelly
ff7c9d3546
Working like before
...
Single entity script running properly. Now, need to add the zone
filters and execute them.
2017-02-08 15:36:16 -07:00
Brad Hefta-Gaub
07cf87749f
Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots
2017-02-08 13:41:33 -08:00
Ryan Huffman
f75eceda65
Add entity PPS per script configuration
2017-02-08 13:11:18 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
samcake
363db8a834
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-08 11:52:18 -08:00
Andrew Meadows
a871613f84
make Settings::remove() work for groups
2017-02-08 11:49:40 -08:00
samcake
267d553c26
Cleaning comments and pixel format assignments
2017-02-08 11:42:23 -08:00
samcake
9e95944195
clean the usage of glCopyImageSubData and provide a fall back for 4.2)
2017-02-08 11:36:34 -08:00
samcake
8a40e951ac
clean the usage of glCopyImageSubData and provide a fall back for 4.2)
2017-02-08 11:35:50 -08:00
samcake
a137659a35
Cleaning up pr for simpler merge
2017-02-08 11:13:55 -08:00
Dante Ruiz
7db86204d1
general function to load QML for javascript for tablet
...
(cherry picked from commit b50e20c545
2017-02-08 10:25:11 -08:00
David Kelly
c08adc9faa
and the new filter class
2017-02-08 10:51:28 -07:00
David Kelly
4821180dd3
Just add a pointer to the filter class
...
but do nothing with it
2017-02-08 10:48:26 -07:00
David Kelly
61e558e568
Entity Edit Filters for zones
...
Part 1 - just put them in the zones entities. Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07:00
Seth Alves
e1a3b0c551
Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos
...
In desktop mode create tablet near mouse click location.
2017-02-07 19:51:05 -08:00
samcake
7b49f548ed
trying to remove the 24bits formats
2017-02-07 18:06:49 -08:00
samcake
2975f73fc9
merging
2017-02-07 13:13:21 -08:00
samcake
24a3a514a4
Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size
...
Cap fbx texture size
2017-02-07 12:46:22 -08:00
Anthony J. Thibault
7d630f6c9a
Added Mat4.createFromColumns
2017-02-07 12:03:28 -08:00
Anthony J. Thibault
2952be5fc8
Added MouseX and MouseY axes to Keyboard device.
2017-02-07 12:02:41 -08:00
Zach Pomerantz
ff56eb24c8
Merge pull request #9537 from zzmp/audio/throttle-filter
...
Add injector/avatar attenuation to audio-mixer throttling
2017-02-07 20:57:43 +01:00
David Kelly
9788b4bdaf
Merge pull request #9601 from davidkelly/dk/deadlockPrevention
...
Minor cleanup
2017-02-07 12:56:03 -07:00
Chris Collins
d2feb4202b
Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes
...
send UserActivityLogger events when tablet is opened or closed
2017-02-07 08:23:09 -08:00
Anthony Thibault
caefb6c711
Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug
...
Fix for findEntities not returning some entities that are within range.
2017-02-06 20:22:34 -08:00
Chris Collins
194fd925cf
Merge pull request #9609 from sethalves/tablet-ui-fix-equipping
...
don't send AVATAR_SELF_ID over wire
2017-02-06 16:56:11 -08:00
Seth Alves
e3af5032c0
send UserActivityLogger events when tablet is opened or closed
2017-02-06 16:49:26 -08:00
Howard Stearns
1c7c0f7a76
Merge pull request #9617 from howard-stearns/physics-packets
...
Physics packets
2017-02-06 16:41:08 -08:00
Anthony J. Thibault
a14dcbd513
Fix for findEntities not returning some entities that are within range.
...
This bug has been around a long time... introduced by commit 39ed7f7b
2017-02-06 15:13:25 -08:00
Seth Alves
aaefc550f0
avoid bootstrapping self with something that has someone else as simulation owner
2017-02-06 14:16:47 -08:00
howard-stearns
12720cac32
Pass filter type as an int, with constants to compare against.
2017-02-06 13:36:45 -08:00
Ken Cooke
63c2aa1dfc
Remove obsoleted code
2017-02-06 12:55:03 -08:00
Ken Cooke
a77e4262e3
Remove obsoleted code
2017-02-06 12:47:28 -08:00
Andrew Meadows
8b1f569132
tweak max texture resolution thresholds
2017-02-06 12:13:31 -08:00
Seth Alves
2ea07390c8
when the parentID is changed by a network update, set physics flags
2017-02-06 12:10:26 -08:00
samcake
feb36b8dbf
Merge branch 'purple' of https://github.com/samcake/hifi into blue
2017-02-06 11:56:45 -08:00
samcake
af5593c7c6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-06 11:55:11 -08:00
Andrew Meadows
8b2c720e29
sliding texture caps for models
2017-02-06 11:53:37 -08:00
Andrew Meadows
d65cbbb455
name change: maxSize to maxNumPixels
2017-02-06 11:53:37 -08:00
Andrew Meadows
b3ae6f9aec
cap size of textures from FBX files
2017-02-06 11:53:37 -08:00
Andrew Meadows
24b1f3ddbc
cleanup whitespace
2017-02-06 11:53:37 -08:00
Andrew Meadows
45c73439eb
use type definition
2017-02-06 11:53:37 -08:00
howard-stearns
dacaa3df1d
Send new entity physics packet from physics simulation, accept in server,
...
and make it go through filter (when supplied) regardless of lock rights.
2017-02-06 11:12:18 -08:00
howard-stearns
8b44e83d9e
Add new EntityPhysics packet type.
2017-02-06 11:11:18 -08:00
Ken Cooke
49605d52e0
Remove debug code
2017-02-06 10:42:32 -08:00
samcake
9fd1d5114c
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
2017-02-06 10:16:41 -08:00
Ken Cooke
8033f932a6
Simulate 1% random packet-loss, for debug/test
2017-02-06 10:16:25 -08:00
Seth Alves
ab954412c1
if an entity has an avatar parent but ends up in EntityMotionState::setWorldTransform, ignore the update from bullet
2017-02-06 09:50:48 -08:00
Ken Cooke
4acb99cd4f
Use interpolated audio (codec packet-loss concealment) or zero samples (if no codec) when audio packets are lost. This audio is still processed by the audio pipeline to avoid clicks/pops.
2017-02-06 09:29:39 -08:00
samcake
c864e57855
first pass on a working image class and the mip generation
2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed
avoid assertion on mac
2017-02-03 22:49:41 -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
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
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
37de4aefa6
don't send AVATAR_SELF_ID over wire
2017-02-03 14:05:23 -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
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
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
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
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
1af7c9d95d
Merge branch 'blue' of https://github.com/samcake/hifi into purple
2017-02-02 10:09:36 -08:00
samcake
e77b920592
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-02 10:08:05 -08:00
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
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
3108360094
Merge branch 'blue' of https://github.com/samcake/hifi into purple
2017-02-01 16:36:40 -08:00
samcake
f34f1312ab
Few fixes
2017-02-01 15:53:49 -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
