Dante Ruiz
8d04047d8a
starting to integrate teleport.js
2017-08-18 13:23:44 -07:00
Sam Gondelman
cbf2bb3a61
Merge pull request #10980 from SamGondelman/sharks
...
Reduce laser pointer lag
2017-08-18 13:14:38 -07:00
vladest
d29d4b5016
Adopt clonable settings to new styling
2017-08-18 21:44:44 +02:00
Zach Fox
1a62f60348
Commit early and often.
2017-08-18 11:30:25 -07:00
Zach Fox
ace1e00158
MOREEEE PROGRESS
2017-08-18 10:52:42 -07:00
Elisa Lupin-Jimenez
762f1a9c5c
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-18 10:49:51 -07:00
Elisa Lupin-Jimenez
65f876acf3
enabled version check
2017-08-18 10:49:40 -07:00
SamGondelman
c9f4958925
handControllerGrab fix, maybe, hopefully
2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6
Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2
2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb
checkpoint
2017-08-18 10:03:00 -07:00
vladest
4eba09214c
Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item
2017-08-18 08:11:29 +02:00
Elisa Lupin-Jimenez
4c28b9f09a
attempt to check version of interface
2017-08-17 18:16:41 -07:00
Zach Fox
ccf81f801d
All the pieces!
2017-08-17 17:06:48 -07:00
Zach Fox
05648bdbcb
Passphrases working
2017-08-17 16:53:38 -07:00
Zach Fox
d052b49a54
Login and picture selection done
2017-08-17 16:34:33 -07:00
Zach Fox
5f69f30551
MOAR PROGRESS
2017-08-17 16:20:50 -07:00
Zach Fox
9135e37078
Go go go go gog o
2017-08-17 15:20:17 -07:00
Sam Gateau
5ac65e8f35
Merge pull request #11184 from Zvork/fadeinvertfix
...
Fade edition bug fix
2017-08-17 15:10:50 -07:00
Zach Fox
eab16fc28c
Initial progress
2017-08-17 15:01:25 -07:00
vladest
f3969b0909
Switch off snap behavior
2017-08-17 22:28:42 +02:00
Elisa Lupin-Jimenez
2b44608ece
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727
moved blocksApp.js to unpublished scripts, added icon
2017-08-17 10:18:29 -07:00
Elisa Lupin-Jimenez
a9d5cb45e9
changed icon to white
2017-08-17 10:11:29 -07:00
EagleJumpDev
d01ce27ebf
Merge branch 'master' of https://github.com/highfidelity/hifi into hifi_eaglejumpdev
...
Test merge..... BUILD_WIN.md only change
2017-08-16 22:17:35 -07:00
EagleJumpDev
f54e028c19
Out of memory errors detected on systems with only 6GB of main memory. Maybe 8GB should be the minimimum?
2017-08-16 22:16:50 -07:00
Elisa Lupin-Jimenez
930f163ca1
added app icon
2017-08-16 17:57:32 -07:00
Elisa Lupin-Jimenez
e032979794
a little cleanup
2017-08-16 17:33:14 -07:00
Elisa Lupin-Jimenez
bf35b08179
Emoji tablet app
2017-08-16 17:27:29 -07:00
Zach Fox
a4123e3024
Merge pull request #11201 from zfox23/sam_is_cool
...
Allow users to take a snapshot from the Secondary Camera!
2017-08-16 17:03:15 -07:00
SamGondelman
ee74f6404e
put back FilterLayeredItems to make samcake happy
2017-08-16 16:08:38 -07:00
Chris Collins
9c9bcd80b8
Merge pull request #11191 from SamGondelman/logging
...
Miscellaneous logging fixes
2017-08-16 15:46:32 -07:00
Zach Fox
ecd1f13197
Allow users to take a snapshot from the secondary camera
2017-08-16 15:34:06 -07:00
Chris Collins
38e5c4fde0
Merge pull request #11200 from Atlante45/new-master
...
Stable => Master
2017-08-16 13:34:38 -07:00
druiz17
8eabf46a30
Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1
...
[Case 6491] Part 1 of entitySelectionTool clean up
2017-08-16 13:05:27 -07:00
Atlante45
17c1fb8c36
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-08-16 12:50:03 -07:00
LaShonda Hopper
cc2ff565ac
[Case 6491] Ran lint on entitySelectionTool.js (details below).
...
Prior Issue Count: 35
Current Issue Count: 3
Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.
Remaining Issues as of this commit:
* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
** HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
** SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
** SelectionManager assignment
One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-08-16 15:21:30 -04:00
Chris Collins
6f18d1a8b7
Merge pull request #11193 from highfidelity/RC-51
...
Beta Release 51 - Includes up to Developer Release 7008
2017-08-16 11:56:38 -07:00
Zach Fox
4cf6f2d8b8
Merge pull request #11188 from davidkelly/dk/makeMeSomeKeys
...
Wallet needs some keys
2017-08-16 10:56:34 -07:00
David Kelly
73e943daaf
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
2017-08-16 10:13:08 -07:00
Brad Hefta-Gaub
714027d2e2
Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
...
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
Zach Fox
c024bd2d83
Merge pull request #11195 from zfox23/commerce_securityImage1
...
Commerce: First pass at security images (NOT FINAL)
2017-08-16 09:57:55 -07:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Seth Alves
58a63a14fb
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-08-16 09:14:10 -07:00
Seth Alves
91f2e2b773
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-16 09:13:54 -07:00
Seth Alves
a0231898e6
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-16 09:13:45 -07:00
Olivier Prat
9691c957e4
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix
2017-08-16 09:41:49 +02:00
Liv
36ff82db6b
Merge pull request #11056 from misslivirose/feat/domain-setup
...
[Protocol Change] Allow specified users/groups to replace domain content from within Interface
2017-08-15 20:29:25 -07:00
Anthony J. Thibault
aef19c6f97
Rig: Use a registry to prevent use after free crashes/corruption
...
Create a global registry to hold all the currently active Rig instances.
Use this registry and it's mutex to prevent accessing the rig after it has already been destroyed,
or is in the process of being destroyed on the main thread.
2017-08-15 18:28:51 -07:00
Seth Alves
9f0109881e
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-15 18:05:23 -07:00
Seth Alves
572930b30f
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-15 18:05:09 -07:00
