Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 07:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73421 commits 76 branches 59 tags 1.2 GiB
Commit graph

73421 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
d6477993a1 Make it work better with the tablet 2018-11-01 13:08:00 -07:00
Ryan Huffman
01b29185ca Update the default edit.js collidesWith to include myAvatar 2018-11-01 12:04:20 -07:00
Howard Stearns
3e2d6c341b placeholder svgs 2018-11-01 11:45:25 -07:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468 Merge branch 'oculus-store-commerce' into tabless 2018-11-01 11:22:28 -07:00
Zach Fox
4a56f769e5 Re-add some code I shouldn't have removed 2018-11-01 11:04:59 -07:00
Zach Fox
6e470d5c1c Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce 2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb Fix four bugs; truncate some logs 2018-11-01 10:29:38 -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
Andrew Meadows
cfec94f3ff larger threshold btw 1 vs 2 workload views for 3rd person 2018-11-01 09:28:31 -07:00
Dante Ruiz
a4b345bb58 fix interstitial domain loading due to bad texture url 2018-11-01 09:25:46 -07:00
Roxanne Skelly
a1eee351e9 Change "Proofs" to "My Submissions" in assets filter. 2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993 Restore certain images 2018-10-31 16:14:26 -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
Andrew Meadows
317f4d28ba always keep a workload view around MyAvatar 2018-10-31 15:42:24 -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
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
Howard Stearns
ce0ad48a28 tabless wallet 2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536 Cleanup FIXME 2018-10-31 13:53:18 -07:00
Stephen Birarda
41ec026f8d cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit 2018-10-31 13:32:27 -07:00
Zach Fox
a1276ba899 Don't poll for history notifs if limitedCommerce is true 2018-10-31 13:31:29 -07:00
SamGondelman
c4c4d2c98d possibly fix mac issues 2018-10-31 13:28:07 -07:00
Zach Fox
efcda129b7 Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce 2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f Notifications are working! 2018-10-31 13:23:58 -07:00
SamGondelman
8633dc0f66 disable interstitial on android 2018-10-31 12:34:20 -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
Dante Ruiz
b3539b101b faster loading bar interpolation once physics is enabled 2018-10-31 11:33:53 -07:00
Roxanne Skelly
2482bb9731 Add logging for install options 2018-10-31 11:07:26 -07:00
Roxanne Skelly
35eb1e5156 Merge branch 'master' of https://github.com/highfidelity/hifi into SetupLogging 2018-10-31 10:38:43 -07:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Andrew Meadows
225e8e0556 always zero velocity on far-grab release of non-dynamic 2018-10-31 10:20:21 -07:00
Roxanne Skelly
b5a48d31b6 Fix code-review spacing issue 2018-10-31 10:18:04 -07:00
Dante Ruiz
0279eef3a4 improving interstitial loading bar 2018-10-31 10:13:32 -07:00
Roxanne Skelly
628ec8ec2b Removed QmlCommerce.cpp, Ledger.cpp changes as requested 2018-10-31 10:09:01 -07:00
NissimHadar
93cff8dfda Corrected indentation. 2018-10-31 08:48:42 -07:00
Roxanne Skelly
e5f06690b5 Strip out references to 'my purchases' vs 'my items' code 2018-10-30 17:31:31 -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
Roxanne Skelly
0e639f4e34 Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce 2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456 Checkpoint Proofs Filter in Inventory 2018-10-30 16:29:20 -07:00
Andrew Meadows
90e944f130 always zero velocity on near-grab release of non-dynamic 2018-10-30 16:20:33 -07:00
Cristian Luis Duarte
bc7e49482a Add Android for the condition of _meshBlendshapeBuffer usage 2018-10-30 19:44:39 -03:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
sam gateau
592c2b267d Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-30 15:07:20 -07:00
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
Cristian Luis Duarte
a09b1adb6c Android temporal change - Bring back GLESBackend TEX_UNIT constants 2018-10-30 16:45:25 -03:00
Roxanne Skelly
1dc96fec79 Implement CR comments for installer text logging 2018-10-30 12:13:46 -07:00
NissimHadar
959c544fcd Made path to VCPKG relative. 2018-10-30 12:05:41 -07:00