Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 00:13:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76106 commits 67 branches 56 tags 1.2 GiB
Commit graph

1213 commits

Author SHA1 Message Date
Brad Davis
51884155ee Support Android app-specific extensions in shaders 2019-02-15 14:16:58 -08:00
John Conklin II
7008330641
Merge pull request #14921 from NissimHadar/fixMacError 
Compilation error on Qt 5.12
 2019-02-15 11:28:55 -08:00
NissimHadar
b77f40d300 Revert due to stable build problem on Ubuntu. 2019-02-15 09:52:57 -08:00
NissimHadar
8b2d9c36af Adding client profile combo. 2019-02-15 08:39:29 -08:00
NissimHadar
a1e289cc1c Compilation error on Qt 5.12 2019-02-14 14:17:29 -08:00
NissimHadar
6752092899 Removed unnecessary member variable. 2019-02-14 10:38:19 -08:00
NissimHadar
701c18c9eb Correction to recursive scripts. 2019-02-14 08:58:09 -08:00
NissimHadar
58c0078188 Reversed order of recursive calls. 2019-02-13 21:07:25 -08:00
NissimHadar
301b4215e5 Fixed gcc warning. 2019-02-13 19:13:08 -08:00
NissimHadar
be5f9b211b Add nitpick to production (but not stable) builds 2019-02-13 18:09:06 -08:00
NissimHadar
56483f4884 Check that zipped folder name is in correct format. 2019-02-13 15:18:07 -08:00
NissimHadar
86aaba016f Narrow filter on zip folder selection. 2019-02-13 15:15:46 -08:00
NissimHadar
12c122ce9c Bump up version number. 2019-02-13 15:14:36 -08:00
NissimHadar
77b679606f Corrected bug in zip folder name. 2019-02-13 15:13:55 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
Shannon Romano
6ca4a2776e
Merge pull request #14903 from NissimHadar/21129-improveNitpickUsability 
Case 21129: improve nitpick usability
 2019-02-13 09:54:53 -08:00
Shannon Romano
1330b108d6
Merge pull request #14890 from sabrina-shanman/gltf_mat-support 
(case 20980) Add support for Roughness/Metallic in GLTF models
 2019-02-13 08:16:00 -08:00
NissimHadar
9ed1470175 Corrected case. 2019-02-12 19:10:34 -08:00
sabrina-shanman
efd22172b4 Add final missing CMake includes 2019-02-12 17:27:04 -08:00
NissimHadar
305ce74659 Updated the Windows installation instructions. 2019-02-12 11:11:59 -08:00
NissimHadar
0b1034c290 Improved wording of error message. 2019-02-12 11:11:22 -08:00
NissimHadar
6225d97357 Check for adb and python when needed. 
Look for adb and python in PATH.
 2019-02-12 09:06:04 -08:00
Brad Davis
e534270f9a Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins 2019-02-11 15:41:32 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
NissimHadar
d3e0aa5d8c Make sure only top-level recursive script runs recursively. 2019-02-10 20:32:38 -08:00
NissimHadar
b2fb7a737b Ready for testing. 2019-02-09 13:21:36 -08:00
NissimHadar
dff98f462f Removed unnecessary of spaces. 2019-02-09 13:13:13 -08:00
NissimHadar
6598f83d39 Removed debug code. 2019-02-08 11:22:39 -08:00
NissimHadar
4727123e5f Do not include nitpick in production builds. 2019-02-08 10:25:18 -08:00
NissimHadar
80392b1724 Removed unneeded copying of SSL DLL's. 2019-02-07 18:21:24 -08:00
Sam Gateau
466da1bd05
Merge pull request #14783 from NissimHadar/20816-installOnAndroid 
Case 20816: install on android (Mac and Windows installers)
 2019-02-07 17:02:40 -08:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
NissimHadar
cf83124968 Improved instructions. 2019-02-07 14:57:25 -08:00
NissimHadar
c168d31e07 Added missing ". 2019-02-07 14:52:59 -08:00
NissimHadar
bab306fd30 Added instruction to add Python to path. 2019-02-07 14:38:53 -08:00
NissimHadar
03ad14caaf Removed unneeded step. 2019-02-07 14:17:18 -08:00
NissimHadar
f9396fe597 Corrected error message. 2019-02-07 14:11:59 -08:00
NissimHadar
89eff9171e Merge branch '20816-installOnAndroid' of github.com:NissimHadar/hifi into 20816-installOnAndroid 2019-02-06 14:29:30 -08:00
NissimHadar
8f09c5b689 Updated readme. 2019-02-06 14:28:19 -08:00
NissimHadar
cc3a74b7a0 Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid 2019-02-05 09:01:46 -08:00
Bradley Austin Davis
2db5bbd381 Fix mac frame player 2019-01-30 16:23:22 -08:00
Brad Davis
b8d8079590 Enable transforming a frame to use only relative paths 2019-01-30 13:15:23 -08:00
Brad Davis
ab9a4a55f8 Allow movement in frameplayer app 2019-01-30 13:15:22 -08:00
Jamil Akram
cc38a96bff
Merge pull request #14415 from Atlante45/feat/rc-branch-script 
RC branch script
 2019-01-29 16:32:49 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
Thijs Wenker
a8f95c8916
Merge pull request #14703 from dback2/avatarExporterImprovements 
Avatar Exporter v0.1 - add bone rules and versioning
 2019-01-28 17:45:33 +01:00
NissimHadar
f248beba9f Added device description + running Interface. 2019-01-27 23:43:07 -08:00
NissimHadar
94d741480c Added missing SSL dll's 2019-01-26 14:59:30 -08:00
NissimHadar
bee86235a3 Corrected error message. 2019-01-26 09:52:58 -08:00
NissimHadar
8223e046c8 Eliminate silly gcc warnings. 2019-01-25 21:41:00 -08:00