Commit graph

76291 commits

Author SHA1 Message Date
amer cerkic
95628dfc11 removing unused imports 2019-02-27 15:36:49 -08:00
amer cerkic
a425becc8a clean up of debugging 2019-02-27 15:35:33 -08:00
amer cerkic
29ec5486f6 manual pushing args to the app. Removed some debugging printouts 2019-02-27 15:31:23 -08:00
amer cerkic
8fff3476ec Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-27 11:45:49 -08:00
amer cerkic
92cfa49bfb adding and testing command line parameter passing to application 2019-02-27 11:42:22 -08:00
Sam Gondelman
fd46296e8c
Merge pull request #15037 from amerhifi/quest-demo
case 21447: fixed quest debug crash when a case of  _widths = 0 for polyline
2019-02-26 16:42:01 -08:00
amer cerkic
19d584f0af added Sams suggestions to the logic 2019-02-26 15:28:28 -08:00
amer cerkic
f5852139f7 fixing comment since the original check was correct 2019-02-26 15:05:58 -08:00
amer cerkic
5a7c8c3126 removed debugg helpers 2019-02-26 14:53:44 -08:00
amer cerkic
4c6bea48b2 fixed a case where _widths = 0 and widths-1 is not valid. 2019-02-26 14:48:34 -08:00
Sam Gateau
009bc19c5d
Merge pull request #15020 from amerhifi/quest-demo
Adding market place back to the default scripts
2019-02-26 11:05:36 -08:00
amer cerkic
acc78f2f42 Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-26 09:54:32 -08:00
Sam Gateau
f7e57ea56f
Merge pull request #14990 from jherico/quest/build
Case 20979: Build quest demo apk on Jenkins
2019-02-26 09:11:30 -08:00
amer cerkic
0775392759 adding market place back to the default scripts 2019-02-25 14:05:54 -08:00
Brad Davis
5831db3089 Build quest demo apk on Jenkins 2019-02-25 13:02:37 -08:00
Sam Gateau
0691f02198
Merge pull request #15010 from samcake/quest-demo
Case 21408:  Quest demo - Fixing the gamma correction
2019-02-25 11:36:29 -08:00
Sam Gateau
b563f21037 Fix comments 2019-02-25 09:32:27 -08:00
Sam Gateau
df6d8f3be0 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 21:31:28 -08:00
Sam Gateau
4ee2b43229 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 20:49:51 -08:00
Sam Gateau
26ad42b965 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 19:07:56 -08:00
Sam Gateau
f4a79a1e92 Mege with master the culling scale 2019-02-24 15:08:23 -08:00
Sam Gateau
ff5e9ee5d3
Merge pull request #14999 from amerhifi/quest-demo
case 21395: Adjust culling matrix
2019-02-24 14:51:13 -08:00
Sam Gateau
d6b2dba352 Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo 2019-02-23 09:57:23 -08:00
Sam Gateau
dab0df1113 Trying to fix the damn gamma 2019-02-22 18:03:23 -08:00
Sam Gateau
860b3a35e4
Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations
Quest demo with avatar ik optimizations
2019-02-22 16:32:24 -08:00
amer cerkic
5c1e5e0c46 cleanup 2019-02-22 16:30:17 -08:00
amer cerkic
5bf994626c scaling culling projection matrix by 1.5 to help reduce teh ugly effect of stuff getting cut off too early 2019-02-22 16:28:36 -08:00
Sam Gateau
f0c6acdbf6
Merge pull request #14998 from danteruiz/quest-demo
Start quest in quest-dev domain
2019-02-22 15:44:06 -08:00
Dante Ruiz
eedd54d0b1 Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo 2019-02-22 15:02:01 -08:00
Dante Ruiz
a87e49bb23 start in quest dev 2019-02-22 15:01:30 -08:00
amer cerkic
de821b5acc Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-22 13:42:20 -08:00
amantley
9b73c83ebc removed merge markers
(cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)
2019-02-22 11:55:14 -08:00
Sam Gateau
a49ec95638
Merge pull request #14988 from danteruiz/quest-demo
Case 21199: Fix borken shaders for forward rendering (quest)
2019-02-22 11:46:03 -08:00
amantley
87d98e5b85 These are the squashed commits for the ik optimization for the Quest
Implmented using a new AnimSplineIK node in the anim graph

(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
2019-02-22 11:21:36 -08:00
Dante Ruiz
109eb62886 requested changes 2019-02-22 11:09:40 -08:00
danteruiz
aa8563f3fe fix quest ui elements 2019-02-22 10:40:32 -08:00
amer cerkic
38272c3162 Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-22 09:56:07 -08:00
Sam Gateau
1d5a4116b9
Merge pull request #14986 from amerhifi/quest-demo
case 21374 : Away mode on Quest when device is paused
2019-02-22 09:54:57 -08:00
amer cerkic
72d3664b31 Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-22 09:50:41 -08:00
amer cerkic
9c833f7e64 clean up 2019-02-22 09:21:51 -08:00
amer cerkic
f04fdb2187 added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user 2019-02-22 09:11:24 -08:00
Bradley Austin Davis
65aca3afaf
Merge pull request #14979 from samcake/quest-demo
Case 21356:Fine tune the LOD manager max render target and world detail default for Quest / Tier Low
2019-02-21 16:45:19 -08:00
Sam Gateau
ab34deb55d
Merge pull request #14981 from jherico/quest/defaultdomain
Automatically go to quest-dev domain on startup
2019-02-21 16:44:26 -08:00
Brad Davis
ae6a73c710 Automatically go to quest-dev domain on startup 2019-02-21 16:42:47 -08:00
Sam Gateau
ddc42585d8 Cleanup syntax 2019-02-21 16:41:50 -08:00
Sam Gateau
94fc60f285 Bad idea to include global here 2019-02-21 16:34:50 -08:00
amer cerkic
9097d9c57c working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing. 2019-02-21 16:33:25 -08:00
Sam Gateau
fe33aadd69 Assigning the default world detail and max render rate target in vr quest 2019-02-21 14:58:06 -08:00
Sam Gateau
6f5d0b7191
Merge pull request #14975 from amerhifi/LifeCyclePause
case 21032: Life cycle pause
2019-02-21 12:16:44 -08:00
amer cerkic
52849101a2 Merge branch 'master' of https://github.com/amerhifi/hifi 2019-02-21 11:42:21 -08:00