Seth Alves
d036e0618d
don't build oculus-legacy plugin on linux
2016-03-12 07:54:59 -08:00
Brad Hefta-Gaub
c93ed7c6f7
Merge pull request #7321 from ctrlaltdavid/20829
...
Restyle HMD menus
2016-03-11 20:43:27 -08:00
Brad Hefta-Gaub
001cdfad38
Merge pull request #7331 from imgntn/consoleversion
...
Show Server Console Version
2016-03-11 20:34:36 -08:00
Howard Stearns
38338d7418
Merge pull request #7330 from ZappoMan/depthReticleWork
...
auto-show reticle on mouse click
2016-03-11 18:40:46 -08:00
Philip Rosedale
f87b9a963e
Merge pull request #7334 from hyperlogic/tony/third-person-camera-mouse-fix
...
Application: fix for mouse control in third-person camera
2016-03-11 18:03:24 -08:00
Anthony Thibault
9fb897476e
Application: fix for mouse control in third-person camera
...
Process the keyboard & mouse input plugin after the userInputMapper()->update().
2016-03-11 17:29:18 -08:00
James B. Pollack
42e3d0bdad
remove logging
2016-03-11 16:57:50 -08:00
Brad Hefta-Gaub
f9fca99b42
Merge pull request #7329 from howard-stearns/suppress-misleading-thread-warning
...
Remove logging that implies a problem that isn't there.
2016-03-11 16:34:46 -08:00
James B. Pollack
23fd2e93b5
add version number
2016-03-11 16:26:14 -08:00
David Rowe
8b9319b29e
Merge branch 'master' into 20829
2016-03-12 13:09:59 +13:00
David Rowe
3deb30d699
Remove no longer need font type
2016-03-12 13:06:29 +13:00
David Rowe
3bf1afb80b
HMD submenus not allcaps
2016-03-12 12:56:38 +13:00
David Rowe
9da64e540d
Add shortcut keys to HMD menu
2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5
Add separators to HMD menus
2016-03-12 12:29:52 +13:00
Philip Rosedale
7e581cc831
Merge pull request #7325 from hyperlogic/tony/smooth-hands
...
Smoother hand motion when using hand controllers
2016-03-11 15:08:59 -08:00
James B. Pollack
973022f0e1
version attempts
2016-03-11 14:51:36 -08:00
howard-stearns
fce8369708
Remove logging that implies a problem that isn't there.
2016-03-11 14:23:47 -08:00
James B. Pollack
e82fa70bb4
Merge branch 'master' into consoleversion
2016-03-11 13:49:08 -08:00
Anthony J. Thibault
0ce004c8a7
Removed passive-aggressive comment, (it was a late night)
2016-03-11 13:36:48 -08:00
Brad Hefta-Gaub
082bb8c4b8
auto-show reticle on mouse click
2016-03-11 12:49:42 -08:00
Chris Collins
ae596d79f1
Merge pull request #7317 from jherico/hmd_worn
...
Expose a property in display plugins to determine if the device is visible to the user
2016-03-11 11:46:06 -08:00
Brad Davis
75c3fd18c9
Expose HMD worn to scripting
2016-03-11 11:00:58 -08:00
Anthony Thibault
ab390f7d2e
Merge branch 'master' into tony/smooth-hands
2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594
Fix one frame lag controller lag/jitter
...
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39
Merge pull request #7286 from zzmp/fix/skybox-tex
...
Clean up skybox rendering
2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318
Merge pull request #7291 from ericrius1/uniformBugRepro
...
Rapid uniform change test
2016-03-11 08:45:52 -08:00
Brad Hefta-Gaub
9b89654d6a
Merge pull request #7312 from jherico/crashes
...
Better threaded handling of QML overlays
2016-03-11 08:45:08 -08:00
Brad Hefta-Gaub
d5c8e69c48
Merge pull request #7319 from samcake/red
...
Supporting RenderItems being added Outside the RenderSpatialTree volume
2016-03-11 08:34:50 -08:00
Seth Alves
510d96af0e
Merge pull request #7316 from ZappoMan/toggleOverlay
...
Repair Toggle Overlays
2016-03-11 06:45:06 -08:00
Seth Alves
0d15706f34
Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix
...
Stats: fix for avatar velocity stat being stuck at 0.1
2016-03-11 06:37:23 -08:00
samcake
8281e1bc8f
Obvioously, Austin was right, too many application.h...
2016-03-11 00:32:29 -08:00
samcake
729890342e
Fixing the linux warning for unused variable
2016-03-11 00:27:56 -08:00
Zach Pomerantz
755efd1840
Update test shaders
2016-03-10 23:03:03 -08:00
Brad Davis
4b20de264f
Merge pull request #7322 from imgntn/spatial
...
Change spelling of "spatial" in entity properties (edit.js)
2016-03-10 22:59:50 -08:00
Zach Pomerantz
2508b14126
Workaround for scribe not scrubbing #else
2016-03-10 22:53:21 -08:00
Zach Pomerantz
27884b26e9
Mark px shaders dirty on change
2016-03-10 22:53:07 -08:00
Zach Pomerantz
4dad797e20
Only add buffer/tex to skymap if asked for
2016-03-10 22:52:44 -08:00
Zach Pomerantz
25607709a5
Add test for skybox
2016-03-10 22:52:07 -08:00
James B. Pollack
aa884d9e3b
spatial
2016-03-10 22:45:44 -08:00
James B. Pollack
7ae9006b30
add current version to console menu
2016-03-10 22:42:53 -08:00
Zach Pomerantz
40378920b1
Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex
2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834
Merge pull request #7320 from zzmp/feat/shader-includes
...
Compile shaders into separate dir for inclusion
2016-03-10 21:07:49 -08:00
Zach Pomerantz
4eca43027a
Add texture, color to px skybox
2016-03-10 21:05:36 -08:00
Zach Pomerantz
243fbf8299
Specify and create shaders folder
2016-03-10 20:49:33 -08:00
Anthony J. Thibault
ab19d3e5a2
Moved animation after physics, hand poses are in world frame.
...
There are still some debug hacks enabled so I can test in the vive room.
2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d
Compile shaders to their own folders
2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
David Rowe
e175c19754
Style checkbox for menu items
2016-03-11 15:51:27 +13:00
David Rowe
fb0f97264c
Style HMD menu items
2016-03-11 15:24:35 +13:00
samcake
24d712b7b4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 18:14:22 -08:00
