Sam Gondelman
af67d814eb
Merge pull request #8163 from ctrlaltdavid/20981
...
distinguish between file name and directory as prompt in file chooser
2016-07-01 10:39:32 -07:00
James B. Pollack
122902714a
Merge pull request #8175 from AlexanderOtavka/fix-eslintrc
...
Fix eslint descrepencies
2016-07-01 10:12:36 -07:00
Sam Gondelman
a39376e490
Merge pull request #8174 from jherico/overlay_lighting
...
Don't render wire geometry with lighting effects
2016-07-01 10:03:19 -07:00
Ryan Downe Karpf
873b57219a
Merge pull request #8167 from hyperlogic/feature/equip-hotspots
...
equip-hotspots feature
2016-07-01 09:55:49 -07:00
Brad Davis
5288d98376
Using pipelines properly where appropriate
2016-06-30 20:52:41 -07:00
Howard Stearns
ae54399177
Merge pull request #8168 from jherico/qml_window_signal
...
Allow scripts to receive a visibility changed signal from their windows
2016-06-30 16:50:07 -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
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
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
David Rowe
759b3065fc
Distinguish between file name and directory as prompt in file chooser
2016-06-30 20:48:19 +12: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
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
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
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
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -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
Brad Davis
ab7fed1af8
Switch back to disable GL 4.5 by default, add support for logging when enabled
2016-06-28 18:56:25 -07:00
Brad Davis
a41de3a60d
Making GL 4.5 enabled by default, adding logging
2016-06-28 18:55:26 -07:00
Brad Davis
8b56444dde
Fix crash in GL45 buffer re-allocation
2016-06-28 18:55:25 -07:00
Brad Davis
b16812aa4d
Adding GL 4.5 backend
2016-06-28 18:55:24 -07:00
Brad Davis
21d2c977a3
Remove roll from cursor in HMD
2016-06-28 18:30:07 -07:00
Brad Davis
962f9d5f22
Don't update the shown state of the tool window when it's already invisible
2016-06-28 18:10:06 -07:00
Howard Stearns
58e2300943
Merge branch 'master' of https://github.com/highfidelity/hifi into limit-hand-controller-actions-to-recommended-area
2016-06-28 18:01:46 -07:00
Howard Stearns
b551bc3c1a
Use the whole area, less a margin.
2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b
Use normal Script.update (60hz) instead of a timer (@20hz).
2016-06-28 17:44:30 -07:00
