Commit graph

45534 commits

Author SHA1 Message Date
Atlante45
c34153b67b Change Web API arg name to be more descriptif 2016-08-11 11:57:43 -07:00
Clément Brisset
5ad6f021ed Merge pull request #8303 from Atlante45/feat/steamworks
Steam account integration
2016-08-09 17:48:38 -07:00
Atlante45
25b60d0c62 CR feedback 2016-08-09 10:07:57 -07:00
Clément Brisset
59dec06235 Merge pull request #8390 from Atlante45/steam
Update Steam branch with master
2016-08-08 15:42:15 -07:00
Atlante45
f08b2f9257 Remove temporary override to reload QML 2016-08-08 15:39:44 -07:00
Atlante45
61d07cf952 Restore mateverse URL 2016-08-08 15:39:25 -07:00
Atlante45
51b45f8f73 Steam invite are facing the current position 2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
2af32ca60e Only leave lobby if you were invited 2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
6b861e680f More work on lobby creation/invites 2016-08-08 15:39:25 -07:00
Atlante45
af76e47629 Fix linux build 2016-08-08 15:39:25 -07:00
Atlante45
3d6a6b9d6b Add steam.js to default scripts 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 2016-08-08 15:39:25 -07:00
Atlante45
a13950752b Update steam location with discoverability 2016-08-08 15:39:25 -07:00
Atlante45
e5290076be First draft for Steam friends 2016-08-08 15:39:25 -07:00
Atlante45
0663766074 Replace metaverse server with testing URL 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
Atlante45
45921a5c8d Restore split behavior for inputs/displays on quit 2016-08-08 15:39:25 -07:00
Brad Hefta-Gaub
882ad2f6fb Merge pull request #8311 from huffman/feat/angular-loading
Add priority loading for model entities
2016-08-08 13:06:56 -07:00
Brad Hefta-Gaub
b903c974bc Merge pull request #8371 from imgntn/teleport_cancel
Cancel mode for teleporting
2016-08-08 13:04:27 -07:00
James B. Pollack
58ccc9581a cleanup 2016-08-08 12:20:48 -07:00
Ryan Huffman
fb14628a7e Handle case in entity loading priority function where max dim size is <= 0 2016-08-08 10:39:27 -07:00
Ryan Huffman
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9 Add ability to set number of concurrent downloads 2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
Chris Collins
6585be036c Merge pull request #8381 from sethalves/unhide-advanced-button
remove hidden attribute from advanced settings button
2016-08-06 08:08:23 -07:00
Philip Rosedale
da8b075d34 Merge pull request #8378 from sethalves/fix-auto-unequip
fix auto-unequip
2016-08-05 18:19:11 -07:00
Seth Alves
f348b56106 remove hidden attribute from advanced settings button 2016-08-05 18:16:48 -07:00
Seth Alves
090a0a6e9a only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip 2016-08-05 18:01:48 -07:00
Brad Hefta-Gaub
652bea8cd0 Merge pull request #8363 from birarda/no-temp-ice-update
Avoid DS heartbeats with non-metaverse domain ID
2016-08-05 16:48:00 -07:00
Brad Hefta-Gaub
452c0218da Merge pull request #8358 from AlexanderOtavka/inline-e-script
Fix parsing of embedded entity scripts
2016-08-05 16:46:02 -07:00
Brad Hefta-Gaub
3f3dda6356 Merge pull request #8360 from sethalves/no-accidental-fly
don't accidently fly
2016-08-05 16:45:48 -07:00
Brad Hefta-Gaub
7cbc0bcabe Merge pull request #8366 from kencooke/master
optimized distance-attnuation calculation
2016-08-05 16:45:35 -07:00
Seth Alves
e59c010642 speling 2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7 adjust code that auto-unequips items when they are pulled too far from the equipping hand 2016-08-05 15:28:37 -07:00
Chris Collins
1e2d77a99b Merge pull request #8346 from sethalves/default-when-av-fails
use default avatar when avatar-url is bogus
2016-08-05 15:13:58 -07:00
Brad Hefta-Gaub
82119f7f0b Merge pull request #8336 from ctrlaltdavid/21018
close file browser dialog immediately after selecting asset to upload
2016-08-05 14:39:35 -07:00
Chris Collins
f0338ceb49 Merge pull request #8373 from sethalves/groups-handle-camelcase-usernames
Fix some group-related code to handle CamelCase usernames
2016-08-05 09:53:43 -07:00
Seth Alves
7aa7cdf642 Merge branch 'master' of github.com:highfidelity/hifi into groups-handle-camelcase-usernames 2016-08-05 07:42:49 -07:00
James B. Pollack
80da690680 incease distance a bit 2016-08-05 00:04:30 -07:00
James B. Pollack
7d37f86337 different swapping method 2016-08-04 23:45:43 -07:00
Seth Alves
3ca1ee1d82 Fix some group-related code to handle CamelCase usernames 2016-08-04 17:39:41 -07:00
James B. Pollack
80b6ca2b86 single call to istooclose 2016-08-04 16:47:10 -07:00
Brad Davis
49ad0951dd Merge pull request #8364 from sethalves/fix-settings-missing-key
fix bug which caused getValue for a non-existent key to return the integer 2
2016-08-04 16:39:49 -07:00