Clément Brisset
5a1c7bd4e6
Merge pull request #8407 from highfidelity/steam
...
Steam integration
2016-08-12 16:55:48 -07:00
Clément Brisset
c62630a476
Merge pull request #8430 from Atlante45/steam
...
Update Steam invite icon
2016-08-12 16:05:21 -07:00
James B. Pollack
cd10b2b62e
open asset browser with a button
2016-08-12 15:49:36 -07:00
Atlante45
121890235c
New steam invite icon
2016-08-12 15:24:28 -07:00
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
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
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
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
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
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
Ryan Huffman
211da3c428
Add more user activity tracking data
2016-08-11 16:49:29 -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
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
SamGondelman
d8545bc7a3
fix procedural transparency
2016-08-10 13:49:35 -07:00
Brad Hefta-Gaub
5bd5fc43d3
Merge pull request #8408 from SamGondelman/miniMirrorFade
...
Mini mirror fades with overlays
2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub
a714f325fe
Merge pull request #8333 from SamGondelman/miscFixes
...
Miscellaneous cmake and render engine improvements
2016-08-10 11:06:50 -07:00
SamGondelman
e35d453b37
...missing space
2016-08-10 10:36:37 -07:00
SamGondelman
9e20d92241
CR changes
2016-08-10 10:35:18 -07:00
Brad Hefta-Gaub
7503a495fd
Merge pull request #8401 from ctrlaltdavid/21026
...
Fix crash when adding new attachment
2016-08-10 09:18:17 -07:00
Brad Hefta-Gaub
9874c63b25
Merge pull request #8398 from zzmp/refactor/system-html
...
refactor system html to split js/css
2016-08-10 09:17:52 -07:00
Brad Hefta-Gaub
d736857ecb
Merge pull request #8391 from AlexanderOtavka/qml-atp
...
Add support for ATP protocol to QML
2016-08-10 09:16:20 -07:00
SamGondelman
50a4c8b496
mini mirror fades with overlays
2016-08-09 18:02:56 -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
Zander Otavka
4e16998b45
Disable loading client scripts over ATP
2016-08-09 17:36:59 -07:00
Brad Hefta-Gaub
412052c285
Merge pull request #8380 from highfidelity/fade
...
Add fade in loading effect
2016-08-09 16:50:05 -07:00
Brad Hefta-Gaub
8abbe27c07
Merge pull request #8387 from SamGondelman/mappingFixes
...
Fix Standard.A/B/X/Y primary thumb JSON mappings
2016-08-09 16:43:45 -07:00
Brad Hefta-Gaub
657dc530b4
Merge pull request #8399 from SamGondelman/xboxFixes
...
Teleport works with xbox controllers
2016-08-09 16:41:37 -07:00
SamGondelman
2360e90d39
simplify valid check for rotation
2016-08-09 15:48:31 -07:00
David Rowe
8e56e0bf18
Fix QML warning
2016-08-10 10:41:37 +12:00
David Rowe
afe76c69d2
Fix crash when adding new attachment
2016-08-10 10:41:16 +12:00
Zach Pomerantz
d5b822ddbe
remove missing camera selectors
2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520
refactor system html to split js/css
2016-08-09 15:23:31 -07:00
