Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73439 commits 25 branches 28 tags 1.2 GiB
Commit graph

73439 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dante Ruiz
b33934ec46 fixing Image3DOverlay scaling 2018-11-02 14:24:14 -07:00
Simon Walton
e64557a46c Clamp the fixed-point network values to their limits 2018-11-02 11:52:40 -07:00
Cristian Luis Duarte
c310d41af7 Change GPU_RESOURCE_BUFFER_SLOT1_TEXTURE to 36 2018-11-02 14:59:30 -03:00
Cristian Luis Duarte
bcda6a7005 Revert headerFlag change to -h 2018-11-02 14:03:39 -03:00
Zach Fox
2b50c40224 Minor changes found by Chang 2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58 Update language 2018-11-02 09:23:31 -07:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
Roxanne Skelly
9ca862ad6b Case 19373 - Lowering volume on another user in PAL mutes them 2018-11-01 17:25:41 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
sam gateau
e5a96f265d Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-01 16:57:13 -07:00
Zach Fox
20cd1df22c Lotsa changes 2018-11-01 16:48:08 -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
Howard Stearns
8256bfbc55 icons 2018-11-01 15:20:50 -07:00
Zach Fox
bccb3f1de9 Prepare for further work 2018-11-01 14:53:10 -07:00
Ryan Huffman
4593b33435 Fix new models not obeying dynamic checkbox 2018-11-01 14:38:55 -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
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