samcake
5e3c79d197
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-21 14:49:52 -08:00
Brad Hefta-Gaub
a58ddad3aa
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub
a526db1779
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-21 14:18:36 -08:00
Brad Hefta-Gaub
2017ea4491
hacking on using sorted avatars for bandwidth budget
2017-02-21 14:18:00 -08:00
Seth Alves
8cf71ebc65
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-21 13:54:21 -08:00
howard-stearns
aff44d682e
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 13:45:25 -08:00
Stephen Birarda
10828d7534
Merge pull request #9692 from birarda/feat/es-get-children-parents
...
Give implicit access to family tree of server scripted entities in ESS
2017-02-21 13:17:46 -08:00
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Thijs Wenker
72eb797910
remove unused encoder (was for testing)
2017-02-21 20:22:29 +01:00
Thijs Wenker
13b2b6086f
Fix recorder.js playback in interface
2017-02-21 19:47:26 +01:00
Stephen Birarda
3b996f2b7f
bump packet version for new JSON query options
2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
ec8a95037d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-20 17:01:29 -08:00
Seth Alves
4a650ff2bb
Overlays::getOverlayAtPoint was depending on the order in which the overlays were added
2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub
598e79f697
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-19 13:29:37 -08:00
Brad Hefta-Gaub
66a6666b52
more cleanup, improved stats, port throttling
2017-02-18 12:29:01 -08:00
Brad Hefta-Gaub
42d916a719
fix warnings
2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub
291b823cfa
const cleanup and fix crash
2017-02-17 18:28:07 -08:00
Anthony J. Thibault
856a38af0c
Fix for audio, toolbar and tablet on macos.
2017-02-17 17:08:23 -08:00
Brad Hefta-Gaub
92ca7de0bf
some tweaks to support too large avatar data
2017-02-17 10:12:35 -08:00
Anthony J. Thibault
e4076e6244
warning fixes
2017-02-17 09:45:13 -08:00
Stephen Birarda
78301fd947
call getParentPointer when parent ID changes to update children
2017-02-16 16:46:09 -08:00
Stephen Birarda
d4119d5676
fix for non-void set of should force scene
2017-02-16 16:46:09 -08:00
Stephen Birarda
9d336a84ab
force a full scene send for new ancestors/descendants
2017-02-16 16:46:09 -08:00
Stephen Birarda
a3883a746c
add the basic structure for inclusion of ancestors/descendants in ESS queries
2017-02-16 16:46:09 -08:00
Anthony J. Thibault
cffdecbf68
Merge branch 'master' into feature/toolbar-tablet-switcheroo
2017-02-16 16:28:43 -08:00
Anthony J. Thibault
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Brad Hefta-Gaub
d49c83cac3
fix build buster, some tweaks
2017-02-16 14:19:14 -08:00
Brad Hefta-Gaub
d532b3a4b8
more work on multi-core
2017-02-16 13:25:51 -08:00
Anthony J. Thibault
5b1f150171
Fix for race condition when switching between Main Menu and Audio Menu
2017-02-16 12:52:46 -08:00
humbletim
b15956278c
separate out supporting changes into 21114-part2 branch
2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub
d22f4c1dd7
partial const migration work so mixer will not side-effect AvatarData
2017-02-15 21:29:03 -08:00
Brad Hefta-Gaub
65dbc6365d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-15 20:28:49 -08:00
Brad Hefta-Gaub
faa8e629a0
checkpoint
2017-02-15 20:28:32 -08:00
Stephen Birarda
a3c123818d
Merge pull request #9661 from Atlante45/fix/possible-race
...
Fix possible race condition
2017-02-15 18:38:01 -08:00
Anthony J. Thibault
03b6280ed0
Fix for empty toolbar issue
2017-02-15 16:50:08 -08:00
Anthony J. Thibault
67302cbd2b
toolbar work to better support tablet buttons
2017-02-15 15:53:08 -08:00
Brad Davis
127a014b46
Clear caches on domain switch
2017-02-15 15:21:08 -08:00
Anthony J. Thibault
ed11edad56
EventBridge support
2017-02-15 13:59:04 -08:00
David Kelly
5ec3bbde52
Merge pull request #9648 from davidkelly/dk/zoneFilters2
...
Zone Filters
2017-02-15 13:36:11 -07:00
David Kelly
f0e87360c1
don't capture a temporary by reference. Ugh
2017-02-15 12:37:00 -07:00
Clément Brisset
eba6a8f028
Merge pull request #9674 from Atlante45/fix/mac-macro
...
Fix SSE2 macros for Macs
2017-02-15 11:29:55 -08:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Zach Pomerantz
ed4f96eadd
Merge pull request #9646 from zzmp/load/audio/packets-in
...
log full i/o stats
2017-02-15 13:32:48 -05:00
Chris Collins
d1a236954b
Merge pull request #9673 from zzmp/audio/threaded-decode
...
Parallelize audio packet decoding in mixer
2017-02-15 09:44:42 -08:00
David Kelly
e6969321ca
fix for not properly filtering entity adds
2017-02-15 09:15:35 -07:00
Anthony J. Thibault
912e8aa04a
Tablet buttons now work in toolbar.
...
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
2017-02-14 15:37:24 -08:00
Anthony J. Thibault
4503923665
Initial version of TabletProxy.toolbarMode boolean
...
Copies all tablet buttons between the tablet and the system toolbar.
To test type this in the console:
Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
2017-02-14 15:36:03 -08:00
Anthony J. Thibault
5e25d073f3
WIP commit
2017-02-14 15:36:01 -08:00
Zach Pomerantz
2f52c09320
alphabetize io_stats
2017-02-14 23:17:11 +00:00
Zach Pomerantz
276c1abd0a
Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in
2017-02-14 23:06:36 +00:00
Atlante45
1201932ee9
Fix SSE2 macros for Macos
2017-02-14 14:10:53 -08:00
David Kelly
08d30608c7
remove debug logging
2017-02-14 14:28:20 -07:00
David Rowe
625f5efdf8
Merge branch 'master' into 21164
...
# Conflicts:
# scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Zach Pomerantz
6f2eb27572
rm debug in Deck.cpp
2017-02-14 20:46:27 +00:00
Zach Pomerantz
da5a89f582
move codec negotiation to client data
2017-02-14 20:46:27 +00:00
David Kelly
17acd8fa4f
I should just build on linux exclusively
2017-02-14 13:30:43 -07:00
David Kelly
342584b2a8
Filter failure mode updated
...
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.
Also - zone filters don't apply to the zone itself. Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
2017-02-14 13:05:12 -07:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
Seth Alves
ba025d44e0
Merge pull request #9642 from AndrewMeadows/beware-humbletim
...
fix performance problem for invalid "avatarEntityData"
2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-14 06:26:20 -08:00
Seth Alves
2e245e9cba
Merge pull request #9667 from huffman/fix/entity-scripts-not-loading
...
Fix entity scripts not loading in certain cases
2017-02-14 06:20:29 -08:00
Seth Alves
30c46b89a0
Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect
...
Removed ColorOverlay from TabletButton, added more icon & text states
2017-02-14 06:16:59 -08:00
howard-stearns
487adc7f18
whitespace
2017-02-13 16:35:03 -08:00
Anthony J. Thibault
1c783031b1
Removed ColorOverlay from TabletButton, added more icon & text states
...
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.
* icon
* hoverIcon
* activeIcon
* activeHoverIcon
* text
* hoverText
* activeText
* activeHoverText
Updated scripts to set new button states, if necessary.
2017-02-13 15:09:46 -08:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
David Kelly
156e365eff
update version
...
since new property was added, things will appear broken if this
version is used with old version (server or client).
2017-02-13 15:02:31 -07:00
howard-stearns
6241889e38
lastEditedBy is set by add/edit, but not by physics packets
2017-02-13 13:47:20 -08:00
Seth Alves
3d7633a11f
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-13 13:44:05 -08:00
Seth Alves
5ee484a592
don't send avatar localPosition unless the avatar has a parent, even if sendAll is true
2017-02-13 13:36:07 -08:00
Atlante45
a1371a4f06
Fix possible race
2017-02-13 13:20:31 -08:00
Seth Alves
b333126cbe
avoid sending localPosition for avatars with no parent
2017-02-13 12:20:07 -08:00
samcake
f4ff5cf746
Merge pull request #9647 from samcake/ambient
...
Fix the filtering problem on color and normals
2017-02-13 09:41:57 -08:00
David Kelly
d9319c2c2c
Merge branch 'dk/zoneFilters2' of https://github.com/davidkelly/hifi into dk/zoneFilters2
2017-02-13 10:23:48 -07:00
David Kelly
92ee823ef3
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-13 10:22:42 -07:00
Seth Alves
27d55d6ff0
bump avatar-mixer protocol version
2017-02-13 07:30:33 -08:00
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
9261e81ba2
Cleaning up the interface
2017-02-10 17:47:56 -08:00
samcake
c58330b09f
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-10 16:12:08 -08: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
samcake
37541e4ed2
Start capping the time budget for draw opaque
2017-02-10 14:29:29 -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
