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

2795 commits

Author SHA1 Message Date
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -07:00
Zach Fox
50446619f5 Remove unnecessary (?) references to _recentlyDeletedEntityItemIDs 2017-10-12 11:59:46 -07:00
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
Zach Fox
0e96fc5cab It's working! 2017-10-12 11:37:26 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Zach Fox
c3e66c9581 Fixes 2017-10-11 16:56:47 -07:00
Zach Fox
5a3a3c4937 What is going on 2017-10-11 15:05:45 -07:00
Zach Fox
fa1bfe0d19 Maybe fixes? 2017-10-11 14:10:33 -07:00
Zach Fox
d8b84e6875 Minor cleanup 2017-10-11 13:26:32 -07:00
Zach Fox
9e570fdba3 First pass at encryption/decryption. Exciting! 2017-10-11 13:08:04 -07:00
Zach Fox
f05c709693 Remove static certificate verification for now 2017-10-11 12:06:11 -07:00
Zach Fox
1f8b68c952 Updates now that endpoint exists; add pending timer 2017-10-11 11:46:35 -07:00
Zach Fox
0ae69b6ad9 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-10 12:38:14 -07:00
Zach Fox
a7d43c63b6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-09 11:38:13 -07:00
Andrew Meadows
0bcecdbe66 be picky when finding nearby entities at login 2017-10-09 10:27:46 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Zach Fox
c70ee6055f Don't clear cert ID if static properties change; updates to DDV 2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Seth Alves
9064114ce5 fix mistaken logic-flip in recent PR 2017-10-06 11:03:48 -07:00
Seth Alves
f4dedf05bb move variables into block that needs them 2017-10-06 11:02:26 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
4cfb860e23 Wow, this actually seems to be working 2017-10-04 15:45:12 -07:00
Zach Fox
f974672e7b Working way better than I expected 2017-10-04 15:19:06 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Zach Fox
f7ea50ef3b Free memory 2017-10-04 14:02:28 -07:00
Zach Fox
cf7c1934f8 Progress? 2017-10-04 13:16:33 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
Zach Fox
2cdd5c29f3 Uncertified rez rights 2017-10-04 09:58:29 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Zach Fox
ed40e41b94 Potential progress? Not totally sure 2017-10-03 16:18:29 -07:00
SamGondelman
fc6e5df2cb fix text/web registration point usage 2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Zach Fox
9c4b02c659 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73 First steps 2017-10-03 14:36:22 -07:00
Seth Alves
6040c4a3e8 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 14:06:01 -07:00
Seth Alves
05e173a1d0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 13:11:03 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Seth Alves
e7fa8131ea make json importer understand AVATAR_SELF_ID 2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e allow importing of avatar entities from json 2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00
Howard Stearns
136381adb9 fatal compiler warning on mac/linux 2017-10-02 13:56:15 -07:00
Howard Stearns
7b0321c1e1 guess for mac/linux openssl 2017-10-02 12:30:25 -07:00
Howard Stearns
5c5f052bc2 explicit free, and remove header that isn't available on mac/linux 2017-10-02 10:28:47 -07:00
Howard Stearns
0f6884dd80 fix mac/linux compiler error 2017-10-02 09:44:10 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00