Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 09:07:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59074 commits 25 branches 0 tags 1.1 GiB
Commit graph

2929 commits

Author SHA1 Message Date
Dante Ruiz
ff134b338b Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-30 08:25:53 -07:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Dante Ruiz
49608f1253 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-29 15:19:16 -07:00
Dante Ruiz
ed52136fc5 finished equiping locked clone-able entities 2017-08-29 15:18:28 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
beholder
180acbc188 6819 - Create button not disabled 2017-08-29 23:49:44 +03:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
Dante Ruiz
4b592687b7 finished webEntityLaserInput, now working on cloning 2017-08-28 17:35:34 -07:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
Dante Ruiz
0eceb7b382 unviersial web3d vs laser 2017-08-25 17:40:30 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -07:00
Dante Ruiz
a5508c9f75 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-25 14:21:01 -07:00
Dante Ruiz
b3ffa7b6b4 Working laser vs tablet 2017-08-25 14:20:31 -07:00
Zach Fox
e606e3dfb3 Squashed commit of the following: 
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date:   Fri Aug 25 10:56:53 2017 -0700

    Huge cleanup!
 2017-08-25 11:45:37 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Dante Ruiz
fa676aaadf lasers on tablet working 2017-08-24 17:42:27 -07:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Dante Ruiz
eb6248400c Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-24 13:41:54 -07:00
David Kelly
eb9436ba96 Merge pull request #11235 from davidkelly/dk/encryptFile 
Initial wallet app plus some encryption of security image
 2017-08-24 13:17:14 -07:00
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers 
EntityTreeRender uses RayPick API with precision picking
 2017-08-24 08:10:21 -07:00
Dante Ruiz
dbe8aa77d7 working on laser v tablet 2017-08-23 17:32:41 -07:00
Zach Fox
e815946744 Merge pull request #11231 from ElderOrb/Case5830 
5830: Go-To menu shows up blank except for address bar
 2017-08-23 14:33:04 -07:00
beholder
9cd784990c 5830: Go-To menu shows up blank except for address bar 2017-08-23 23:27:02 +03:00
Zach Fox
a489267cec Hide behind switch and remove dead code 2017-08-23 10:48:47 -07:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Dante Ruiz
dc8d0c9604 disable far grab when on hud 2017-08-22 16:51:13 -07:00
Zach Fox
4d8980b538 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-22 12:30:24 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Dante Ruiz
cdd184e32d intergradted teleport 2017-08-22 11:06:11 -07:00
Dante Ruiz
f6151fae85 slowly intergrating teleport.js 2017-08-21 16:53:28 -07:00
Dante Ruiz
94dc942d79 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-21 16:34:10 -07:00
Chris Collins
a85022bb93 Merge pull request #11216 from MidnightRift/emitterShouldTrail 
Change emitShouldTrail to emitterShouldTrail.
 2017-08-21 15:29:05 -07:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
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
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
Midnight
5f162c0352 Change emitShouldTrail to emitterShouldTrail. 2017-08-18 15:10:58 -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
Zach Fox
9636fad679 Updates from wireframes 2017-08-18 13:45:30 -07:00
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
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
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
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03: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
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -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
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
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
Dante Ruiz
e48c14ec23 fixed tablet spawn position for oculus menu button 2017-08-16 09:08:55 -07:00
Seth Alves
3082c357f9 cloning sort-of works... cloning an equipable doesn't 2017-08-15 17:54:04 -07:00
Seth Alves
4bfbab294d near-trigger works? 2017-08-15 14:53:58 -07:00
Seth Alves
03977334a0 near-trigger works? 2017-08-15 14:50:39 -07:00
Seth Alves
3b61e8518f near-trigger works? equip calls its entity methods now 2017-08-15 14:46:48 -07:00
Seth Alves
ddca25672f trying to get near-triggering working 2017-08-15 14:14:28 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Seth Alves
1d24523be9 equip drop gesture works 2017-08-15 13:09:17 -07:00
Seth Alves
e6ac07d43d equipping mostly works 2017-08-15 11:45:45 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
Seth Alves
b2d7eefc97 equip highlight works now 2017-08-15 10:30:47 -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
Seth Alves
774cb33303 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-15 09:17:52 -07:00
Seth Alves
b52a406ff1 trying to get equipping working 2017-08-14 18:25:57 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
Seth Alves
13424eb792 kinematic-grab defaults to true 2017-08-13 17:42:08 -07:00
Seth Alves
9015d69c71 fix pop at start of far-grab 2017-08-13 17:21:55 -07:00
Seth Alves
f10dc7cbd5 allow far to near-grab transition 2017-08-13 16:54:37 -07:00
Seth Alves
58b199e9f9 far-grab sort-of works 2017-08-13 15:54:03 -07:00
Seth Alves
c2861d29d2 trying to get highlighting to work 2017-08-13 13:49:17 -07:00
Seth Alves
327bc23b5c get ready for highlighting 2017-08-13 11:41:12 -07:00
Seth Alves
e7437d66ef if a raypick hits something that's very close, put it into the nearby-entities list 2017-08-12 17:49:02 -07:00
Seth Alves
ec93172676 far-search rays work, but nothing else about far-grab. 2017-08-12 17:27:48 -07:00
Seth Alves
505b564c62 sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase 2017-08-12 13:14:00 -07:00
Seth Alves
92cb1c9bf2 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-12 12:40:18 -07:00
Seth Alves
9fb1835a26 grabbing overlays works, again 2017-08-12 12:38:36 -07:00
Seth Alves
7ae41064db tablet stylus works again 2017-08-12 11:19:39 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
Seth Alves
b4a54b017a plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict 2017-08-11 12:15:41 -07:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
d2362e6329 addInventoryButton() under setting 2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
Seth Alves
128be5c2c1 Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1 2017-08-11 08:52:47 -07:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Elisa Lupin-Jimenez
28476960bb Moved Blocks to tablet app 2017-08-10 14:23:45 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00