Howard Stearns
e593077b4b
basic display of user story feed (hardcoded switch place names vs feed)
2016-08-03 09:39:27 -07:00
Howard Stearns
09557b1f9b
Merge pull request #8343 from howard-stearns/scroll
...
scrollable suggested places in address bar
2016-08-02 15:34:35 -07:00
Howard Stearns
c2d1f08551
Merge pull request #8342 from highfidelity/dk/snapshot
...
Snapshot button
2016-08-02 15:31:50 -07:00
howard-stearns
70e07f3299
remove highlight move animation
2016-08-02 13:56:01 -07:00
David Kelly
1d7cdff2bc
Snapshot button plus script
...
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does). Added button to do it, saves them to disk.
The plan is for us to add UI to share (or not) the snapshot. That's
why we are not going through the notifications. Also, the
script makes sure to hide/unhide hud and overlays. Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
2016-08-01 18:21:01 -07:00
howard-stearns
c3bf52267d
Don't suggest loaded places.
2016-08-01 15:27:29 -07:00
howard-stearns
45a49c390b
Merge branch 'discovery' of https://github.com/highfidelity/hifi into scroll
2016-08-01 13:09:20 -07:00
howard-stearns
7cf41d441e
filtering by place
2016-08-01 12:28:57 -07:00
Anthony Thibault
f71a59276c
Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering
...
Fix alpha cut-outs and incorrect gamma on web overlays and entities
2016-07-29 17:44:46 -07:00
howard-stearns
611223f013
highlight to show that the cards can be clicked
2016-07-29 15:49:20 -07:00
howard-stearns
ae9421f1f6
smaller user label, and use the word "people"
2016-07-29 15:22:08 -07:00
howard-stearns
13771a52e8
Merge branch 'master' of https://github.com/highfidelity/hifi into scroll
2016-07-29 09:30:45 -07:00
howard-stearns
ff17761769
basic minority-report scroll (fixed initial data, but infinite cards)
2016-07-28 15:46:32 -07:00
Brad Hefta-Gaub
e879f22c95
fix behavior with no entity server
2016-07-28 15:15:52 -07:00
howard-stearns
ed811d0431
replace Row with ListView, but otherwise same user-functionality
2016-07-28 15:01:21 -07:00
Anthony Thibault
ea310bcc43
Web Entities now render correctly as well
2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a
Merge branch 'master' into bug-fix/web3doverlay-rendering
2016-07-28 11:20:35 -07:00
Bradley Austin Davis
a9740b803f
Defer batch execution to the end of the frame generation
2016-07-26 16:13:48 -07:00
Andrew Meadows
5ce681154d
Merge pull request #8301 from AlexanderOtavka/asset-browser-ui
...
Asset browser ui
2016-07-26 15:04:10 -07:00
Chris Collins
a13c8385bb
Merge pull request #8319 from ZappoMan/punishSlowScripts
...
better allocation of CPU time while loading scenes and when slow scripts are running
2016-07-26 12:54:31 -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
Anthony J. Thibault
fb84f058d6
Fix alpha cut-outs and incorrect gamma on Web3DOverlays
2016-07-25 15:56:05 -07:00
Zander Otavka
90154158b6
Fix gravity zero vector
2016-07-25 14:08:07 -07:00
Zander Otavka
344ec25bcd
Fix gravity for dynamic entities
2016-07-25 14:01:57 -07:00
James B. Pollack
38765e6fa4
extra space
2016-07-25 11:12:34 -07:00
James B. Pollack
84e4de4bad
update formatting
2016-07-25 11:11:37 -07:00
James B. Pollack
ea1c21e685
resolve merge
2016-07-24 18:51:00 -07:00
James B. Pollack
3b25b36db3
cleanup
2016-07-24 16:57:15 -07:00
James B. Pollack
8acb30da8e
add permissions bar
2016-07-24 16:54:00 -07:00
Brad Hefta-Gaub
4f04dbc926
Merge pull request #8308 from jherico/overlay_multi_edit
...
Allow atomic editing of multiple overlays from scripts
2016-07-23 13:51:51 -07:00
Brad Hefta-Gaub
43064807d1
Merge pull request #8292 from jherico/webui
...
Fix some UI elements triggered by WebViews
2016-07-23 13:47:04 -07:00
Brad Hefta-Gaub
41e02276e5
Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override
...
Support for animGraphUrl override in FST file.
2016-07-23 13:42:46 -07:00
Brad Davis
121a0f0f5e
Allow atomic editing of multiple overlays from scripts
2016-07-23 11:41:58 -07:00
Zander Otavka
c25b87c33f
Use custom dialog for asset server add to world
2016-07-22 17:14:45 -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
Anthony Thibault
2429b82b5e
Support for animGraphUrl override in FST file.
2016-07-21 17:17:08 -07:00
Brad Davis
faba1a4b4e
Fix UI elements triggered by WebViews
2016-07-21 15:13:07 -07:00
Zander Otavka
5394c092d0
Fix bug with dropdown
2016-07-20 13:07:45 -07:00
samcake
853f31f6ea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-20 10:49:27 -07:00
Howard Stearns
0b5cdcef42
Merge pull request #8252 from howard-stearns/suggestions
...
suggestions
2016-07-19 15:46:23 -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
howard-stearns
4a6132874f
encodeURIComponent of the protocol signature
2016-07-19 13:43:28 -07:00
Zander Otavka
acf4539f4f
Return a JSON string from QML instead of JS object
...
Idk why QML can't return a JS object, but it can't. Strings work, so I
use a string.
2016-07-19 13:21:08 -07:00
Anthony Thibault
897627ebd6
Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes
...
Mac OS X fixes
2016-07-19 11:18:46 -07:00
samcake
ff132fa712
Gathering the diffusion passes in the SUrfaceGEometryPAss job
2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 23:15:21 -07:00
howard-stearns
57955a2b56
Expose protocol version to qml, and use it in query.
2016-07-18 18:12:27 -07:00
Anthony J. Thibault
ad7fa971aa
copy scripts into build directory
2016-07-18 17:09:10 -07:00
