Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 10:38:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
67510 commits 75 branches 59 tags 1.2 GiB
Commit graph

24997 commits

Author SHA1 Message Date
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
luiscuenca
12f578c93c More fixes 2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
Stephen Birarda
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
samcake
32e83c256a Adjusting the task::Engine run signature to appease gcc gods and other warnings 2018-04-25 12:23:30 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856 
Docs to JSDoc
 2018-04-25 11:36:34 -07:00
samcake
5b5cad38e8 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 10:03:42 -07:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7 Avatar Scripts 2018-04-24 18:43:53 -07:00
samcake
f2c76abafa Apply the noAA /popJittering on the WebOverlay 2018-04-24 14:18:44 -07:00
Brad Hefta-Gaub
497c3fac4d
Merge pull request #12971 from Atlante45/fix/crashes-hotfix 
Add memory corruption crash handler
 2018-04-24 14:01:09 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
Clement
0804abcca6 Heap corruption crashes CR 2018-04-24 12:47:13 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash 
Attempt to shutdown web surfaces more consistently
 2018-04-24 10:15:25 -07:00
Brad Davis
a144de54e7 Attempt to shutdown web surfaces more consistently 2018-04-24 10:06:20 -07:00
Sam Gateau
f50b2fab2b Exposing timing and regulated radiuses 2018-04-23 22:38:50 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
David Rowe
98f43b6a70 Interim JSDoc for MyAvatar - stubs for remainder 2018-04-24 10:47:33 +12:00
John Conklin II
5cf93ebd1f
Merge pull request #12966 from SamGondelman/audio 
Fix audio level meter
 2018-04-23 14:56:57 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
Atlante45
f2c471558c CR 2018-04-23 13:14:21 -07:00
Atlante45
bc251115ed Add special handler for heap corruption 2018-04-23 13:14:21 -07:00
Clement
fb496156ce Fix threaded force crashes 2018-04-23 13:14:21 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox 
Fix SpinBox.
 2018-04-23 13:02:01 -07:00
SamGondelman
1deb38f06d fix copy error 2018-04-23 12:05:30 -07:00
Gabriel Calero
ccb5e1e06c Commenting out display plugin activation/desactivation 2018-04-23 15:29:51 -03:00
Seth Alves
1dbcbbcced cleanups 2018-04-23 11:05:06 -07:00
Gabriel Calero
001cd5e937 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-23 14:25:26 -03:00
samcake
990ee83f04 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:07:58 -07:00
vladest
cf070e6e92 Cleanup 2018-04-23 18:56:16 +02:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu 
Android: Hide menu and fix shader compilation
 2018-04-23 09:51:20 -07:00
Sam Gateau
97934fe563 Adjusting the regulators and moving task to use chrono nad interesting tests 2018-04-23 00:07:00 -07:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd JSDoc fixes 2018-04-23 16:09:56 +12:00
Sam Gateau
99a0e42b5d Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-22 20:26:49 -07:00
David Rowe
497cb4dab6 Interim JSDoc for Selection 2018-04-23 13:53:35 +12:00
David Rowe
96ddeb4e99 Interim JSDoc for SpeechRecognizer 2018-04-23 11:37:27 +12:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
Sam Gateau
ec569b0e51 adjusting the bounding box for debug rendering 2018-04-21 12:05:27 -07:00
vladest
60115752ad Fixed saving after editing 2018-04-21 20:18:24 +02:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
David Rowe
34d0a892a0 Point to example using Hardware.Application item 2018-04-21 15:01:46 +12:00
samcake
b66ab6deaa Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 17:55:45 -07:00
samcake
d1b0e89fa3 merging with upstream correctly 2018-04-20 17:55:34 -07:00
samcake
b554aec317 Trying more drastic changes and learnign to use std::chrono the right way 2018-04-20 17:53:24 -07:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
Seth Alves
6fc02638d7 control verbose logging with a menu-item in developer menu 2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id 
Use 16-bit local IDs for Nodes in NL packets
 2018-04-20 15:28:18 -07:00
Andrew Meadows
06af31594e merge 'master' into 'workload' 2018-04-20 15:07:46 -07:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes 
Fix threaded force crashes
 2018-04-20 13:20:40 -07:00
samcake
3d651de797 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 13:20:19 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup 
Make Audio.cpp threadsafe
 2018-04-20 11:36:08 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836 
Update location.hostname JSDoc per serverless domains
 2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66 try to fix audio crash on startup 2018-04-20 10:23:47 -07:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
samcake
0f4aa7e27e Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 09:31:36 -07:00
vladest
b8577bd791 Merge branch 'master' into fix_spinbox 2018-04-20 18:09:16 +02:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix 
Minor changes to meet coding standard
 2018-04-20 08:20:32 -07:00
Sam Gateau
cfaf75e196 Using the std::chrono to measure the physics time 2018-04-19 23:28:32 -07:00
samcake
9b1a887469 Starting to move dynamically yeah 2018-04-19 17:43:14 -07:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
David Rowe
08defea755 Merge branch 'master' into 21836 2018-04-20 09:20:56 +12:00
milad
42471c539b initial fixes from ctralt david's comments 2018-04-19 13:40:57 -07:00
Gabriel Calero
f2184bf456 Handle android back button. Remove unused resources. Fix compilation errors. 2018-04-19 17:31:25 -03:00
samcake
a6bd589f4f Merging upstream 2018-04-19 12:20:10 -07:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix 
Only dismiss letterbox when clicking on grey areas
 2018-04-19 11:47:10 -07:00
vladest
663af09605 Fix SpinBox. attempt 1 2018-04-19 20:43:48 +02:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes 
Change tablet model and spawn position
 2018-04-19 10:25:34 -07:00
samcake
9b3d546dad Exposing the on off to use the distance configs 2018-04-19 09:35:57 -07:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash 
Pre-requisite changes for splash screen rendering
 2018-04-19 09:19:05 -07:00
Gabriel Calero
c8fe45eb8f Remove debug statements and unused code. Put JNI code in a separated file. 2018-04-19 11:41:59 -03:00
Ken Cooke
764aa00069 Coding standard fixes 2018-04-19 07:33:14 -07:00
milad
364d193499 audio added 2018-04-18 21:04:57 -07:00
milad
3f129bda13 More done on audio 2018-04-18 20:04:41 -07:00
samcake
52a4224442 Arg get me the feedback working!!!! 2018-04-18 18:16:06 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Zach Fox
e01e7cc7bc Be a bit more efficient 2018-04-18 16:34:02 -07:00
Zach Fox
e0012ed5dc
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath 
Fix paths to various Snapshot resource files
 2018-04-18 13:44:53 -07:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
Gabriel Calero
472cc1b29a Fix code spacing 2018-04-18 16:44:49 -03:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002 
more correct stats names
 2018-04-18 10:50:38 -07:00
John Conklin II
d19bb557ad
Merge pull request #12897 from ctrlaltdavid/21848 
Include JSDoc Web pages in the install
 2018-04-18 10:49:31 -07:00
John Conklin II
005b6a6b1f
Merge pull request #12893 from ctrlaltdavid/21843 
Fix overlay toggling
 2018-04-18 10:49:05 -07:00
samcake
d6b6645630 exposing feedback of timing 2018-04-17 18:03:45 -07:00
Atlante45
7e6d45ead7 CR 2018-04-17 16:25:07 -07:00
Stephen Birarda
95c172f418 Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66 2018-04-17 15:34:46 -07:00