Seth Alves
|
c624528f72
|
Merge pull request #13157 from druiz17/fix-qml-crash
fix qml crash on start up
|
2018-05-11 11:38:12 -07:00 |
|
John Conklin II
|
5cd225e4de
|
Merge pull request #12947 from jherico/feature/splash2
Additional work on splash screen
|
2018-05-11 11:26:37 -07:00 |
|
Dante Ruiz
|
4eba727849
|
fix qml crash on start up
|
2018-05-11 10:47:41 -07:00 |
|
Zach Fox
|
a6dd95e31b
|
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose
don't enable so much logging when 'verbose logging' is turned on
|
2018-05-11 10:44:48 -07:00 |
|
John Conklin II
|
0991bf106d
|
Merge pull request #13155 from highfidelity/RC67.1
Beta Release 67.1 - branched at Developer Release 8260
|
2018-05-11 10:09:36 -07:00 |
|
Dante Ruiz
|
9e9852d67b
|
Merge pull request #12989 from Triplelexx/21774_file_browser
Worklist #21774: Fix Windows.browseAssets() bugs
|
2018-05-11 08:50:17 -07:00 |
|
John Conklin II
|
5866442bf6
|
Merge pull request #13156 from Zvork/RC67.1
Bug fix for Manuscript issue 15019 : "Translucent Model over Procedural SHader is broken"
|
2018-05-11 07:53:16 -07:00 |
|
Gabriel Calero
|
e838a85a47
|
Merge remote-tracking branch 'upstream/master' into android_places_goto
|
2018-05-11 09:13:41 -03:00 |
|
Olivier Prat
|
ff88911f93
|
Protected procedural skyboxes from NaNs and negative values returned by procedural shader
|
2018-05-11 12:26:03 +02:00 |
|
Olivier Prat
|
9e462e777c
|
Fixed compilation error with transparent procedurals
|
2018-05-11 11:01:24 +02:00 |
|
John Conklin II
|
b0d19bc08e
|
Merge pull request #13149 from SamGondelman/cherry-pick
RC67.1: Fixed procedural shaders
|
2018-05-10 23:47:16 -07:00 |
|
John Conklin II
|
e1e68c0dfa
|
Merge pull request #13153 from hyperlogic/bug-fix/vive-puck-calibration-fix-rc67
[RC67.1] Bug fix for Vive Tracker Calibration Settings
|
2018-05-10 23:46:51 -07:00 |
|
SamGondelman
|
de4a2ca3b2
|
update procedural skybox on user data change
|
2018-05-10 18:44:53 -07:00 |
|
NissimHadar
|
39e5b578f8
|
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
|
2018-05-10 18:08:18 -07:00 |
|
NissimHadar
|
1364f4391d
|
Can store JSON object.
|
2018-05-10 18:02:44 -07:00 |
|
Anthony J. Thibault
|
0ac12fa317
|
Bug fix for Vive Tracker Calibration Settings
This issue was inadvertently introduced by the name change of the Vive display plugin.
|
2018-05-10 17:56:54 -07:00 |
|
John Conklin II
|
4129664368
|
Merge pull request #13145 from highfidelity/stable
Merge RC67 stable into master
|
2018-05-10 17:07:20 -07:00 |
|
NissimHadar
|
480fa912ba
|
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
|
2018-05-10 17:05:59 -07:00 |
|
howard-stearns
|
bf26aec260
|
untabify
|
2018-05-10 16:39:56 -07:00 |
|
Cristian Luis Duarte
|
bd554f62d8
|
Merge remote-tracking branch 'hifi/master' into android_places_goto
|
2018-05-10 20:34:46 -03:00 |
|
howard-stearns
|
50a53a5174
|
fix lastEdited vs pal
|
2018-05-10 16:00:01 -07:00 |
|
Seth Alves
|
826c427e2a
|
trying to sort-out audio-stream logging
|
2018-05-10 15:42:59 -07:00 |
|
Olivier Prat
|
ec439086a2
|
Extended to other shaders
(cherry picked from commit 328f1dec9b)
|
2018-05-10 15:41:34 -07:00 |
|
Olivier Prat
|
29355ba8fb
|
Fixed procedural shaders
(cherry picked from commit eab7dd6006)
|
2018-05-10 15:41:04 -07:00 |
|
David Rowe
|
fab85c3f6d
|
Fix JSDoc function definitions specifying properties instead of params
|
2018-05-11 09:52:48 +12:00 |
|
Seth Alves
|
32d10641dc
|
don't enable so much logging when 'verbose logging' is turned on
|
2018-05-10 14:41:54 -07:00 |
|
John Conklin II
|
bc9e403ab9
|
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2
Use HMAC authentication for network packets - 2nd attempt
|
2018-05-10 14:38:18 -07:00 |
|
Gabriel Calero
|
a1a48d9b9e
|
Merge remote-tracking branch 'upstream/master' into android_places_goto
|
2018-05-10 18:24:26 -03:00 |
|
Gabriel Calero
|
b2bedc4099
|
Merge branch 'android_places_goto' of https://github.com/Cristo86/hifi into android_places_goto
|
2018-05-10 18:22:41 -03:00 |
|
Cristian Luis Duarte
|
f30908fb26
|
Android - Remove delay starting Home + Change default joystick flag
|
2018-05-10 18:21:33 -03:00 |
|
Gabriel Calero
|
c6f93a17eb
|
Fix freeze when quitting the app trough back button
|
2018-05-10 18:01:50 -03:00 |
|
John Conklin II
|
64d3219ee1
|
Merge pull request #12746 from gcalero/fix_radar_zoom_in
Android: Fix zoom in unresponsive in radar mode
|
2018-05-10 13:14:52 -07:00 |
|
Sam Gateau
|
fd9669b42d
|
Merge pull request #13125 from jherico/feature/testing
Working on improved unit testing, adding texture transfer testing
|
2018-05-10 12:29:43 -07:00 |
|
Triplelexx
|
a061e84ad7
|
remove unused commented code
|
2018-05-10 19:40:02 +01:00 |
|
Brad Davis
|
cb336bdeab
|
Fix linux build problems
|
2018-05-10 10:55:50 -07:00 |
|
John Conklin II
|
befb411f6e
|
Merge pull request #13025 from highfidelity/RC67
Beta Release 67 - branched at developer release 8181
|
2018-05-10 10:11:23 -07:00 |
|
Zach Fox
|
0236bc0c44
|
Cleanup after merge conflict
|
2018-05-10 09:51:45 -07:00 |
|
Zach Fox
|
ce575d367a
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-10 09:31:02 -07:00 |
|
NissimHadar
|
6c07f9554c
|
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
|
2018-05-10 09:13:15 -07:00 |
|
Seth Alves
|
4410402c7d
|
Merge pull request #13114 from sethalves/more-logging-suppression
more suppression of logging
|
2018-05-09 17:36:12 -07:00 |
|
Cristian Luis Duarte
|
cd3836883b
|
10 seconds timeout hides name
|
2018-05-09 19:27:03 -03:00 |
|
Zach Fox
|
44cfa95830
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-09 15:01:24 -07:00 |
|
John Conklin II
|
75164201d1
|
Merge pull request #13117 from SamGondelman/android
Test highp floats for Android
|
2018-05-09 14:36:51 -07:00 |
|
Simon Walton
|
9b6225db40
|
Bump default packet version 20 -> 21
|
2018-05-09 14:29:10 -07:00 |
|
Gabriel Calero
|
e0b57a2228
|
Code review in radar.js
|
2018-05-09 18:20:19 -03:00 |
|
MiladNazeri
|
bc03fb398f
|
Merge pull request #13102 from ctrlaltdavid/21856-h
Fix JSDoc for Users.requestUsernameFromID
|
2018-05-09 13:35:06 -07:00 |
|
Brad Davis
|
57691d5d66
|
Cache downloaded assets
|
2018-05-09 13:20:48 -07:00 |
|
Brad Davis
|
7fbad47351
|
Working on texture test
|
2018-05-09 13:20:48 -07:00 |
|
Brad Davis
|
1d403b4d67
|
Add texture transfer testing
|
2018-05-09 13:20:47 -07:00 |
|
Brad Davis
|
12ae44c14f
|
Remove debugging pragma
|
2018-05-09 13:20:47 -07:00 |
|