howard-stearns
125f6d8b63
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:49:19 -07:00
James B. Pollack
3b57fd1faf
Merge pull request #8173 from SamGondelman/snapshotFix2
...
Fix snapshot dialog rendering
2016-06-30 16:48:43 -07:00
howard-stearns
f03f5f3e68
new icons
2016-06-30 16:47:10 -07:00
howard-stearns
b22844dc97
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:24:36 -07:00
howard-stearns
ff55644fe8
stateful hud toolbar buttons
2016-06-30 16:24:11 -07:00
Brad Davis
b7926b8582
Don't render wire geometry with lighting effects
2016-06-30 16:11:05 -07:00
Anthony J. Thibault
d8e5e3cbe4
equip bug fix
...
you should not be able to equip an object that is already equipped, with your other hand.
2016-06-30 16:00:18 -07:00
SamGondelman
69ffd63ba7
fix snapshot sharing window
2016-06-30 15:42:48 -07:00
Seth Alves
b9f9b18083
if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime
2016-06-30 15:41:58 -07:00
Brad Davis
14784a6088
Remove default focus on text fields
2016-06-30 15:22:13 -07:00
Brad Davis
167cb72a0e
Don't auto-focus the filter field in running scripts
2016-06-30 15:18:59 -07:00
Brad Davis
ce54f1b1d1
Improve desktop 'unfocus' functionality
2016-06-30 15:18:14 -07:00
Brad Davis
86f8b57841
Highlight controls based on activeFocus, not focus
2016-06-30 15:16:28 -07:00
Ryan Huffman
dd73f0c333
Remove unused header from AccountManager.h
2016-06-30 14:50:29 -07:00
Ryan Huffman
49da7d9a61
Remove sending of session id in request body in favor of header
2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007
Fix multiple sessions being created for some users
...
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
2016-06-30 14:35:27 -07:00
Brad Davis
dfb6cb1aa3
Updating entity list
2016-06-30 14:25:36 -07:00
Zander Otavka
5b343c9b82
Fix eslint descrepencies
...
Prohibit trailing commas, and fix function spacing rule to be more in
line with the coding standard. Also prohibit leading decimal points,
also specified in coding standard.
2016-06-30 14:18:07 -07:00
Anthony J. Thibault
82b1cba81d
equip improvements
...
Allow the user to equip an object while near or far grabbing it from the other hand.
2016-06-30 13:58:44 -07:00
Brad Davis
7b0b56d793
Merge pull request #8157 from jherico/qml_fixes
...
HMD UI Fixes
2016-06-30 13:26:57 -07:00
Brad Davis
1f451269cd
Allow scripts to receive a visibility changed signal from their windows
2016-06-30 13:22:01 -07:00
Howard Stearns
49e5f668c1
Merge pull request #8147 from howard-stearns/update-invisible-reticle-only-when-triggered
...
update reticle from hand controllers only when triggered
2016-06-30 11:52:36 -07:00
Howard Stearns
5556bbb0a3
Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered
2016-06-30 11:25:44 -07:00
Sam Gondelman
fcb7652c8f
Merge pull request #8155 from AndrewMeadows/cap-static-mesh-vertex-count
...
Cap static mesh vertex count
2016-06-30 11:09:49 -07:00
Sam Gondelman
b7619f2d78
Merge pull request #8109 from imgntn/somebow
...
updates to bow
2016-06-30 11:08:05 -07:00
Sam Gondelman
aaa33bab98
Merge pull request #8080 from birarda/api-recheck-on-fail
...
simplify domain connection refusal dialog checking
2016-06-30 11:07:43 -07:00
Brad Hefta-Gaub
7dd53d7757
Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area
...
limit hand controller actions to recommended area
2016-06-30 11:06:32 -07:00
Anthony Thibault
61193ebd6d
Merge pull request #8156 from howard-stearns/use-normal-script-update-frequency-for-handControllerPointer
...
use normal script update frequency for handControllerPointer
2016-06-30 10:59:56 -07:00
SamGondelman
057fc8adce
endable blending
2016-06-30 10:25:49 -07:00
SamGondelman
be102ba926
remove unused variable
2016-06-30 10:05:57 -07:00
David Rowe
759b3065fc
Distinguish between file name and directory as prompt in file chooser
2016-06-30 20:48:19 +12:00
SamGondelman
40d584021a
replace old code completely, removed unnecessary blit
2016-06-29 18:09:46 -07:00
Anthony J. Thibault
6072487c9c
Equip-points attachments work
...
Also made handControllerGrab.js eslint clean.
2016-06-29 17:28:53 -07:00
Zach Pomerantz
925aea162a
Merge pull request #8161 from zzmp/fix/8160-hotfix
...
fix domain-server issues with metadata hours, hotfixed in stable
2016-06-29 16:31:03 -07:00
Zach Pomerantz
e91e891676
Merge branch 'stable' of github.com:highfidelity/hifi into fix/8160-hotfix
2016-06-29 16:23:54 -07:00
Stephen Birarda
a3189345d6
Merge pull request #8160 from zzmp/fix/metadata-mac
...
fix metadata hours parsing on mac
2016-06-29 16:18:38 -07:00
SamGondelman
335ed667bb
dk2 snapshot takes picture of HMD window
2016-06-29 16:05:17 -07:00
Anthony J. Thibault
43d4dba4c0
iterate over hotspots not entities.
...
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473
WIP, equip-points work but they don't use the proper attach point.
2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637
Addition of equipHotspots
2016-06-29 13:53:06 -07:00
SamGondelman
15d09bb4fa
cleanup, fixed texture corruption bug
2016-06-29 13:33:33 -07:00
Stephen Birarda
1b87e902de
fix initialization of DEFAULT_HOURS in DomainMetadata
2016-06-29 13:23:52 -07:00
Zach Pomerantz
80fceccb7e
simplify hours parsing in domain metadata
2016-06-29 12:43:39 -07:00
James B. Pollack
6d3129899b
remove prints, fix typo, formatting
2016-06-29 11:47:41 -07:00
James B. Pollack
0e3b54c130
remove logging
2016-06-29 11:07:48 -07:00
SamGondelman
af2a0ed924
preserve preview aspect ratio, fix device pixel ratio scaling
2016-06-29 11:02:43 -07:00
James B. Pollack
fcb6e7869d
logging
2016-06-29 10:54:24 -07:00
Brad Davis
5a9be817df
PR comments
2016-06-29 10:28:55 -07:00
James B. Pollack
1b61a240c1
Merge remote-tracking branch 'upstream/master' into somebow
2016-06-29 10:17:47 -07:00
samcake
f3c5324e5c
Merge pull request #7937 from jherico/gpu_breakup3
...
Adding GL 4.5 backend and tests
2016-06-29 10:13:46 -07:00
