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

73210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wayne Chen
c8071e81b1 sending user to saved address if logged in 2018-11-06 13:32:31 -08:00
Wayne Chen
9beedf9292 changing login overlay size + add keyboard 2018-11-06 12:56:50 -08:00
Wayne Chen
235df365aa wip on disabling pointers 2018-11-05 17:41:42 -08:00
Wayne Chen
77b47d4b32 adding class for creating overlay and lasers 2018-11-05 17:29:01 -08:00
Wayne Chen
9deeee6534 removing unused classes 2018-11-05 11:07:29 -08:00
Wayne Chen
2dd20de1bd Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-05 09:13:25 -08:00
Wayne Chen
23141662ff changing button channel to enum 2018-11-02 20:09:28 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm 
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-02 16:44:31 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update 
Case 18794 - updates were being reported as gifts in the wallet
 2018-11-02 16:42:03 -07:00
Chang Xing
67252467d8
Merge pull request #14317 from zfox23/moveSecuritySettings 
Move Wallet Security tab to new dialog; fixup Login dialog
 2018-11-02 16:29:05 -07:00
Ken Cooke
77988e400e
Merge pull request #14247 from sethalves/dont-let-checkdevices-swap-pool 
don't let checkDevices swamp thread pool
 2018-11-02 14:25:39 -07:00
Zach Fox
917fc4ad58 Update language 2018-11-02 09:23:31 -07:00
Wayne Chen
7f805ebcb4 more wip 2018-11-01 17:16:15 -07:00
Roxanne Skelly
1f8dde6756 Transaction string was assuming items given to the 
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
 2018-11-01 15:44:11 -07:00
Wayne Chen
c28ed9fc4b enabling certain menus/key events in login 2018-11-01 13:38:27 -07:00
Zach Fox
0a15e94fe4 New colors 2018-11-01 13:27:31 -07:00
Zach Fox
581a19b13e Merge branch 'master' of github.com:highfidelity/hifi into moveSecuritySettings 2018-11-01 13:15:54 -07:00
Zach Fox
d6477993a1 Make it work better with the tablet 2018-11-01 13:08:00 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix 
Extra joints on soft entities keep their local transform
 2018-11-01 09:29:16 -07:00
Wayne Chen
c43e67e4a8 adding tabbing between textfields 2018-10-31 16:57:03 -07:00
Zach Fox
162a08b993 Restore certain images 2018-10-31 16:14:26 -07:00
Wayne Chen
6822287d67 sending to tutorial if dismiss login 2018-10-31 16:13:01 -07:00
Zach Fox
d4e9a70564 Almost there 2018-10-31 16:12:16 -07:00
John Conklin II
25be635b76
Merge pull request #14314 from birarda/bug/reliable-through-loss 
avoid ambiguous RTT calcs and enable udt fast retransmit
 2018-10-31 15:49:23 -07:00
David Kelly
e6c3e7e67f initial purge of security tab from wallet 2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
Wayne Chen
f62c8ae87a overlay HMD implementation 2018-10-31 15:26:49 -07:00
sabrina-shanman
643026abd6 Change local variable in TestFbx for clarity 2018-10-31 14:15:39 -07:00
sabrina-shanman
0b7ddca5f6 Change naming for straggler names in model loading debug dumps 2018-10-31 14:03:20 -07:00
Stephen Birarda
41ec026f8d cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit 2018-10-31 13:32:27 -07:00
Sam Gondelman
312f336210
Merge pull request #14302 from SamGondelman/queryAACube 
Don't update QueryAACube in setParentID if _parentID didn't change
 2018-10-31 11:46:16 -07:00
Wayne Chen
67539bc87a Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-31 09:00:37 -07:00
Wayne Chen
03c39eb92f more wip 2018-10-31 07:45:55 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
Wayne Chen
43b269b612 testing tablet implementation 2018-10-30 11:48:22 -07:00
Sam Gondelman
2dc761a57a
Merge pull request #14295 from SamGondelman/shape 
Fix shape not getting marked changed
 2018-10-30 11:04:32 -07:00
Wayne Chen
8e4837f8c8 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-30 10:23:25 -07:00
Wayne Chen
54fe9eec87 adding overlay 2018-10-30 10:19:11 -07:00
SamGondelman
df005eedbf fix shape not getting marked changed 2018-10-29 17:43:16 -07:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix 
Fix avatars remain stuck in place for other users intermittently
 2018-10-29 15:03:43 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988 
Fix Interface eating memory when minimized
 2018-10-29 12:52:10 -07:00
Wayne Chen
ed847203ea wip for getting hmd overlay 2018-10-29 11:33:28 -07:00
Wayne Chen
6e0b89f0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-29 08:48:02 -07:00
Wayne Chen
11dc82a5cf Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-29 08:47:25 -07:00
Wayne Chen
c4aabfda44 adding prototype functions 2018-10-29 08:47:09 -07:00
luiscuenca
e49e9cdc56 Set avatar client sooner 2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1 Apply transit logic if avatar instance is client side 2018-10-27 07:15:31 -07:00
Wayne Chen
af04630642 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-26 17:53:13 -07:00
luiscuenca
767f4e9d6d Return server position 2018-10-26 17:16:43 -07:00