Commit graph

54187 commits

Author SHA1 Message Date
Dante Ruiz
c205bf0980 working on cleaner navigation 2017-05-01 21:23:38 +01:00
Dante Ruiz
9f33af479d saving work 2017-05-01 18:04:22 +01:00
druiz17
f60deb0cfc fixed the twitter link 2017-04-30 22:55:44 -07:00
druiz17
2bf7b12c7d open webview from tabletwebscreen 2017-04-30 15:27:34 -07:00
druiz17
b1abbbe472 Merge branch 'master' of github.com:highfidelity/hifi into webview-js 2017-04-30 13:17:28 -07:00
Seth Alves
14d52cdc8a Merge pull request #10329 from 1st-BrainStormer/patch-1
Update EntityDynamicInterface.cpp
2017-04-29 08:04:08 -07:00
1st-BrainStormer
953a3f7a6f Update EntityDynamicInterface.cpp
Grammar correction.
2017-04-28 20:14:01 -07:00
Stephen Birarda
fed747a545 Merge pull request #10325 from huffman/atp-range-caching
Fix for stuck ATP downloads
2017-04-28 16:54:21 -07:00
Dante Ruiz
59f84a60c5 saving work 2017-04-29 00:31:09 +01:00
Ryan Huffman
89fb0a917b Fix poorly indented if in AssetRequest 2017-04-28 16:27:44 -07:00
Ryan Huffman
765a061086 Fix stuck ATP downloads
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
2017-04-28 16:26:03 -07:00
Stephen Birarda
c518aa55be Merge pull request #10312 from birarda/upload-new-models-to-entity
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Clément Brisset
90e79c7bbc Merge pull request #10317 from birarda/atp-range-caching
don't save ATP range requests to cache
2017-04-28 15:16:11 -07:00
Stephen Birarda
b44a56db80 don't save ATP requests to cache if they are range requests 2017-04-28 10:32:06 -07:00
Stephen Birarda
9bc0609b1e address code review comments 2017-04-28 10:17:48 -07:00
Seth Alves
2a0fc5b34c Merge pull request #10273 from hyperlogic/feature/hips-ik-target
Avatar IK system now supports manipulating the hips.
2017-04-28 09:17:33 -07:00
Howard Stearns
a2721d21ef Merge pull request #10278 from zfox23/newSnapshotReview
New Snapshot Review Dialog
2017-04-28 07:25:47 -07:00
Howard Stearns
e0282f63f3 Merge pull request #10315 from howard-stearns/address-bar-ux
address bar ux
2017-04-28 07:21:53 -07:00
Howard Stearns
0ad8f4d985 remove debugging 2017-04-28 07:15:22 -07:00
Anthony J. Thibault
c61e6a8a9e AnimInverseKinematics: reduce number of magic constants 2017-04-27 18:24:21 -07:00
Anthony J. Thibault
b80270400f Merge branch 'master' into feature/hips-ik-target 2017-04-27 18:15:12 -07:00
Stephen Birarda
038ac745c8 clear domain octree details if ES killed 2017-04-27 17:47:18 -07:00
howard-stearns
aed762e986 ux 2017-04-27 17:16:03 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Zach Fox
3f146fca9d Fix announcement audience; Fix disabled buttons 2017-04-27 15:36:59 -07:00
Seth Alves
2c2f51689a Merge pull request #10300 from vladest/tablet-edit-tocreate
Renamed EDIT to CREATE
2017-04-27 15:31:14 -07:00
Zach Fox
4152e44d2c Click anywhere on the image except the bottom to toggle share buttons 2017-04-27 14:01:08 -07:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00
Zach Fox
794751abfa Nested objects aren't REAL! 2017-04-27 14:01:08 -07:00
Zach Fox
832e16ef86 Visual tweaks; fix active share buttons; comment out tests 2017-04-27 14:01:07 -07:00
Zach Fox
7297355183 Open ShareBar on P0 by default 2017-04-27 14:01:07 -07:00
Zach Fox
0ac660d4ab Cleanup 2017-04-27 14:01:07 -07:00
Zach Fox
b6601feb1d It's 5 already? 2017-04-27 14:01:07 -07:00
Zach Fox
a24a48843f Checkpoint 2017-04-27 14:01:07 -07:00
Zach Fox
b26f31704b Fix button state; use request() 2017-04-27 14:01:07 -07:00
Zach Fox
6711e8cbc2 Remove duplicate setting; Make settings page open; button state 2017-04-27 14:01:07 -07:00
Zach Fox
3221214283 New Snap FTUE flow 2017-04-27 14:01:07 -07:00
Zach Fox
92187e2424 Making progress towards file chooser dialog 2017-04-27 14:01:07 -07:00
Zach Fox
8c9cd0fad0 Custom social buttons; better testing functionality 2017-04-27 14:01:07 -07:00
Zach Fox
d461723012 Thanks to Jess, slightly different Tweet language 2017-04-27 14:01:07 -07:00
Zach Fox
d7348aabc8 Quick comment updates 2017-04-27 14:01:07 -07:00
Zach Fox
ef2e5f78ff Startings of needsLogin support 2017-04-27 14:01:07 -07:00
Zach Fox
e1789996fb Add announcements support 2017-04-27 14:01:06 -07:00
Zach Fox
f838e87f48 Pretty stable... 2017-04-27 14:01:06 -07:00
Zach Fox
7c5de1e60b Getting closer 2017-04-27 14:01:06 -07:00
Zach Fox
fad470eeea Checkpoint (this is complicated) 2017-04-27 14:01:06 -07:00
Zach Fox
eaa699bbfd Wow, it's really coming together! 2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e Checkpoint 2017-04-27 14:01:06 -07:00
Zach Fox
c08b40b950 Initial sharing code hooked up 2017-04-27 14:01:06 -07:00
Zach Fox
01e78612c7 Soooo much progress today 2017-04-27 14:01:06 -07:00