Code

Feature/quest service 2#10

Code

Open

JulianGro wants to merge 59 commits intomasterJulianGro/vircadia:masterfrom feature/quest_service_2JulianGro/vircadia:feature/quest_service_2Copy head branch name to clipboard

Commits

Commits on Nov 28, 2018

• Fixing prebuild environment

  jherico

  committed
  f10885d

  Copy full SHA for f10885d

• More prebuild work

  jherico

  committed
  e914e33

  Copy full SHA for e914e33

• Add warning if HIFI_VCPKG_BASE is not set

  jherico

  committed
  ebdb748

  Copy full SHA for ebdb748

• Fix android build

  jherico

  committed
  333d06a

  Copy full SHA for 333d06a

• Fixes for building with Android NDK 18

  jherico

  committed
  4c1232f

  Copy full SHA for 4c1232f

• GPU state cleanup

  jherico

  committed
  0427e78

  Copy full SHA for 0427e78

• gpu::Batch serialization

  jherico

  committed
  96519aa

  Copy full SHA for 96519aa

• Santa Cruz

  jherico

  committed
  d9f5637

  Copy full SHA for d9f5637

• Refactor and modularize prebuild

  jherico

  committed
  3515b9c

  Copy full SHA for 3515b9c

Commits on Nov 29, 2018

• .

  jherico

  committed
  4d3f7a2

  Copy full SHA for 4d3f7a2

• .

  jherico

  committed
  6ed8679

  Copy full SHA for 6ed8679

• .

  jherico

  committed
  725737c

  Copy full SHA for 725737c

• .

  jherico

  committed
  dba67eb

  Copy full SHA for dba67eb

• .

  jherico

  committed
  ac69b19

  Copy full SHA for ac69b19

• .

  jherico

  committed
  b075c38

  Copy full SHA for b075c38

Commits on Nov 30, 2018

• adding missing gradle file

  jherico

  committed
  20714eb

  Copy full SHA for 20714eb

• Adding gradle wrapper

  jherico

  committed
  1c80fd5

  Copy full SHA for 1c80fd5

Commits on Dec 1, 2018

• .

  jherico

  committed
  53e5897

  Copy full SHA for 53e5897

Commits on Dec 2, 2018

• .

  jherico

  committed
  dcdaceb

  Copy full SHA for dcdaceb

• .

  jherico

  committed
  2e7cf12

  Copy full SHA for 2e7cf12

Commits on Dec 3, 2018

• .

  jherico

  committed
  178ba13

  Copy full SHA for 178ba13

Commits on Dec 6, 2018

• turning off IK. Removing override for hud operator function so that QML ui is visible

  

  Amer Cerkic

  committed
  6986861

  Copy full SHA for 6986861

• .

  jherico

  committed
  9e1e30f

  Copy full SHA for 9e1e30f

• QML file selection for android

  jherico

  committed
  be62cb4

  Copy full SHA for be62cb4

• Hack out QtWebEngine

  jherico

  committed
  4a46b59

  Copy full SHA for 4a46b59

• Merge pull request #7 from amerhifi/feature/quest

  Show description for 5c5ea01
  jherico

  authored
  5c5ea01

  Copy full SHA for 5c5ea01

Commits on Dec 7, 2018

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  df170a4

  Copy full SHA for df170a4

Commits on Dec 11, 2018

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  0210844

  Copy full SHA for 0210844

Commits on Dec 12, 2018

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  db21abd

  Copy full SHA for db21abd

Commits on Dec 14, 2018

• working tablet load'

  

  Amer Cerkic

  committed
  e10b3da

  Copy full SHA for e10b3da

Commits on Dec 18, 2018

• adding debugging info to help trace the ui issues

  

  Amer Cerkic

  committed
  1430000

  Copy full SHA for 1430000

• undo keyboardmouse input disable

  

  Amer Cerkic

  committed
  c2fdb5e

  Copy full SHA for c2fdb5e

Commits on Dec 20, 2018

• .

  jherico

  committed
  c2af916

  Copy full SHA for c2af916

• .

  jherico

  committed
  57688e3

  Copy full SHA for 57688e3

• Merge remote-tracking branch 'upstream/master' into feature/quest-amerQml

  jherico

  committed
  fa67f32

  Copy full SHA for fa67f32

• Merge remote-tracking branch 'upstream/feature/quest-amerQml' into feature/quest-amerQml

  jherico

  committed
  653729c

  Copy full SHA for 653729c

• working on porabola forward rendering shader

  

  Amer Cerkic

  committed
  cb53d56

  Copy full SHA for cb53d56

• Merge branch 'feature/quest-amerQml' of https://github.com/highfidelity/hifi into feature/quest-amerQml

  

  Amer Cerkic

  committed
  94cc1e8

  Copy full SHA for 94cc1e8

• .

  jherico

  committed
  256197a

  Copy full SHA for 256197a

• Merge remote-tracking branch 'upstream/master' into feature/quest-amerQml

  jherico

  committed
  2d598f9

  Copy full SHA for 2d598f9

• temp

  

  Amer Cerkic

  committed
  fca8b94

  Copy full SHA for fca8b94

• Merge branch 'feature/quest-amerQml' of https://github.com/highfidelity/hifi into feature/quest-amerQml

  

  Amer Cerkic

  committed
  3adda10

  Copy full SHA for 3adda10

• removed stuff for trying to link the ovr_platform. removed debug markers for controllers.

  

  Amer Cerkic

  committed
  b973295

  Copy full SHA for b973295

• undoing debug testing changes

  

  Amer Cerkic

  committed
  70b969c

  Copy full SHA for 70b969c

Commits on Dec 21, 2018

• Revert "Case 20200: Update EntityScriptingInterface to not find local entities"

  

  SamGondelman

  authored and

  jherico

  committed
  0c1c6fc

  Copy full SHA for 0c1c6fc

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  33816e8

  Copy full SHA for 33816e8

• Android interface updates

  jherico

  committed
  3bec84a

  Copy full SHA for 3bec84a

Commits on Dec 26, 2018

• Adding oculus platform SDK

  jherico

  committed
  f1b5814

  Copy full SHA for f1b5814

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  5877e96

  Copy full SHA for 5877e96

Commits on Dec 27, 2018

• Working audio input

  jherico

  committed
  477aae4

  Copy full SHA for 477aae4

• Dont auto-navigate to dev-mobile

  jherico

  committed
  db2533b

  Copy full SHA for db2533b

Commits on Dec 28, 2018

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  9a72c31

  Copy full SHA for 9a72c31

Commits on Jan 2, 2019

• Adding UI testing tools

  jherico

  committed
  ea10dfc

  Copy full SHA for ea10dfc

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  890bbc2

  Copy full SHA for 890bbc2

Commits on Jan 3, 2019

• Working on lifecycle

  jherico

  committed
  95b6658

  Copy full SHA for 95b6658

• Merge remote-tracking branch 'upstream/master' into feature/quest

  jherico

  committed
  17a588c

  Copy full SHA for 17a588c

Commits on Jan 4, 2019

• Fixing frame serialization

  jherico

  committed
  691e0bf

  Copy full SHA for 691e0bf

Commits on Jan 5, 2019

• .

  jherico

  committed
  dee12e8

  Copy full SHA for dee12e8

• .

  jherico

  committed
  fa8b81f

  Copy full SHA for fa8b81f