samcake
363db8a834
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-08 11:52:18 -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
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
