Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-13 14:08:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77277 commits 17 branches 0 tags 1.1 GiB
Commit graph

1343 commits

Author SHA1 Message Date
Shannon Romano
f926298020
Merge pull request #15297 from NissimHadar/21984-fixNitpickCMake 
Case 21988: Use place holder instead of RCC file.
 2019-03-29 13:16:56 -07:00
NissimHadar
709515dd74 Use place holder instead of RCC file. 2019-03-29 11:48:15 -07:00
NissimHadar
705e6432a7 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db CR comments. 2019-03-28 12:23:25 -07:00
NissimHadar
de1c40e994 Changed version. 2019-03-28 11:27:35 -07:00
NissimHadar
e95efc29e4 Bug fix after code review. 2019-03-27 19:00:28 -07:00
Sam Gondelman
ffbf678695
Merge pull request #15217 from jherico/fix/framereader_files 
Case 21793: Fix loading relative files
 2019-03-27 10:52:35 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222 
Case 21222: Agent, Avatar, and MyAvatar JSDoc
 2019-03-26 15:43:32 -07:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
NissimHadar
a8dba041a2 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-22 11:24:18 -07:00
NissimHadar
faf11480b6 Working changes before merge. 2019-03-22 11:22:14 -07:00
David Back
77ea47a9db fix no name material override, hide auto scale text after sliding 2019-03-22 11:21:39 -07:00
David Back
6956d01099
Merge pull request #15203 from dback2/avatarExporterBlockExportFromConfigMaster 
Case 21760: Avatar Exporter v0.3.7 - block exporting from Humanoid
 2019-03-22 10:23:21 -07:00
Andrew Meadows
8977aba7c7
Merge pull request #15175 from NissimHadar/21691-improveNitpickWebPage 
Case 21691: Improve nitpick web page.
 2019-03-22 10:06:08 -07:00
NissimHadar
05618931b1 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-22 09:55:14 -07:00
Shannon Romano
13e8baeff9
Merge pull request #15246 from ctrlaltdavid/M21846 
Case 21846: Make JSDoc use "@returns {Signal}" instead of "@signal"
 2019-03-22 09:51:28 -07:00
David Back
8db6abb58d Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster 2019-03-22 09:28:22 -07:00
David Rowe
ba0923a3ad Fix signal summary text 2019-03-22 12:20:22 +13:00
David Rowe
025326b85f Remove custom @signal tag 2019-03-22 12:20:10 +13:00
David Rowe
4c7d5c7da7 Detect signal functions based on their return type 2019-03-22 12:19:20 +13:00
Thijs Wenker
5e35db1f76
Merge pull request #15199 from dback2/avatarExporterOldUnityVersionsFixMaster 
Case 21751: Avatar Exporter v0.3.6 - fix 2017.4 Unity versions
 2019-03-22 00:04:15 +01:00
NissimHadar
b0e2b5fde1 Remove unneeded variable. 2019-03-21 14:47:48 -07:00
NissimHadar
e913ea7859 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-21 12:48:47 -07:00
NissimHadar
1f0fe7d683 Merge branch 'master' of github.com:highfidelity/hifi into 21691-improveNitpickWebPage 2019-03-21 12:47:34 -07:00
NissimHadar
661d8a0b69
Merge pull request #15140 from NissimHadar/21616-addPerTileThreshold 
Case 21616: Add per tile threshold
 2019-03-21 10:56:53 -07:00
NissimHadar
3f37024c55 Merge branch 'master' of github.com:highfidelity/hifi into 21691-improveNitpickWebPage 2019-03-21 08:35:32 -07:00
David Back
0883e5118d Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster 2019-03-20 16:36:07 -07:00
David Back
f42f6096c7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterOldUnityVersionsFixMaster 2019-03-20 16:26:35 -07:00
NissimHadar
b12a268464 Fixed copy-paste-drink too much error 2019-03-20 16:25:59 -07:00
Thijs Wenker
e767254710
Merge pull request #15194 from dback2/avatarExporter0.3.5ToMaster 
Case 21732: Avatar Exporter 0.3.5 to master
 2019-03-21 00:02:24 +01:00
Shannon Romano
560459f491
Merge pull request #14916 from SimonWalton-HiFi/dissectors-add-audiosolorequest 
Dissectors - Add AudioSoloRequest, BulkAvatarTraitsAck
 2019-03-20 12:46:02 -07:00
NissimHadar
51ab8880e9 Corrected labels. 2019-03-19 13:25:40 -07:00
Brad Davis
ad2c4718a3 Fix loading relative files 2019-03-19 09:32:44 -07:00
sabrina-shanman
fa6a94f16a Fix not mapping identical URLs in DomainBaker 2019-03-18 17:21:05 -07:00
sabrina-shanman
b0b4307f27 Fix unsupported model types preventing DomainBaker from finishing 2019-03-18 17:02:49 -07:00
sabrina-shanman
e4cafced2a Re-name GRAP_KEY to GRAB_KEY in DomainBaker.cpp 2019-03-18 16:49:09 -07:00
David Back
e1358fd5f5 prevent export from humanoid config, cleaner scene switch 2019-03-15 16:28:46 -07:00
David Back
e8cac1f598 fix 2017 Unity versions 2019-03-15 14:14:16 -07:00
NissimHadar
b91a1d930a Missing newline. 2019-03-15 13:44:01 -07:00
NissimHadar
9e8e389e99 Improved detection of device model. 2019-03-15 13:38:43 -07:00
NissimHadar
cc2868a6f4 Can get server IP. 2019-03-15 12:46:47 -07:00
NissimHadar
748a80fed7 Store device ifconfig results in ifconfig.txt. 2019-03-14 20:02:19 -07:00
David Back
d8b4419fd0 fix null object error on cancel export 2019-03-14 17:19:21 -07:00
sabrina-shanman
20d0ca0073 Fix baked material JSONS using wrong texture paths 2019-03-14 17:09:21 -07:00
David Back
3c78e48f88 prevent warnings on embedded materials 2019-03-14 17:05:29 -07:00
David Rowe
f0bbd89546 Update JSDoc README with solution for out-of-memory problem 2019-03-15 11:05:58 +13:00
David Back
f9f2b6f8ac avatar exporter 0.3.4/0.3.5 changes to master 2019-03-14 15:03:33 -07:00
David Rowe
53b5a599b1 Reinstate avatar script type tag 2019-03-15 09:12:16 +13:00
NissimHadar
6c9c58c657 Remove unneeded wait. 2019-03-14 11:36:40 -07:00
sabrina-shanman
a3412bb25e Attempt to fix build errors 2019-03-13 16:44:50 -07:00