Howard Stearns
|
188cbee781
|
Merge pull request #11212 from howard-stearns/asynchronous-commerce-2
Asynchronous Ledger Interactions with Server
|
2017-08-18 15:40:24 -07:00 |
|
Elisa Lupin-Jimenez
|
44f1f340e1
|
Merge pull request #11147 from elisa-lj11/blocks
Adding Blocks Tablet App to Marketplace
|
2017-08-18 15:06:18 -07:00 |
|
Chris Collins
|
2456126bcc
|
Merge pull request #11157 from SamGondelman/tabletLayer
Render non-AA overlays correctly
|
2017-08-18 14:59:20 -07:00 |
|
howard-stearns
|
29b717e22d
|
remove dead code
|
2017-08-18 14:08:04 -07:00 |
|
Sam Gondelman
|
cbf2bb3a61
|
Merge pull request #10980 from SamGondelman/sharks
Reduce laser pointer lag
|
2017-08-18 13:14:38 -07:00 |
|
Elisa Lupin-Jimenez
|
65f876acf3
|
enabled version check
|
2017-08-18 10:49: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 |
|
Elisa Lupin-Jimenez
|
4c28b9f09a
|
attempt to check version of interface
|
2017-08-17 18:16:41 -07:00 |
|
Elisa Lupin-Jimenez
|
2b44608ece
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-08-17 10:18:40 -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 |
|
Zach Fox
|
ecd1f13197
|
Allow users to take a snapshot from the secondary camera
|
2017-08-16 15:34:06 -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 |
|
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 |
|
SamGondelman
|
a641fb7a7f
|
rename qvector findRayIntersection to avoid script conflicts
|
2017-08-15 18:03:52 -07:00 |
|
Zach Fox
|
d376630bde
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1
|
2017-08-15 15:03:02 -07:00 |
|
Liv
|
aea5f170f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
|
2017-08-15 13:58:22 -07:00 |
|
Liv
|
49eab847fd
|
Refactor handleOctreeFileReplacement, style changes, align with handler for other file types
|
2017-08-15 13:58:02 -07:00 |
|
Liv
|
c0fa446b75
|
Remove domain management scripting interface
|
2017-08-15 13:49:13 -07:00 |
|
Zach Fox
|
b7282cc776
|
Lots of fixes
|
2017-08-15 13:46:20 -07:00 |
|
Anthony Thibault
|
342f8acff5
|
Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision
Improve avatar hand vs body collision
|
2017-08-15 13:43:21 -07:00 |
|
SamGondelman
|
9bb7e66859
|
separate raypickscriptinginterface, cleanup
|
2017-08-15 13:36:41 -07:00 |
|
Zach Fox
|
528d2072f9
|
Bugfixes and improvements
|
2017-08-15 12:14:32 -07:00 |
|
Anthony J. Thibault
|
6e0ddadb29
|
Fix for array size.
|
2017-08-15 11:45:22 -07:00 |
|
David Kelly
|
0f7db74ef1
|
missed a couple warnings
|
2017-08-15 11:44:15 -07:00 |
|
Anthony J. Thibault
|
04006a9f76
|
code review feedback
|
2017-08-15 11:19:41 -07:00 |
|
Zach Fox
|
bddce9328b
|
V1
|
2017-08-15 11:08:03 -07:00 |
|
David Kelly
|
a6390edf46
|
ugh
|
2017-08-15 10:10:48 -07:00 |
|
Elisa Lupin-Jimenez
|
3d7995da34
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-08-15 10:01:24 -07:00 |
|
Sam Gateau
|
2a75cde48a
|
Merge pull request #11185 from samcake/blue
Fixing the graphics setting for Ambient Occlusion
|
2017-08-15 09:26:45 -07:00 |
|
Sam Gateau
|
d624413c14
|
Merge pull request #11189 from SamGondelman/line3DFix
Fix drawInFront overlays only rendering in left eye
|
2017-08-15 09:26:18 -07:00 |
|
David Kelly
|
c08fce967f
|
forgot a warning
|
2017-08-15 08:58:16 -07:00 |
|
David Kelly
|
ef5863d169
|
warnings squashed
|
2017-08-14 16:24:50 -07:00 |
|
SamGondelman
|
8163430282
|
fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds
|
2017-08-14 15:03:14 -07:00 |
|
David Kelly
|
170d2b186b
|
url encode the base64 signature/key
|
2017-08-14 13:48:09 -07:00 |
|
Zach Fox
|
c1d771842d
|
Remove context overlay (if present) when removing entity
|
2017-08-14 13:37:50 -07:00 |
|
David Kelly
|
803a5c6690
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
|
2017-08-14 13:15:04 -07:00 |
|
David Kelly
|
b4b592cc00
|
one key file with (for now) both public and private keys in there
|
2017-08-14 12:53:10 -07:00 |
|
Zach Fox
|
199ba3bff0
|
Use new JSON inventory format
|
2017-08-14 11:55:21 -07:00 |
|
samcake
|
db1536c521
|
Reactivate watch dog exit
|
2017-08-14 10:47:58 -07:00 |
|
samcake
|
05b78b0df0
|
Just fixing the ao combo box field
|
2017-08-14 10:46:33 -07:00 |
|
samcake
|
ff98dedbb2
|
Debugging the graphics fields activation
|
2017-08-11 18:10:44 -07:00 |
|
Anthony J. Thibault
|
cd57c0706a
|
more warning fixes
|
2017-08-11 17:46:50 -07:00 |
|
David Kelly
|
f784bc42de
|
Initial cut using RSA keys for now
|
2017-08-11 16:54:04 -07:00 |
|
Anthony J. Thibault
|
9e1218b4a4
|
Use k-dop collision to prevent hands from entering body.
|
2017-08-11 14:50:00 -07:00 |
|
howard-stearns
|
8ee54c7b36
|
Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce
|
2017-08-11 11:46:20 -07:00 |
|
howard-stearns
|
551ea921cd
|
Make API asynchronous, for communicating with server
|
2017-08-11 11:45:40 -07:00 |
|
SamGondelman
|
f058781f49
|
just kidding shared_mutexes are c++17
|
2017-08-11 10:07:20 -07:00 |
|
Anthony J. Thibault
|
49adf04913
|
Added Developer > Avatar > Show Detailed Collision menu option
|
2017-08-10 16:36:09 -07:00 |
|