Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -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
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
Brad Davis
2cea593fbd
Remove RealSense & MIDI
2015-12-03 11:00:01 -08:00
Brad Hefta-Gaub
0c05ffe9ce
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 10:20:04 -08:00
Seth Alves
6eae98fb28
merge from upstream
2015-12-02 14:38:26 -08:00
Anthony Thibault
e0ca1c0f4c
Merge pull request #6496 from PhilipRosedale/master
...
Improved audio-driven mouth shapes
2015-12-02 14:20:20 -08:00
Howard Stearns
861393910a
Add an avatar LOD preference called "Minimum Avatar Display Distance"
2015-12-02 12:12:57 -08:00
Howard Stearns
38182bfd9d
Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements
...
MyAvatar::reset() improvements
2015-12-02 11:40:46 -08:00
Seth Alves
f18fc84c2d
fix debug build
2015-12-02 10:46:10 -08:00
Anthony J. Thibault
0b05a341a8
MyAvatar::reset() improvements
...
Body should not orient under the HMD body without changing the HMD view point.
It's more predictable and less likely to make you sick.
It also should reset the height of the character to cancel out squatting, if the HMD position is low.
2015-12-02 10:18:02 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Philip Rosedale
be2f14cae5
Review fix
2015-12-01 21:50:01 -08:00
Anthony J. Thibault
99065f10fa
Avatar Warning fixes on linux
2015-12-01 18:12:01 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b
Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball
2015-12-01 15:16:05 -08:00
Atlante45
f06b5b05b3
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-01 15:14:58 -08:00
Howard Stearns
455927204e
Merge pull request #6511 from hyperlogic/tony/avatar-sim-rate-display-fix
...
Avatar Sim Rate Display fix
2015-12-01 12:09:07 -08:00
Seth Alves
b8d800f5b8
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-01 11:59:10 -08:00
Atlante45
70dd8ec19a
Remove left/right relative pos/rot from c++
2015-12-01 11:44:42 -08:00
Seth Alves
7f95e1eec6
make sure observed held objects are active in bullet, disable equip spring action
2015-12-01 10:49:07 -08:00
Anthony J. Thibault
71f1be2b38
Avatar Sim Rate Display fix
...
Division by zero on first update was causing the displayed
avatar simulation rate to be incorrect.
2015-12-01 10:46:04 -08:00
Seth Alves
11f18c3ada
also make sure the holder doesn't end up with a static-in-bullet held object
2015-12-01 09:52:51 -08:00
