samcake
9abe098436
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-11 15:48:40 -07:00
Sam Gateau
38b467a6bf
Merge pull request #11570 from jherico/overlays_blocking
...
Remove unnecessary blocking call
2017-10-11 15:40:53 -07:00
SamGondelman
403b18977b
remove unused HFMetaEvents
2017-10-11 14:37:23 -07:00
Zach Fox
9e570fdba3
First pass at encryption/decryption. Exciting!
2017-10-11 13:08:04 -07:00
Zach Fox
f037eab26c
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-11 11:07:32 -07:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Brad Davis
69f869b339
Remove unecessary blocking call
2017-10-11 11:01:06 -07:00
Zach Fox
4ebccfa65c
Use put instead of get sob
2017-10-10 16:23:43 -07:00
Zach Fox
5e383e2b1c
My Item certificates
2017-10-10 14:56:17 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Zach Fox
0ae69b6ad9
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-10 12:38:14 -07:00
Zach Fox
1c0a564155
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3
2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7
Merge pull request #11555 from zfox23/commerce_daveIntegration2
...
2017-10-09 Commerce Frontend Updates
2017-10-10 12:34:30 -07:00
Zach Fox
be2b241629
Lots of progress; don't yet have some things
2017-10-10 12:20:48 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Ryan Huffman
9c120f1194
Update AssetMappingsScriptingInterface to not open file for activity event
2017-10-10 09:44:13 -07:00
Seth Alves
8ac1875a91
Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login
...
Find nearby entities at login
2017-10-09 17:54:44 -07:00
Seth Alves
f349ba3674
replace parent avatar-id with avatar-self-id when exporting entities
2017-10-09 15:32:45 -07:00
Zach Fox
b81a8a95ea
Final fixes
2017-10-09 15:23:22 -07:00
Zach Fox
38b95b5403
Instructions HTML file and flow
2017-10-09 15:07:14 -07:00
Seth Alves
d1d2b8a4da
don't export avatar-parent sessions IDs into json
2017-10-09 14:02:20 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Seth Alves
13da20e1f0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-09 12:18:09 -07:00
Seth Alves
54204833df
add a getParentTree call for overlays
2017-10-09 12:17:56 -07:00
Anthony Thibault
13919907de
Merge pull request #11539 from Nex-Pro/patch-1
...
Fixed typo in qWarning message.
2017-10-09 12:10:27 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
Zach Fox
a7d43c63b6
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-09 11:38:13 -07:00
Andrew Meadows
bbde1bcd63
move stuff out of writelock when possible
2017-10-09 10:42:42 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532
workaround for bad physics polling on login
2017-10-09 10:27:46 -07:00
samcake
1f3623e8e9
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-09 09:37:25 -07:00
Brad Davis
7aeeaeb4e7
Fix rendering transform for text3d overlays
2017-10-07 19:41:43 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
samcake
988d8a1a62
TRying to debug the overlay notifications to show ?)
2017-10-06 18:17:48 -07:00
Zach Fox
59a6726af6
Checkpoint; lotsa changes...
2017-10-06 16:55:05 -07:00
SamGondelman
e95ecc3f27
fix missing sensorToWorld matrix
2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Zach Fox
1fa9bd8fc6
Better implementation of location change and bugfixes
2017-10-06 12:22:29 -07:00
Seth Alves
195d96bd43
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 11:02:35 -07:00
Nex-Pro
24974fdae3
Fixed typo in qWarning message.
2017-10-06 18:42:02 +01:00
Zach Fox
e5e6d84e07
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-06 09:47:21 -07:00
Zach Fox
051b63503c
Merge pull request #11534 from zfox23/commerce_daveIntegration1
...
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
Ryan Huffman
9c06afc4c8
Merge pull request #11326 from cain-kilgore/21537
...
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Seth Alves
8d00731620
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 07:20:34 -07:00
Zach Fox
525e0d8f61
Make SettingsScriptingInterface accessible to tablet
2017-10-05 16:51:13 -07:00
Andrew Meadows
a3bafa3c44
Merge pull request #11506 from SamGondelman/sharks
...
Fix and improve laser pointer locking
2017-10-05 14:10:06 -07:00
SamGondelman
6b02cbb911
move locking inside laserpointer and raypick
2017-10-05 13:17:57 -07:00
Seth Alves
b96fac2f00
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Sam Gateau
25dae2f24e
Merge pull request #11499 from samcake/blue
...
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
Zach Fox
27d6cc2657
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-04 15:49:33 -07:00
Clément Brisset
74fd69ac2d
Merge pull request #11523 from Atlante45/new-master
...
RC56 into Master
2017-10-04 15:17:52 -07:00
Zach Fox
b35eaf2cc8
Throw a bunch of code at the wall and hope some sticks
2017-10-04 15:06:55 -07:00
samcake
d773b40a63
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-04 13:25:14 -07:00
Zach Fox
ab08dc6bd6
Progress?
2017-10-04 12:33:58 -07:00
Andrew Meadows
e3ea013d5f
Merge pull request #11518 from SamGondelman/avatarRay
...
Fix calling AvatarManager.findRayIntersection() from script
2017-10-04 12:04:30 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
Zach Fox
1ed10ecf59
Fix passphrase crash
2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
Zach Fox
23245e2fb9
Modify context overlay filter
2017-10-04 10:39:23 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
SamGondelman
0614fd9b4f
fix AvatarManger::findRayIntersection from script thread
2017-10-03 15:31:49 -07:00
Seth Alves
ea4068f1f9
Merge pull request #11478 from vladest/fix_menu_linux
...
Added workaround to enable menu bar under Linux
2017-10-03 13:10:34 -07:00
Zach Fox
ea3da6c9dd
Merge pull request #11495 from zfox23/pop_interfaceChanges2
...
Commerce: One step closer!
2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2
Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit
...
Tweak debug stats for more clarity
2017-10-03 11:23:16 -07:00
Zach Fox
e64b0861a1
Change passphrase working
2017-10-03 10:53:10 -07:00
Andrew Meadows
cd4be1473f
put more of Application::update() under time measurement
2017-10-03 10:34:12 -07:00
Andrew Meadows
773c48bbc9
use floating point for game loop stats values
2017-10-03 10:32:19 -07:00
Sam Gateau
64f70f1ebb
more cleanups
2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430
more cleanups
2017-10-02 21:46:52 -07:00
Sam Gateau
316156db46
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 21:31:59 -07:00
Andrew Meadows
21cd986645
tally PerformanceTimer records when it is active
2017-10-02 20:57:20 -07:00
samcake
bb99f68d40
Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead
2017-10-02 17:04:00 -07:00
Zach Fox
11d0062104
Progress on buy endpoint
2017-10-02 16:57:41 -07:00
Andrew Meadows
c3167444a9
decouple 'general timing' from 'game loop' details
2017-10-02 16:31:20 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -07:00
SamGondelman
97b09d680c
fix and improve laser pointer locking
2017-10-02 13:17:53 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89
Merge pull request #11471 from Atlante45/feat/auto-bake
...
Asset Browser tweaks
2017-10-02 11:29:36 -07:00
Zach Fox
2b03e08c96
Fix errant status when requesting it for the first time
2017-10-02 10:20:24 -07:00
Sam Gateau
68046ae4e3
Merge pull request #11491 from jherico/dev/disable_watchdog
...
Disable watchdog with environment variable
2017-10-02 10:19:32 -07:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
Sam Gateau
ec10d38983
more cleaning
2017-10-01 22:28:04 -07:00
Sam Gateau
6c510bc18f
fine tuning the changes to respect clean up
2017-10-01 20:05:48 -07:00
samcake
0cbf19bcf1
Removing comments
2017-10-01 17:47:35 -07:00
samcake
aa10c29609
Cleaning up the changed code
2017-10-01 17:16:10 -07:00
samcake
da4de38e91
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad
fix modeloverlay visible change
...
(cherry picked from commit 0bb27a7165
2017-10-01 13:40:00 -07:00
Sam Gateau
44cc6deac2
moving render specific code from Application.cpp to Application_render.cpp
2017-10-01 12:55:44 -07:00
SamGondelman
0bb27a7165
fix modeloverlay visible change
2017-09-29 17:48:59 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
samcake
225d2bbbb4
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 13:47:37 -07:00
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
SamGondelman
3ae41b9b75
cleanup client and stats string
2017-09-29 11:34:35 -07:00
Andrew Meadows
fb3e74398f
don't invalidate viewFrustum sent to server
2017-09-29 11:34:35 -07:00
SamGondelman
247764b679
add total entity packets in stat (kbps)
2017-09-29 11:34:34 -07:00
SamGondelman
cbf82a6f2c
fix timeout for physics check
2017-09-29 11:34:34 -07:00
Andrew Meadows
171151b92a
use new form of MovingEntitiesOperator ctor
2017-09-29 11:34:32 -07:00
Brad Davis
a7d507e9fd
Disable watchdog with environment variable
2017-09-29 10:44:04 -07:00
Seth Alves
e7705175a3
Merge pull request #11481 from ZappoMan/animatedOverlays
...
support animation of model overlays
2017-09-29 10:26:24 -07:00
ZappoMan
9c81bc5479
CR fixes
2017-09-29 09:52:30 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
samcake
3265fe62ad
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 09:09:27 -07:00
samcake
e637842f8a
Separating some of the code sepecific to render in its own cpp
2017-09-28 17:45:50 -07:00
Zach Fox
4814f277c1
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-09-28 16:07:32 -07:00
ZappoMan
be7729b276
support animation of model overlays
2017-09-28 15:14:59 -07:00
samcake
c112a3baf1
Seting up of camera and avatar correctly in game loop, not in render loop
2017-09-28 15:09:49 -07:00
Ryan Huffman
ff019d6195
Fix extension detection when tracking asset uploads
2017-09-28 13:56:49 -07:00
Andrew Meadows
60fe9ec5e9
Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928
...
fix interface crash in Debug build
2017-09-28 12:41:12 -07:00
vladest
c3225c2c76
Make fix precisely for Linux
2017-09-28 21:38:03 +02:00
Zach Fox
b5dc6b791b
Fix commerce setting handle
2017-09-28 10:42:45 -07:00
Zach Fox
b6ce294bb2
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-09-28 09:38:48 -07:00
Zach Fox
65a63ea8c3
Remove dead OS X code
2017-09-28 09:38:22 -07:00
samcake
b1daae0150
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 09:16:02 -07:00
Ryan Huffman
97bf093cab
Fix ambiguous conversion in AssetMappingScriptingInterface
2017-09-28 08:16:54 -07:00
vladest
0a9bebeefc
Added workaround to enable menu bar under Linux
2017-09-28 15:34:56 +02:00
samcake
40ca98214b
Moving all of the camera and avatar eval to game loop
2017-09-27 17:58:43 -07:00
samcake
29da0c663f
Merge branch 'master' of https://github.com/highfidelity/hifi into flash
2017-09-27 16:21:55 -07:00
Sam Gateau
287f4f1d71
Merge pull request #11466 from SamGondelman/mirrorCrash
...
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
Atlante45
eb06c33187
Naming coding standard fix
2017-09-27 15:32:53 -07:00
samcake
3bd6e35e30
Fixing the broken on hud overlay's render transform
2017-09-27 15:19:21 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Andrew Meadows
26ea7034d8
prevent zero scale for Line3DOverlay
2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475
prevent zero dimensions for Volume3DOverlay
2017-09-27 14:30:50 -07:00
SamGondelman
553829f7ab
make sure FadeEffect dependency is created early
2017-09-27 11:58:35 -07:00
Sam Gateau
88097bb39f
Merge pull request #11447 from AndrewMeadows/lod-auto-adjust
...
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
2017-09-27 10:51:46 -07:00
Ryan Huffman
88810d28c1
Add activity logging for uploading_asset
2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0
Fix bytes downloaded stat tracking
2017-09-27 09:33:10 -07:00
Sam Gateau
9317ad38aa
Merge pull request #11462 from highfidelity/game-render-interface
...
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
Atlante45
acb0bf8d20
Asset Browser tweaks
2017-09-26 17:26:46 -07:00
samcake
f16c552978
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-26 17:18:05 -07:00
SamGondelman
49512c95d7
possibly fix threading crashes, mirror and fade
2017-09-26 16:21:36 -07:00
Andrew Meadows
dafadf82bb
Merge pull request #11458 from jherico/fix/tablet_latency
...
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
samcake
328dd9c108
Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue
2017-09-26 16:12:27 -07:00
samcake
badb45c921
fixing the web surface now getting scaled when the table t is grabbed is fixed
2017-09-26 15:20:45 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07:00
beholder
24a12a2f8f
7722 Add onHover Outline to Tablet "X" Button
2017-09-26 22:31:56 +03:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Dante Ruiz
74f9e07f1a
Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu
...
Move Tablet becomes toolbar menu from General to Developer menu
2017-09-26 11:26:42 -07:00
Dante Ruiz
e397d49564
Merge pull request #11159 from vladest/modal_dialogs_async
...
Modal dialogs async
2017-09-26 11:07:42 -07:00
samcake
b5c942f7f6
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-26 10:47:59 -07:00
samcake
669af73a96
Bringing as much as possible out from render to game
2017-09-26 10:47:24 -07:00
Andrew Meadows
ec80846281
Merge pull request #11443 from SamGondelman/sharks
...
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
Sam Gateau
953614fe65
More stuff out of render to the gameloop
2017-09-25 23:43:32 -07:00
samcake
157b4f2e13
Moving some of the updates on the camera and the avatar out from render to game loop
2017-09-25 18:28:33 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
Andrew Meadows
cc8e618bc0
remove cruft
2017-09-25 15:52:14 -07:00
samcake
11c55755d5
Removing unused call
2017-09-25 15:10:40 -07:00
Andrew Meadows
a3ac20d961
minor cleanup
2017-09-25 15:10:14 -07:00
Andrew Meadows
37c501b131
LODManager uses renderTime instead of main loop fps
2017-09-25 13:17:21 -07:00
vladest
b190fac4f1
Fix stylus
2017-09-25 19:45:51 +02:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
b5f0c4d940
Added settings controls sounds
2017-09-25 16:46:36 +02:00
vladest
5a452fa981
Merge branch 'master' into tablet_extended_sounds
2017-09-25 15:40:40 +02:00
Sam Gateau
f90dc64241
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-24 19:32:57 -07:00
Andrew Meadows
cf0dd6f8c3
Merge pull request #11371 from cain-kilgore/21542
...
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
2017-09-23 22:20:52 -07:00
samcake
59006411c6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
SamGondelman
0e3f1c5149
add setLaserLength, setLockEndUUID doesn't use defaultRenderStates
2017-09-22 16:11:24 -07:00
Zach Fox
702a4e9ade
More tweaking to overlay position
2017-09-22 15:32:38 -07:00
SamGondelman
cbe621f2b7
add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate
2017-09-22 15:15:15 -07:00
Zach Fox
0eafdeab14
Fix hover -> unhover overlay behavior
2017-09-22 13:32:11 -07:00
Zach Fox
e3f2e70bca
No magic numbers
2017-09-22 11:43:56 -07:00
Zach Fox
430d1b22bb
Update angular size and i behavior
2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -07:00
samcake
4ce774ab8e
Merge branch 'blue-bis' of https://github.com/samcake/hifi into blue
2017-09-22 11:02:57 -07:00
samcake
b424505f65
FIxing the case of the Circle3D
2017-09-22 10:48:56 -07:00
samcake
219d63784b
REmoving the extra variables in Linear3D and just use the _renderTRansform
2017-09-22 10:39:51 -07:00
Atlante45
8583be41ce
Don't refresh if not connected to the Asset Server
2017-09-21 18:57:09 -07:00
samcake
16fb64afaa
Merging with blue-bis
2017-09-21 18:01:04 -07:00
samcake
4a67e0421f
minimise the changes compared to upstream
2017-09-21 17:33:50 -07:00
samcake
eed099502a
minimise the changes compared to upstream
2017-09-21 17:20:32 -07:00
samcake
510ecbb137
Merging with upstream
2017-09-21 16:59:15 -07:00
samcake
2d369a4586
fixing the image3D updating its renderTransform from it s update() call
2017-09-21 16:20:13 -07:00
Atlante45
1a571d0991
Add Asset Server auto refresh
2017-09-21 14:41:59 -07:00
Anthony J. Thibault
54e627e2c5
Merge branch 'master' into feature/ant-man2
2017-09-21 13:59:47 -07:00
samcake
454e167d93
notifying a render transform / bound change when the dimension property change
2017-09-21 12:58:56 -07:00
samcake
7103864b37
Also rendering the line3D overlay with start and end captured in game loop
2017-09-21 12:23:53 -07:00
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
Zach Fox
81be62b6f7
Check if ContextOverlayInterface is enabled before highlighting
2017-09-21 09:34:15 -07:00
samcake
5dc4e89e4c
Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis
2017-09-21 08:56:02 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
samcake
cdf66887ef
Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis
2017-09-20 18:09:28 -07:00
samcake
d112ffd8d6
Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d
2017-09-20 18:06:49 -07:00
Sam Gateau
daf18156f9
Merge pull request #11418 from SamGondelman/laserLaser
...
Don't let scripts control visibility of laser pointer overlays
2017-09-20 17:54:00 -07:00
Anthony J. Thibault
5e93c13856
warning fix
2017-09-20 16:36:33 -07:00
Anthony J. Thibault
09c61deda8
Fixes for Vive puck calibration
2017-09-20 15:41:49 -07:00
Cain Kilgore
322b7fc060
Cleanup from Merge
2017-09-20 23:37:33 +01:00
Cain Kilgore
796e9e7ab3
Fixed things
2017-09-20 23:23:30 +01:00
SamGondelman
f21c99257e
don't let scripts control visibility of laser pointers
2017-09-20 14:35:29 -07:00
vladest
6e3cfe81ab
Fix crash on second bookmark saving
2017-09-20 21:01:16 +02:00
Anthony J. Thibault
a8a5138c18
remove USE_N_SCALE preprocessor check
2017-09-20 09:23:13 -07:00
Anthony J. Thibault
0873b88347
code review feedback
2017-09-20 09:21:15 -07:00
