Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-26 00:32:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68040 commits 28 branches 28 tags 1.2 GiB
Commit graph

68040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
ff88911f93 Protected procedural skyboxes from NaNs and negative values returned by procedural shader 2018-05-11 12:26:03 +02:00
David Rowe
e255fa3863 JSDoc typos 2018-05-11 21:08:57 +12:00
David Rowe
496154fdbe File API JSDoc stubs 2018-05-11 21:07:12 +12:00
Olivier Prat
9e462e777c Fixed compilation error with transparent procedurals 2018-05-11 11:01:24 +02:00
David Rowe
42d0620fd1 EntityViewer API JSDoc stubs 2018-05-11 20:56:00 +12:00
David Rowe
fb175d7110 AudioEffectOptions API JSDoc stubs 2018-05-11 20:36:10 +12:00
David Rowe
3891ebe703 Agent API JSDoc stubs 2018-05-11 20:20:07 +12: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
Thijs Wenker
e24523a29e updated eslint config to be more sorted and complete 2018-05-11 01:48:13 +02: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
RebeccaStankus
cb4d9586fe
Update edit.js 2018-05-10 11:41:14 -07:00
Triplelexx
a061e84ad7 remove unused commented code 2018-05-10 19:40:02 +01:00
RebeccaStankus
0685201b68
Merge branch 'master' into edit-bug-14671 2018-05-10 11:40:00 -07: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
vladest
a3f8148165 Added enable disable shadows menu 2018-05-10 12:40:13 +02:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
vladest
399e18dfc1 Disable non implemented sound notifications until further notice 2018-05-10 10:28:48 +02:00
David Back
5aab88be06 assert 2018-05-09 19:10:56 -07:00
David Back
1aa653c5db tabs 2018-05-09 18:20:07 -07:00
David Back
7738a2bcdd Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-09 18:12:46 -07:00
David Back
dea588ae4a remove prints 2018-05-09 18:12:04 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -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