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

3902 commits

Author SHA1 Message Date
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Thijs Wenker
d7725f1d73 make the grabbable checkbox again, respect default true setting 2018-03-05 20:54:08 +01:00
Thijs Wenker
6bf1c9878f
Merge pull request #12473 from misslivirose/fix-log-spam 
Logspam fix for editing in HMD mode
 2018-02-28 01:59:25 +01:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Zach Fox
0802bd2c21 Fix going to marketplace main page from WalletChoice 2018-02-26 14:27:59 -08:00
howard-stearns
a5cedde3c8 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
John Conklin II
c227c11aa2
Merge pull request #12475 from ElderOrb/FB12518 
fix for 'help icon in toolbar does not highlight when help window is open'
 2018-02-26 09:35:56 -08:00
howard-stearns
30a6cca4b3 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 09:26:09 -08:00
howard-stearns
8b46bdd9a1 make bank link testable in staging 2018-02-25 15:17:28 -08:00
Zach Fox
fe515e949b New UI for new HFC users 2018-02-23 16:36:20 -08:00
Zach Fox
f14673bc50 Fixup Checkout for apps 2018-02-22 16:38:38 -08:00
Zach Fox
10fa3fa346 It's working! 2018-02-22 16:09:01 -08:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Alexander Ivash
c15cf33ca1 12518 - Help icon in toolbar does not highlight when help window is open 2018-02-23 00:36:00 +03:00
Liv Erickson
269d8312e2 wrap selection print in wantDebug to avoid spamming logs in HMD 2018-02-22 13:03:16 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
Nissim Hadar
b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-21 12:36:56 -08:00
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Seth Alves
cfbe082074
Merge pull request #12438 from ctrlaltdavid/21757 
Fix selecting values when tabbing between entity properties fields
 2018-02-21 09:22:46 -08:00
Nissim Hadar
af484d0af6 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-20 23:48:12 -08:00
Zach Fox
f08c66e3ac Remove debug code 2018-02-20 14:16:55 -08:00
Zach Fox
2daa30f125 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-20 12:41:12 -08:00
Zach Fox
11f897beb0 Initial app support 2018-02-20 10:39:36 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines 
Show outline for zones when rotating
 2018-02-20 09:30:22 -08:00
David Rowe
44aafd92a4 Merge branch 'master' into 21757 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-20 17:34:59 +13:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
David Rowe
65efeadf10 Fix selecting values when tabbing between entity properties fields 2018-02-19 19:17:23 +13:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Zach Fox
811ecf9db8 Fix 2018-02-15 14:44:33 -08:00
Nissim Hadar
ff43e4c2ad Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-15 11:53:11 -08:00
Nissim Hadar
777862f253 can cast shadow flag now works correctly (UI/JS aspects). 2018-02-15 11:50:38 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Sam Gondelman
09645c8b48
Merge pull request #12403 from 1P-Cusack/EntityPropertiesJS_801_on_split 
[EntityPropertiesJS] Fix for 801 Uncaught TypeError (details below).
 2018-02-15 09:34:59 -08:00
Nissim Hadar
adb02d69f9 WIP -adding canCastShadow flag. 2018-02-14 21:45:56 -08:00
Nissim Hadar
12f4b8dbb1 Corrected event listener for canCastShadow - still bad. 2018-02-14 19:12:24 -08:00
Nissim Hadar
ef771b6db4 Minor indentation correction. 2018-02-14 19:11:13 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00