Commit graph

5203 commits

Author SHA1 Message Date
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Clément Brisset
d1fb723b01 Merge pull request #8444 from zzmp/fix/skybox
fix flashing in default skybox, and allow skybox lighting without textures
2016-08-18 11:07:09 -07:00
Stephen Birarda
3355a90e7d Merge pull request #8413 from huffman/feat/atp-bandwidth
Add asset server bandwidth to stats
2016-08-16 15:54:11 -07:00
Zach Pomerantz
8c559bc65d use lights from nontextured skyboxes 2016-08-16 13:27:22 -07:00
Zach Pomerantz
4d0c819173 remove peaking irradiance from default background 2016-08-16 13:26:33 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded
Threaded rendering
2016-08-15 09:59:44 -07:00
Ryan Huffman
b5e2913eb9 Move node received bandwidth tracking to LimitedNodeList 2016-08-15 09:23:02 -07:00
Brad Davis
5b09748c00 Merge pull request #8431 from imgntn/assetbutton
Open Asset Browser with Button from Edit.js Toolbar
2016-08-13 12:04:21 -07:00
Brad Davis
cac529a1b1 Display plugins now use gpu::Context API 2016-08-12 22:29:00 -07:00
Brad Davis
d548da02d9 Expose whether nsight is running to the app, disable some stuff under nsight 2016-08-12 22:28:50 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Clément Brisset
5a1c7bd4e6 Merge pull request #8407 from highfidelity/steam
Steam integration
2016-08-12 16:55:48 -07:00
Zander Otavka
62f4e3536b Expose showing asset server to script interface 2016-08-12 15:18:30 -07:00
SamGondelman
ccca6d935f don't fade after physics kick in 2016-08-12 14:35:22 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
Zander Otavka
4e16998b45 Disable loading client scripts over ATP 2016-08-09 17:36:59 -07:00
Brad Hefta-Gaub
d8f1847fde Merge pull request #8365 from huffman/feat/default-skybox
Default skybox change
2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub
d8edf5c85a Merge pull request #8357 from sethalves/fsm-arrows-dont-walk
FSM arrow keys don't make the avatar walk
2016-08-09 11:17:00 -07:00
Ryan Huffman
8ee3f680c9 Change default skybox ambient intensity from 3.5 to 2.0 2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25 Replace 'Stars' menu option with 'Default Skybox' 2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd Adjust commenting out of old stars rendering code 2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60 Add static consts for default skybox values 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016 Merge pull request #8368 from huffman/feat/domain-connection-display
Automatically show address bar after disconnected for X seconds
2016-08-08 15:56:29 -07:00
Atlante45
f08b2f9257 Remove temporary override to reload QML 2016-08-08 15:39:44 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 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
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
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
8044910bf2 Add show-address-bar when disconnected from domain 2016-08-04 14:39:53 -07:00
Seth Alves
40a5e4abc8 in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk 2016-08-03 13:54:25 -07:00
Brad Hefta-Gaub
e879f22c95 fix behavior with no entity server 2016-07-28 15:15:52 -07:00
Bradley Austin Davis
a9740b803f Defer batch execution to the end of the frame generation 2016-07-26 16:13:48 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui
Edit model dialog improvements
2016-07-22 17:11:52 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor
Vive HMD fixes to prevent user from becoming embedded in the floor.
2016-07-22 09:04:40 -07:00
samcake
853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-20 10:49:27 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode.
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
2016-07-19 14:42:24 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
Anthony J. Thibault
7fd40a5d10 MacOS: fix crash when touchscreen device is nullptr. 2016-07-18 17:08:17 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
2016-07-15 17:35:55 -07:00
samcake
a3f6ed6a89 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-15 09:22:34 -07:00