Seth Alves
|
dbe65df90b
|
merge from upstream
|
2016-08-23 16:42:02 -07:00 |
|
Howard Stearns
|
89b00883dd
|
Merge pull request #8428 from highfidelity/discovery
Snapshot of Snapshot-Discovery to master
|
2016-08-23 14:32:10 -07:00 |
|
Ryan Downe Karpf
|
82041e4baa
|
Merge pull request #8514 from imgntn/center_hud
Center HMD Hud after teleport
|
2016-08-23 13:34:29 -07:00 |
|
Howard Stearns
|
3f30b23b78
|
Merge pull request #8496 from huffman/fix/address-bar-popup
Fix address bar being opened when moving between places on same domain
|
2016-08-23 13:08:31 -07:00 |
|
James B. Pollack
|
fb6fa687e8
|
in the right place... thanks howard!
|
2016-08-23 12:07:59 -07:00 |
|
James B. Pollack
|
fcf459645d
|
center after teleport
|
2016-08-23 12:02:57 -07:00 |
|
Brad Hefta-Gaub
|
21bc06f154
|
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
handControllerGrab and web entity input integration
|
2016-08-23 09:59:25 -07:00 |
|
Brad Hefta-Gaub
|
52cd222714
|
Merge pull request #8504 from zzmp/fix/argee
fix typo argee->agree
|
2016-08-23 09:52:43 -07:00 |
|
Howard Stearns
|
97c706f4cb
|
Merge pull request #8511 from howard-stearns/size-card-up
size activity card up
|
2016-08-23 09:48:03 -07:00 |
|
howard-stearns
|
7601876641
|
Scale the activity card back up to match the window being scaled down, so
that it covers the address bar.
|
2016-08-23 09:44:28 -07:00 |
|
Howard Stearns
|
7a9e832959
|
Merge pull request #8509 from ctrlaltdavid/discovery
Fix server card window scale
|
2016-08-22 21:35:07 -07:00 |
|
David Rowe
|
f7389dc059
|
Fix server card window scale
|
2016-08-23 16:28:32 +12:00 |
|
Seth Alves
|
6c80a35c4b
|
Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1
ignoreIK flag on action-grabbable objects works again
|
2016-08-22 18:48:39 -07:00 |
|
Seth Alves
|
219d9cefeb
|
Merge pull request #8498 from birarda/temp-with-oauth
allow temp domains to use access token when present
|
2016-08-22 18:25:18 -07:00 |
|
Zach Pomerantz
|
cbb115bbcc
|
fix typo argee->agree
|
2016-08-22 16:34:23 -07:00 |
|
Howard Stearns
|
f53ce94b20
|
Merge pull request #8503 from howard-stearns/pr-review-comments-5
pr review
|
2016-08-22 16:10:47 -07:00 |
|
howard-stearns
|
bc90b0bc43
|
pr review
|
2016-08-22 16:09:09 -07:00 |
|
Howard Stearns
|
bfb7d728ad
|
Merge pull request #8502 from howard-stearns/pr-review-comments-4
pr review comments 4
|
2016-08-22 15:30:50 -07:00 |
|
howard-stearns
|
fc906df5f6
|
separate into three files
|
2016-08-22 15:04:38 -07:00 |
|
howard-stearns
|
6daf91166f
|
pr comments
|
2016-08-22 15:03:51 -07:00 |
|
howard-stearns
|
056b90c662
|
separate into four files
|
2016-08-22 15:01:55 -07:00 |
|
Brad Hefta-Gaub
|
0397c6b6ca
|
Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data
workaround bad FBXMesh data rather than assert
|
2016-08-22 14:21:48 -07:00 |
|
Anthony J. Thibault
|
d015c5cfb5
|
Merge branch 'master' into feature/hand-controller-web-entity-integration
|
2016-08-22 14:13:17 -07:00 |
|
Howard Stearns
|
f9d8ccaeac
|
Merge pull request #8501 from howard-stearns/pr-review-comments-3
Pr review comments 3
|
2016-08-22 12:52:40 -07:00 |
|
howard-stearns
|
989974738a
|
dead code removal
|
2016-08-22 12:50:51 -07:00 |
|
howard-stearns
|
d0b58d8f8e
|
move thread safety into Application from caller
|
2016-08-22 12:49:51 -07:00 |
|
Howard Stearns
|
ba72dc6375
|
Merge pull request #8499 from howard-stearns/pr-review-comments-2
pr review comments
|
2016-08-22 11:04:57 -07:00 |
|
howard-stearns
|
80afc6a3b4
|
pr review comments
|
2016-08-22 10:59:21 -07:00 |
|
Anthony J. Thibault
|
b6a4904068
|
remove explicit check for WebEntity from setKeyboardFocus
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
|
2016-08-22 10:56:35 -07:00 |
|
Stephen Birarda
|
d098a1ae28
|
allow temporary domains to use an access token when present
|
2016-08-22 10:50:39 -07:00 |
|
Ryan Huffman
|
bd86318611
|
Fix address bar being opened when moving between places on same domain
|
2016-08-22 10:36:56 -07:00 |
|
Howard Stearns
|
ed3b04f97c
|
Merge pull request #8494 from howard-stearns/pr-review-comments
pr review comments
|
2016-08-22 09:59:45 -07:00 |
|
howard-stearns
|
02d3666d86
|
code review cleanup
|
2016-08-22 09:58:27 -07:00 |
|
Brad Hefta-Gaub
|
60210c323f
|
Merge pull request #8470 from sethalves/suggest-override
add -Wsuggest-override to compile flags and deal with fallout
|
2016-08-22 09:46:18 -07:00 |
|
Howard Stearns
|
b3623da772
|
Merge pull request #8492 from howard-stearns/larger-story-card
larger story card
|
2016-08-22 09:30:20 -07:00 |
|
Seth Alves
|
9bcda1bb45
|
merge from upstream
|
2016-08-20 15:25:04 -07:00 |
|
Brad Hefta-Gaub
|
857e97e979
|
Merge pull request #8480 from sethalves/dont-say-insufficient-data-during-login
don't send a login-denied packet when we're still waiting for user's public key
|
2016-08-20 13:48:10 -07:00 |
|
Howard Stearns
|
f877e65703
|
larger story card
|
2016-08-20 10:45:02 -07:00 |
|
Howard Stearns
|
1dd255f9d8
|
Merge pull request #8490 from ctrlaltdavid/discovery
Add icon to "Share in Feed" button
|
2016-08-20 09:37:02 -07:00 |
|
David Rowe
|
80ee864143
|
Add icon to "Share in Feed" button
|
2016-08-20 18:17:49 +12:00 |
|
Howard Stearns
|
35829f5f01
|
Merge pull request #8489 from howard-stearns/merge-from-master-to-discovery3
Merge from master to discovery3
|
2016-08-19 21:36:48 -07:00 |
|
Howard Stearns
|
7428eb2635
|
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
|
2016-08-19 21:34:55 -07:00 |
|
Howard Stearns
|
0a67fea6fe
|
Merge pull request #8488 from howard-stearns/snapshot-review-size
decrease snapshot review dialog height
|
2016-08-19 21:31:04 -07:00 |
|
Howard Stearns
|
527fb0941f
|
decrease snapshot review dialog height
|
2016-08-19 21:28:12 -07:00 |
|
Howard Stearns
|
423083d244
|
Merge pull request #8487 from ctrlaltdavid/discovery
Style snapshot dialog
|
2016-08-19 21:15:21 -07:00 |
|
David Rowe
|
8d88726dba
|
Fix spacing above image when single column
|
2016-08-20 13:57:00 +12:00 |
|
David Rowe
|
a94c24e6df
|
Text and controls
|
2016-08-20 13:44:47 +12:00 |
|
Chris Collins
|
74cb2d4bcf
|
Merge pull request #8461 from imgntn/demo_movement
Movement changes for Hand Controllers
|
2016-08-19 18:36:40 -07:00 |
|
Howard Stearns
|
c262b0a497
|
Merge pull request #8484 from howard-stearns/switch-to-html-cards
switch over to metaverse server user story cards
|
2016-08-19 17:55:32 -07:00 |
|
Chris Collins
|
9cd870bd34
|
Merge pull request #8485 from Atlante45/master
Move steam.js to unpublishedScripts
|
2016-08-19 17:18:08 -07:00 |
|