howard-stearns
2974241796
typo
2015-12-07 15:49:29 -08:00
Howard Stearns
289c8d6137
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 11:54:33 -08:00
Clément Brisset
42365acef5
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
...
More Cruft Removal
2015-12-07 11:39:54 -08:00
Howard Stearns
17ecf9b6b7
debugging
2015-12-07 11:26:56 -08:00
Howard Stearns
8303b63491
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 10:11:12 -08:00
Howard Stearns
1d4cc7c984
Checkpoint exploring use of getLastSynchronizedElapsed and fixing paintWait (which may go away).
2015-12-07 10:01:46 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Ryan Huffman
dd6c8cbe33
Remove verbose piggyback logging
2015-12-07 09:42:04 -08:00
Ryan Huffman
34138f07bd
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-07 08:58:47 -08:00
Atlante45
f8ee377f01
Fix QOpenGL warning
2015-12-07 08:37:07 -08:00
Clément Brisset
2ace061893
Merge pull request #6564 from sethalves/fix-line-overlays
...
fix 3d line overlays
2015-12-04 17:38:15 -08:00
Seth Alves
7448d9f262
Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters
...
Make Avatar::getJointRotation and getJointTranslation thread-safe
2015-12-04 16:45:56 -08:00
Anthony J. Thibault
7abfc93ff9
Avatar::getJointRotation and getJointTranslation is thread-safe
...
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
2015-12-04 16:16:17 -08:00
Seth Alves
817f0307a0
fix 3d line overlays
2015-12-04 15:51:19 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Brad Hefta-Gaub
2a243ccd17
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux
2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
46946212cf
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub
f44a9daa21
remove WANT_DELTA from OctreeQuery
2015-12-04 14:04:57 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Anthony Thibault
3118634df0
Merge pull request #6547 from howard-stearns/fix-anim-graph-preference-change
...
Fix anim graph preference change
2015-12-04 11:25:50 -08:00
Brad Hefta-Gaub
0ad4efeeb9
Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item
...
Remove unimplemented collision menu items
2015-12-04 11:25:08 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Howard Stearns
a0a4f7d177
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-anim-graph-preference-change
2015-12-04 11:08:44 -08:00
Howard Stearns
cb67f05103
Remove unimplemented menu items Developer->Avatar->Show Skeleton/Head Collision Shapes.
2015-12-04 10:47:27 -08:00
Brad Davis
90ef7c6bf7
Disabling 0.5 Oculus plugin (Mac / Linux) for now
2015-12-04 10:28:20 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Brad Davis
d8bb9f8d18
Fixing screenshot functionality
2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
49a7852d76
Merge pull request #6540 from Atlante45/warnings
...
Fix warnings on OS X
2015-12-04 10:19:25 -08:00
Brad Hefta-Gaub
8b58aa706a
Merge pull request #6534 from jherico/homer
...
Windows 64 bit updates
2015-12-04 10:05:45 -08:00
Atlante45
a455cb880f
Fix typeid warning
2015-12-04 09:23:16 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Clément Brisset
fa52b97f61
Merge pull request #6538 from ZappoMan/cruftRemoval
...
Cruft removal
2015-12-03 17:03:04 -08:00
Andrew Meadows
9c54ee2eaf
Merge pull request #6525 from howard-stearns/user-settable-avatar-lod-preference
...
Add an avatar LOD preference called "Minimum Avatar Display Distance"
2015-12-03 17:01:41 -08:00
Howard Stearns
187c213f41
reset skeleton
2015-12-03 16:42:57 -08:00
Brad Hefta-Gaub
1df24dd174
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval
2015-12-03 16:31:15 -08:00
howard-stearns
1b42c5a172
Make MyAvatar.get/setAnimGraphUrl take a url(!), and make setting it
...
actually do something.
2015-12-03 16:16:01 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
Howard Stearns
4a8649c202
Change get/setRenderDistanceLow/HighLimit and avatarRenderDistanceHighLimit to get/setRenderDistanceInverseLow/HighLimit and avatarRenderDistanceInverseHighLimit.
2015-12-03 14:23:16 -08:00
samcake
902b6b8ea1
Merge pull request #6506 from jherico/maggie
...
OpenGL class cleanup
2015-12-03 13:55:29 -08:00
Brad Hefta-Gaub
1a5bc5d111
removing optional compression
2015-12-03 12:40:24 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Brad Davis
2cea593fbd
Remove RealSense & MIDI
2015-12-03 11:00:01 -08:00
