Brad Davis
888758fc21
Fix test for specific Oculus version
2016-04-19 18:13:12 -07:00
Andrew Meadows
a9cfb5bf16
fix linux build
2016-04-19 18:12:35 -07:00
howard-stearns
a7d2373f3e
Use our ShutdownEventListener utility in Interface, and absorb quit
...
signal when we handle it.
2016-04-19 16:17:39 -07:00
Anthony J. Thibault
506033a5d8
Remove old avatar-animation.json
2016-04-19 16:14:26 -07:00
Anthony J. Thibault
8e5785cdf8
Avatar animations are now stored locally
...
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
2016-04-19 16:11:14 -07:00
Zach Pomerantz
4dacb04ee1
Rm myAvatar motion states on shutdown
2016-04-19 16:01:55 -07:00
David Rowe
54b032f612
Merge branch 'master' into 20872
2016-04-20 08:51:53 +12:00
Howard Stearns
cbb76013c4
Merge pull request #7710 from ZappoMan/LODtweaks
...
tweaks to LOD behavior
2016-04-19 13:50:21 -07:00
Ryan Huffman
c0a5c8bb18
Merge pull request #7678 from birarda/mixer-sleeps
...
use a steady clock for mixer timings
2016-04-19 12:59:53 -07:00
Ryan Huffman
92339bf5fc
Merge pull request #7701 from birarda/udt-fixes
...
use nextPacketTimestamp to catch up, not stay ahead
2016-04-19 12:57:43 -07:00
samcake
4c2cdc8704
A bit more clean up
2016-04-19 12:46:56 -07:00
samcake
71edae6d76
Removing the different versions of stereo drawcall to make a simple PR
2016-04-19 12:38:33 -07:00
samcake
3dad4f576e
Merging with master
2016-04-19 11:59:44 -07:00
Brad Hefta-Gaub
c7ecbb6b4b
tweaks to LOD behavior
2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
Brad Davis
882267e08f
Merge pull request #7709 from samcake/blue
...
Introduce Shader Compilation versions
2016-04-19 11:14:22 -07:00
Brad Hefta-Gaub
d88185eb6c
Merge pull request #7703 from zzmp/fix/gl-qml
...
Set GL in QML immediately
2016-04-19 11:11:27 -07:00
samcake
474d667f27
One more uneeded change
2016-04-19 11:03:35 -07:00
samcake
28521aa66a
REmoving uneeded changes
2016-04-19 11:01:41 -07:00
samcake
21b0341e50
REmoving extra cruff
2016-04-19 10:51:44 -07:00
samcake
a997f9bb1b
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-19 10:49:53 -07:00
samcake
1a154bb3be
Revert the changes to use SSAO AND 2 buffers
2016-04-19 10:47:54 -07:00
Zach Pomerantz
fc61f85bf9
Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback
...
Added MyAvatar onLoadComplete Callback
2016-04-19 10:36:20 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd
Merge pull request #7697 from samcake/orange
...
Introduce a simple state sort for drawing opaque items
2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
d16750c590
Merge pull request #7681 from hyperlogic/tony/character-controller-leak-fix
...
Memory leak on exit for CharacterController
2016-04-19 07:51:08 -07:00
Brad Hefta-Gaub
c41b320d40
Merge pull request #7706 from zzmp/fix/text3d-font
...
Fix text3d to allow transparent text
2016-04-19 07:50:36 -07:00
Brad Hefta-Gaub
b0f3b24caa
Merge pull request #7699 from OmegaHeron/gcc53
...
Gcc53
2016-04-19 07:34:24 -07:00
Brad Hefta-Gaub
8f19eba5c2
Merge pull request #7685 from zzmp/debug/sub
...
Add sub to Debug Counter
2016-04-19 07:27:49 -07:00
Brad Hefta-Gaub
523d365ce7
Merge pull request #7680 from Atlante45/fix/clear-atp-cache
...
Don't use invalidated iterators
2016-04-19 07:24:07 -07:00
Brad Hefta-Gaub
2780ade3bd
Merge pull request #7686 from zzmp/clean/bufferview
...
Consolidate BufferView ctors to cpp
2016-04-19 07:21:57 -07:00
Brad Hefta-Gaub
49e0a649e9
Merge pull request #7695 from huffman/fix/installer-prompt-name
...
Fix application names in installer prompt
2016-04-19 07:20:21 -07:00
Brad Hefta-Gaub
8eff47f922
Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix
...
Fix for laggy avatar attachments
2016-04-19 07:15:38 -07:00
Anthony Thibault
4708cc9400
Added license to disableAvatarAnimations.js
2016-04-18 19:42:05 -07:00
samcake
7c7cd6e9e5
Go simple with a a true map for the unifrom mappings
2016-04-18 19:05:49 -07:00
samcake
4bbe0ddc6d
Go simple with a a true map for the unifrom mappings
2016-04-18 19:01:15 -07:00
samcake
85fd1dcb5b
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2016-04-18 18:25:16 -07:00
samcake
cadb53b703
Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more
2016-04-18 18:24:27 -07:00
Omega Hereon [J.L.]
647e991b05
Merge remote-tracking branch 'upstream/master' into gcc53
2016-04-19 01:14:00 +00:00
Brad Hefta-Gaub
a572ac31dc
Merge pull request #7704 from samcake/lemon
...
Exposing the CPU TIming of the Render Jobs to the JS API
2016-04-18 18:12:14 -07:00
Omega Hereon [J.L.]
64f6a59bb3
Merge remote-tracking branch 'upstream/master' into gcc53
2016-04-19 01:11:35 +00:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
5ae1e70197
Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests
...
Added avatar unit tests
2016-04-18 18:03:29 -07:00
Brad Hefta-Gaub
0a79b5dd69
Merge pull request #7707 from huffman/fix/osx-default-script-dir
...
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776
Merge pull request #7682 from zzmp/clean/stars
...
Cleanup stars to persist a single BufferView
2016-04-18 17:59:48 -07:00
David Rowe
47b4c36546
Merge branch 'master' into 20872
2016-04-19 12:56:55 +12:00
David Rowe
99d9378ffd
Fix entity list header and footer text sometimes disappearing
2016-04-19 12:51:13 +12:00
Zach Pomerantz
b11d6ca1c6
Make Render Rates qml script
2016-04-18 17:43:34 -07:00
Zach Pomerantz
f48541961d
Expose Rates to JS/QML
2016-04-18 17:43:34 -07:00
Zach Pomerantz
6d7f8f4a6f
Make RateCounter rate atomic
2016-04-18 17:42:45 -07:00
