Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 16:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74827 commits 25 branches 0 tags 1.1 GiB
Commit graph

3714 commits

Author SHA1 Message Date
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities
 2018-12-20 19:10:22 +00:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Adam Smith
828672343a
Merge pull request #14523 from SamGondelman/NOverlays2 
Case 20131: Cleanup some Entity Properties
 2018-12-19 11:33:24 -08:00
SamGondelman
cd83be162c merge with NOverlays3 2018-12-11 10:38:55 -08:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent 
Add method to check entities joint hierarchy
 2018-12-11 01:06:38 +00:00
SamGondelman
5eccaad135 remove new API 2018-12-10 13:05:39 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Alexander Ivash
600d09e533 relax 'isWearable()' condition to match latest changes in 'master' 2018-12-07 11:23:17 +03:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4 2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3 2018-12-06 12:37:18 -08:00
Sam Gondelman
533e0e0326
Merge branch 'master' into NOverlays2 2018-12-06 12:29:38 -08:00
Luis Cuenca
37854ab05e
Add jsdoc information 2018-12-06 11:58:48 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Sam Gondelman
a7c083e97a
Merge branch 'master' into NOverlays2 2018-12-06 11:24:27 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals 
Case 19798: 3D projected Material Entities and materialRepeat option
 2018-12-06 11:13:46 -08:00
SamGondelman
abef5c4d61 fix grab billboarding bug 2018-12-05 15:05:01 -08:00
SamGondelman
305cb6d323 grid entities 2018-12-03 18:04:34 -08:00
SamGondelman
98f9dc0ca4 remove grid entity files 2018-12-03 12:07:26 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
SamGondelman
1fd8a21f8e cleanup 2018-12-03 11:07:54 -08:00
luiscuenca
ad42f6a590 Add method to check entities joint hierarchy 2018-12-01 12:32:29 -07:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
e8d45c46c1 shouldn't be able to write actionData 2018-11-19 23:31:20 -05:00
Seth Alves
d19cdc62d7
Merge pull request #14135 from ElderOrb/FB18573 
FB18573 - Other avatars' avatar entities may appear to be successfull…
 2018-11-16 10:05:22 -08:00
SamGondelman
8dbb2d806b local entities are always collisionless 2018-11-14 14:48:07 -08:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Simon Walton
82e21e89e4 Merge remote-tracking branch 'upstream/master' into max-json-size 2018-11-13 17:26:20 -08:00
Simon Walton
167a8fdc04 Merge branch 'master' into max-json-size 2018-11-13 14:57:06 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
SamGondelman
b3abd97707 projected materials and repeat property 2018-11-09 10:47:07 -08:00
Simon Walton
d183968175 Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions 2018-11-08 18:20:20 -08:00
Ryan Huffman
1ff644b619
Merge pull request #14256 from ctrlaltdavid/M17008 
Fix Interface crash importing JSON with duplicate entity IDs in file
 2018-11-08 11:04:43 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Simon Walton
6f6c92e647 Remove unused variable 2018-10-30 09:40:08 -07:00
SamGondelman
df005eedbf fix shape not getting marked changed 2018-10-29 17:43:16 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props 
keep userData and new grab properties in sync
 2018-10-26 11:52:47 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Seth Alves
c5aafd4644 fix spatialKey conversion 2018-10-25 07:47:16 -07:00
Seth Alves
387a8ce933 fix QJsonArray handling 2018-10-25 07:47:15 -07:00