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
James B. Pollack
4b4e38a57c
end of day
2016-06-29 18:28:39 -07:00
Seth Alves
52a6a1c65e
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-06-29 18:12:35 -07: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
Seth Alves
5f9c7b6ea5
trying to take joint information into account when raypicking against models
2016-06-29 17:02:49 -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
Seth Alves
98df2770a1
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-06-29 16:18:44 -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
James B. Pollack
fd062d09dc
initial notes and research
2016-06-29 15:59:51 -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
Seth Alves
d53c7ae5d8
experimenting
2016-06-29 12:39:04 -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
Seth Alves
9114ebb548
remove unused code
2016-06-29 09:53:26 -07:00
Seth Alves
c3dbe5d9c4
ray pick against avatar meshes rather than capsules
2016-06-29 09:45:09 -07:00
Seth Alves
03ed36cf33
take shape offset into account when getting avatar's capsule
2016-06-29 09:13:52 -07:00
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -07:00
Triplelexx
9b993b2665
store pointer to event->window()->screen()
...
save the planet!
2016-06-29 03:58:17 +01:00
Triplelexx
2c56d29a68
git add seemed to miss a change
...
use event window, not primaryScreen
2016-06-29 03:47:20 +01:00
Triplelexx
97e90ed798
TouchscreenDevice DPI scaling now handled via JSON mapping
...
do the arbitrary scaling in the mapping file
2016-06-29 03:45:54 +01:00
Seth Alves
52d017ac74
undo previous change
2016-06-28 19:22:19 -07:00
Brad Davis
f93a91a97f
Abandon seperate vertex formats for now
2016-06-28 19:18:16 -07:00
Brad Davis
542601fd9d
Fix invalid GL 4.5 calls
2016-06-28 18:56:25 -07:00
