Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-07-15 06:27:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64609 commits 20 branches 0 tags 1.1 GiB
Commit graph

586 commits

Author SHA1 Message Date
ZappoMan
76d611d563 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-19 19:15:33 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
ZappoMan
e71811bef2 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-14 09:03:32 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Andrew Meadows
38bc312004 faster and const EntityTree::findByID() 2018-02-13 11:25:34 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
ZappoMan
71a8e96d5a fix several CR requests 2018-02-02 18:14:12 -08:00
ZappoMan
8751ef506e Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-01 14:29:12 -08:00
ZappoMan
cd4b3b1a54 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-30 12:52:41 -08:00
Dante Ruiz
4c0a173287 trying another solution 2018-01-30 10:23:19 -08:00
Dante Ruiz
bed2ea052d better solution 2018-01-30 09:44:49 -08:00
Dante Ruiz
eef2f656be Merge branch 'master' of github.com:highfidelity/hifi into fix-parenting-crash 2018-01-30 08:43:35 -08:00
Dante Ruiz
68fd9eafa8 fix entity parenting crash 2018-01-29 10:23:24 -08:00
ZappoMan
a3d86a0242 cleanup 2018-01-26 17:37:24 -08:00
ZappoMan
aa82ad8855 adjust client to only delete entities on server echo 2018-01-26 14:57:36 -08:00
ZappoMan
aea16fe071 add delete filter support 2018-01-25 15:01:29 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
ZappoMan
8364f64d4d Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-18 15:08:27 -08:00
Nissim Hadar
a1415e28ff If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit. 2018-01-15 15:11:10 -08:00
Nissim Hadar
50a030b68b Corrected copy of ambient URL. 2018-01-12 00:22:06 -08:00
Nissim Hadar
a1f25bf49c Moved variable setting to outside of loop. 
Added copy of ambient URL.
 2018-01-11 19:35:13 -08:00
Nissim Hadar
86cfeac95c Moved variable setting to outside of loop. 2018-01-11 16:39:44 -08:00
Nissim Hadar
4bd09fd9af Corrected default values - for reading legacy content. 2018-01-11 14:53:58 -08:00
ZappoMan
3936dda099 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-10 09:31:43 -08:00
ZappoMan
734ba3a8c5 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-09 15:29:20 -08:00
Nissim Hadar
c841ec6c8c Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank. 2018-01-08 18:15:20 -08:00
Nissim Hadar
b2b1807490 Changes per code review. 2018-01-08 15:37:06 -08:00
Nissim Hadar
d0c0d6a388 Set skybox mode as per legacy background mode if needed. 2018-01-08 11:50:28 -08:00
Nissim Hadar
bc98cbd58f Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 23:26:28 -08:00
nissim.hadar
1acf7bae20 Removed reference to BackgroundMode. 2018-01-06 23:24:28 -08:00
Nissim Hadar
d5be9365fe Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 10:02:12 -08:00
nissim.hadar
33cc17a52f Removing unused Background mode. 2018-01-06 02:27:49 -08:00
nissim.hadar
579aec7118 Only check for zone fields. 2018-01-06 01:37:23 -08:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Nissim Hadar
3963c0a5a1 Code review improvements. 2018-01-05 12:22:20 -08:00
Nissim Hadar
cf7d6a2eab Added correct use of legacy background combo. 2018-01-04 20:30:10 -08:00
Nissim Hadar
c10d2a5461 Added correct use of legacy background combo. 2018-01-04 19:48:25 -08:00
Andrew Meadows
a51d83c6e4 rollback automatic priority promotion to RECRUIT 2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f more correct volunteer ownership priority promotion 2018-01-04 15:53:03 -08:00
Nissim Hadar
e8770ec204 TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light). 2018-01-04 11:30:02 -08:00
ZappoMan
f639e950e9 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-02 15:47:36 -08:00
Zach Fox
73eb258e79 IT'S WORKING!!! 2017-12-21 15:17:52 -08:00
Zach Fox
e963673409 Progress? 2017-12-21 14:08:18 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
ZappoMan
45f07718d3 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2017-12-19 12:59:17 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js 
Cleanup names of debug stats and trace contexts.
 2017-12-18 10:02:42 -08:00
ZappoMan
5a843b1342 adding support for filters to get old properties 2017-12-14 11:14:09 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00