Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 01:16:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64544 commits 71 branches 56 tags 1.2 GiB
Commit graph

567 commits

Author SHA1 Message Date
Andrew Meadows
38bc312004 faster and const EntityTree::findByID() 2018-02-13 11:25:34 -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
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05: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
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
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
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
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Andrew Meadows
406bf7898d cleanup prof stats and trace context names 2017-12-11 11:31:00 -08:00
howard-stearns
a6b437a79f get rid of "error" warning because the key wasn't broken into 64 char 
lines
 2017-11-22 16:55:57 -08:00
howard-stearns
abf41300dd refactor 2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6 fix up dynamic ownership challenge 2017-11-22 15:58:30 -08:00
howard-stearns
ca80c9b764 Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet 2017-11-21 16:28:08 -08:00
ZappoMan
3a967ca895 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-21 10:53:29 -08:00
Thijs Wenker
627fee80ec added support for exporting parentJointName 2017-11-21 01:49:56 +01:00
Thijs Wenker
84ec9890ca reverted special property case, parentJointName is now only parsed from the JSON import 2017-11-20 18:29:33 +01:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
H Q
21a28827c9 Remaining coding style changes, other small fixes 2017-11-17 07:59:52 -08:00
H Q
27350ddbfc Coding style corrections 2017-11-16 12:35:00 -08:00
H Q
44f2c92d30 Final ECSDA and nonce modifications for this dev cycle 2017-11-14 15:40:29 -08:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Zach Fox
8a6a744099 It's working 2017-11-01 10:46:13 -07:00
Zach Fox
93308dfcd3 Why did I think this would work before? 2017-10-31 16:21:10 -07:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62 Will it compile? 2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00