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

69584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
5d570f030f fixing calibration 2018-06-08 11:18:52 -07:00
Sam Gondelman
87e6df3cba
Merge pull request #13319 from Cristo86/android_search_untagged 
Android - Allow search among protocol compatible user stories and not only tagged ones
 2018-06-08 10:59:33 -07:00
Zach Fox
d4a19e7bc9 Fix MS15721: Delete app.json if installed script isn't running 2018-06-08 10:52:14 -07:00
Simon Walton
131a57248b NLPacket local ID could be used uninitialized (according to valgrind) 2018-06-08 10:27:03 -07:00
Zach Fox
76b5dae721 Let's try 20% 2018-06-08 10:19:55 -07:00
amantley
dabcd4c234 fixed bracket spacing in HeadData.h 2018-06-08 10:19:33 -07:00
Sam Gateau
7f8af47075
Merge pull request #13326 from SamGondelman/green 
Fix models starting as green boxes
 2018-06-08 10:09:53 -07:00
David Back
e8aece4c11
Merge pull request #13315 from dback2/avatarFeet 
Fix default avatar feet
 2018-06-08 10:00:43 -07:00
howard-stearns
21ed081eae proper name for updated type filter of inventory endpoint 2018-06-08 09:52:11 -07:00
Gabriel Calero
1a039ca504 Trying to fix build script 2018-06-08 12:38:24 -03:00
John Conklin II
0cadb95d62
Merge pull request #13336 from Atlante45/fix/ual-default-rc68 
Set UAL default value earlier to be caught by crashpad - RC68
 2018-06-08 08:15:49 -07:00
Gabriel Calero
cfc98afaf0 Add breakpad as external dependency 2018-06-08 12:11:01 -03:00
Ken Cooke
c69b006eac Fix compiler warnings 2018-06-08 06:29:30 -07:00
amantley
b1c578ecaa fixed white space in head.cpp 2018-06-07 22:13:53 -07:00
howard-stearns
64e466ee7d snapshot stacks 2018-06-07 21:10:40 -07:00
David Rowe
8e1e93abb0 Don't save user location if not connected to domain 2018-06-08 15:04:01 +12:00
Atlante45
83e1db14cf Set UAL default value earlier to be caught by crashpad 2018-06-07 19:40:30 -07:00
howard-stearns
595a0d8733 restore lost code 2018-06-07 19:24:05 -07:00
amantley
3f58202667 updated the AvatarMixerPacketVersion to ProceduralFaceMovementFlagsAndBlendshapes in PacketHeaders.cpp 2018-06-07 17:41:12 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
SamGondelman
c7007c089f fix tablet not disappearing 2018-06-07 16:35:22 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes 
synching with upstream master
 2018-06-07 16:20:11 -07:00
amantley
22f2583556 removed debug print statement in AvatarData.cpp 2018-06-07 16:17:33 -07:00
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
howard-stearns
8b08505116 using filter/sort endpoint parameters 2018-06-07 16:14:18 -07:00
Zach Fox
c1b971a269 Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider 2018-06-07 16:10:44 -07:00
Ken Cooke
318c30373f Fix compiler warnings 2018-06-07 15:45:46 -07:00
amantley
67fc7b90b5 fixed get and set semi nibble to deal with 16 bits 2018-06-07 15:43:21 -07:00
Anthony J. Thibault
608575cf17 Large avatars should instantly shrink when entering small height domains 
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
 2018-06-07 15:31:40 -07:00
David Back
9a7e199528
Merge pull request #13270 from dback2/cloneables 
Use version from JSON on domain restore
 2018-06-07 15:15:43 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
Zach Fox
f9b6e3e2ac
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks 
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
 2018-06-07 15:10:00 -07:00
Gabriel Calero
3911a93a38 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-07 19:00:16 -03:00
Gabriel Calero
8869af069e Integrate Breakpad in android Interface 2018-06-07 18:59:43 -03:00
Ken Cooke
da63ad53f2 Fix compiler warnings 2018-06-07 14:49:05 -07:00
Zach Fox
f7de3cf218 Try a value of 1.8 2018-06-07 14:45:33 -07:00
John Conklin II
954a86e534
Merge pull request #13327 from sethalves/FB14390 
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
 2018-06-07 14:27:51 -07:00
Cristian Luis Duarte
2b0ac6a9bd Android - Make sure we call Interface enterBackground when opening the app 2018-06-07 18:22:58 -03:00
druiz17
8c83bd29a3 making requested changes 2018-06-07 14:04:39 -07:00
Zach Fox
7d8e02e714 Fix MS15663/15664: Don't set Wallet Status to 'ready' too early 2018-06-07 14:01:52 -07:00
Zach Fox
448a522b70 MS15673: Do some experiments on bubble size 2018-06-07 13:29:33 -07:00
howard-stearns
df0ecb44a8 fix crash setting model texture 
(cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)
 2018-06-07 13:21:45 -07:00
Alexander Ivash
da92ff993f terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME 2018-06-07 13:12:35 -07:00
SamGondelman
c18602d22e fix models starting as green boxes 2018-06-07 13:03:56 -07:00
amantley
97831e61f0 removed stray comments 2018-06-07 12:54:46 -07:00
Zach Fox
93eba5fe5e
Merge pull request #13293 from zfox23/MS7224_cubeSnapshots 
Fix MS7224: Add dimensions to printed Snapshot entity
 2018-06-07 12:52:20 -07:00
Zach Fox
d33875e142
Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak 
Fix MS15574: Tiny memory leak in Wallet.h
 2018-06-07 12:42:24 -07:00
John Conklin II
287fd67e67
Merge pull request #13313 from dback2/gamepadEnabled 
Enable gamepad by default
 2018-06-07 12:42:04 -07:00
Cristian Duarte
664884c9a8
Use third person camera mode when switching to My View from Radar mode. 
This makes it consistent with the default third person camera in My View.
 2018-06-07 16:41:41 -03:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00