Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:52:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45893 commits 75 branches 59 tags 1.2 GiB
Commit graph

45893 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
e68f5f35f1 Merge pull request #27 from AlexanderOtavka/assetbutton 
Expose showing asset server to script interface
 2016-08-12 15:21:43 -07:00
Zander Otavka
62f4e3536b Expose showing asset server to script interface 2016-08-12 15:18:30 -07:00
Atlante45
6c5acf4481 Change location of the Steam invite icon 2016-08-12 14:53:03 -07:00
SamGondelman
ccca6d935f don't fade after physics kick in 2016-08-12 14:35:22 -07:00
James B. Pollack
1366dabc3a yay 2016-08-12 14:24:29 -07:00
Howard Stearns
2641c0fd76 Merge pull request #8427 from howard-stearns/pull-from-master 
Pull from master
 2016-08-12 14:18:05 -07:00
howard-stearns
df3769166e Merge branch 'master' of https://github.com/highfidelity/hifi into pull-from-master 2016-08-12 14:16:16 -07:00
Howard Stearns
b88ef3cf6d Merge pull request #8424 from howard-stearns/discovery-cleanup 
Discovery cleanup
 2016-08-12 14:10:39 -07:00
howard-stearns
afe376a0a2 fix breakage I made to snapshot uploading 2016-08-12 14:08:50 -07:00
Stephen Birarda
c330e005dd Merge pull request #8426 from Atlante45/steam 
New metaverse web API
 2016-08-12 13:32:41 -07:00
James B. Pollack
d258c9ed7f pistol adjustments 2016-08-12 12:59:01 -07:00
Brad Davis
e2f7b443fd Merge pull request #8339 from sethalves/overlay-children 
3D Overlays can be children
 2016-08-12 12:16:21 -07:00
howard-stearns
1b62332058 don't show checkboxes on confirmation dialog when there's only one picture 2016-08-12 11:50:11 -07:00
howard-stearns
ae9af88db2 Spacing and better size for HMD pictures. 2016-08-12 11:28:35 -07:00
howard-stearns
df0ceb17e8 send (hi res image) details as a json string 2016-08-12 11:09:22 -07:00
James B. Pollack
7866786da9 Merge pull request #8406 from AlexanderOtavka/script-load 
Disable loading client scripts over ATP
 2016-08-12 11:01:14 -07:00
David Kelly
da7f086715 Merge pull request #8419 from howard-stearns/basic-user-story-card 
basic user story card
 2016-08-12 10:47:10 -07:00
Atlante45
19b3aa9c89 New metaverse web API 2016-08-12 10:42:32 -07:00
Clément Brisset
7c698b8cbb Merge pull request #8423 from Atlante45/steam 
Update Steam branch
 2016-08-12 10:40:53 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
Howard Stearns
d4121a7224 Merge pull request #8411 from davidkelly/dk/gateSnapshotShares 
Hide sharing if not logged in, or in an accessible place
 2016-08-12 10:35:39 -07:00
David Kelly
3408ad6f54 Wording change 2016-08-12 10:23:33 -07:00
David Kelly
e23e9014c6 Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares 2016-08-12 10:16:27 -07:00
Seth Alves
77a49e6c10 when building in debug mode on Linux, for reasons totally beyond me, this code ends up using the Vertex from FBXReader_Mesh.cpp (which is a different size so I get a crash). This change hopefully doesn't change any functionality while sidestepping what's probably a bug in gcc. 2016-08-12 10:01:20 -07:00
Howard Stearns
8708e2ac2b image url, in anticipation of having it in details 2016-08-12 07:00:07 -07:00
James B. Pollack
4c663b9d18 Merge pull request #8416 from SamGondelman/shaderFix 
Don't always mark procedural shaders dirty
 2016-08-11 22:49:46 -07:00
howard-stearns
b4a43db025 include user name in search text for user stories 2016-08-11 17:04:48 -07:00
howard-stearns
cd9bd8dddf we don't need the dummy data any more 2016-08-11 16:58:06 -07:00
Ryan Huffman
211da3c428 Add more user activity tracking data 2016-08-11 16:49:29 -07:00
Howard Stearns
d5a05933a1 Merge pull request #8418 from howard-stearns/discovery 
merge from master to discovery
 2016-08-11 16:49:23 -07:00
howard-stearns
747c43d065 basic user story card 2016-08-11 16:43:29 -07:00
howard-stearns
e3aae0e93f Fix up layout, and adapt to recent changes in file structure 2016-08-11 16:23:01 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Brad Davis
9ee8ab98ad Merge pull request #8417 from Atlante45/steam 
Update to the new Web API interface
 2016-08-11 15:40:09 -07:00
Seth Alves
c363ca9887 3d-model overlays can now be children 2016-08-11 15:29:09 -07:00
Ryan Huffman
473a7e9593 Fix bandwidth calculations not including the full size of reliable ordered messages 
For reliable ordered messages, we were:

 * only tracking bandwidth for the first few packets of a message
   IF a message handler opted in to receiving pending (unfinished)
   messages.
 * tracking the entire thing all at once, when the entire messages
   was received.
 2016-08-11 15:17:36 -07:00
Stephen Birarda
3ec1681a4e Merge pull request #8412 from birarda/default-permissions 
default DS to allow connect for standard groups
 2016-08-11 15:14:52 -07:00
Seth Alves
15e2140cb2 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-11 15:06:58 -07:00
Brad Hefta-Gaub
ea1e090053 Merge pull request #8383 from AndrewMeadows/faster-is-better 
faster image processing on load
 2016-08-11 13:10:44 -07:00
SamGondelman
0f988fb209 don't always mark _shaderDirty when user data changes unless url actually changes 2016-08-11 13:05:16 -07:00
Brad Davis
4c150efc11 Categorize some debug logging in FBX parsing 2016-08-11 12:09:56 -07:00
James B. Pollack
6da2ea1932 Merge pull request #8409 from SamGondelman/loadingFade 
Fix procedural entity transparency
 2016-08-11 12:02:57 -07:00
Atlante45
c34153b67b Change Web API arg name to be more descriptif 2016-08-11 11:57:43 -07:00
David Kelly
c1edd008a4 PR feedback 2016-08-11 11:47:55 -07:00
Ryan Huffman
b6620f128b Add asset server bandwidth to stats 2016-08-11 11:06:36 -07:00
Stephen Birarda
5bac88c004 default domain-server permissions to connect for standard 2016-08-11 10:52:36 -07:00
David Kelly
47dea0ea2b Hide sharing if not logged in, or in an accessible place 
The grand future will have option to login, and so on...
 2016-08-10 17:09:43 -07:00
Howard Stearns
4273056c86 Merge pull request #8410 from davidkelly/dk/snapshotDetails 
Minor update to add details
 2016-08-10 15:17:22 -07:00
David Kelly
5c15b52040 expose getPlaceName() as placename 
Nice for scripts to get the placename.  Nice for us, anyways.
 2016-08-10 14:54:29 -07:00
David Kelly
f8f99721c3 Minor update to add details 
And, now reflects data-web's slightly updated json structure
for returning info on an uploaded snapshot.
 2016-08-10 14:25:00 -07:00