Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 03:10:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53732 commits 71 branches 59 tags 1.2 GiB
Commit graph

2659 commits

Author SHA1 Message Date
Seth Alves
715493922e code review 2017-03-30 17:33:01 -07:00
Zach Fox
4712ec7400 Reset pollCount; debug log when expired generated by client 2017-03-30 17:02:15 -07:00
David Rowe
a5c683192b Improve entity properties scroll handle operation in tablet 2017-03-31 12:26:22 +13:00
Howard Stearns
0edbf1fbd9 Merge pull request #10044 from howard-stearns/pal-backend-integration 
Pal backend integration
 2017-03-30 12:55:11 -07:00
Howard Stearns
3056bb16a2 typo, and delete request on abort/fail 2017-03-30 12:40:54 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
David Kelly
e66c075f8e Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-30 10:14:29 -07:00
David Rowe
9c4414cff6 No custom styling of marketplaces directory scrollbar 2017-03-30 14:38:17 +13:00
David Rowe
c7f648a6c2 Disable marketplace directory and Clara.io scrollbars in tablet 2017-03-30 14:20:32 +13:00
Anthony J. Thibault
0e63f97f77 Test script that displays tracking data from Vive.TrackedObjects 2017-03-29 18:17:32 -07:00
Zach Pomerantz
4a9fbf2bbd delay 200ms to avoid recursive audio dev switches 2017-03-29 19:05:41 -04:00
Zach Pomerantz
c30ab4de8b rm extra setDevice 2017-03-29 18:48:22 -04:00
Zach Fox
a6ff3fcdb7 Tablet PAL bugfix; Connections help text v1 2017-03-29 15:47:19 -07:00
Zach Fox
1b74576259 Fix tablet-close behavior for PAL; remove users-tablet.js 2017-03-29 14:53:45 -07:00
Seth Alves
ce9eb1a377 more tablet landscape changes 2017-03-29 14:21:38 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Howard Stearns
b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-29 13:30:15 -07:00
Howard Stearns
53d484c318 makes connections! 2017-03-29 13:23:31 -07:00
Howard Stearns
b0c97d3a82 putative connection integration for 2-machine testing 2017-03-29 12:22:26 -07:00
Seth Alves
63ccaee129 Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet 
Open feed in tablet after sharing snapshot from tablet
 2017-03-29 10:08:51 -07:00
David Rowe
c618e8e001 Open feed in tablet after sharing snapshot from tablet 2017-03-29 16:52:52 +13:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
howard-stearns
c2a49a582e send credentials to local metaverse servers, and initial users data 
integration.
 2017-03-28 16:44:16 -07:00
samcake
a03d3a1ca8 Clean up the utilities scrips of the render folder 2017-03-28 16:00:18 -07:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui 
Tablet ui
 2017-03-28 14:48:02 -07:00
Andrew Meadows
b9e80d3fa5 Merge pull request #9972 from kunalgosar/marketsBug 
Fixed buttons on Marketplace
 2017-03-28 12:45:25 -07:00
Zach Pomerantz
06bf5807ae fix audio setting persistence for already selected device 2017-03-28 15:34:42 -04:00
Zach Pomerantz
5e0cfb6137 short-circuit audio switching on missing device 2017-03-28 15:34:13 -04:00
Zach Pomerantz
1bdef141c3 simplify audio menu parsing 2017-03-28 15:33:54 -04:00
Seth Alves
6df4dda746 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44 Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui 2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc fix initial finger/stylus setting 2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit 
Fix a few sitting bugs noticed at the meetup
 2017-03-28 11:14:31 -07:00
Dante Ruiz
e276bb52d2 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script 2017-03-28 18:14:28 +01:00
Dante Ruiz
b0e437cc5a remove help button from tablet when reloading scripts 2017-03-28 18:14:05 +01:00
Seth Alves
0cae616ab5 Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue 
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
 2017-03-28 10:07:52 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders 
Added inputMode property to Web3DOverlay
 2017-03-28 10:07:37 -07:00
Anthony J. Thibault
29a159b90d WebTablet.js: Don't remove or add mouse callbacks onHMDChanged 
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
 2017-03-28 09:27:13 -07:00
David Kelly
92718b6051 cr feedback 2017-03-28 08:57:27 -07:00
Seth Alves
b50a02ea19 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 08:16:59 -07:00
David Rowe
6a3dea030e Settings link 2017-03-28 15:15:33 +13:00
David Rowe
55033df354 Merge branch 'tablet-ui' into 21238-b 2017-03-28 14:47:57 +13:00
David Rowe
a6ef592353 Non-scrolling window with images scaled to fit 2017-03-28 14:43:26 +13:00
Seth Alves
cdac011472 fix home button 2017-03-27 18:21:00 -07:00
Zach Fox
0ae4ce7e98 Have I finally tamed the beast? 2017-03-27 16:15:11 -07:00
Seth Alves
343c9335b3 Merge pull request #10023 from hyperlogic/bug-fix/stylus-touching-deleted-entity 
tablet bug fixes
 2017-03-27 14:07:14 -08:00
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick 
remove properties from RayToEntityIntersectionResult
 2017-03-27 14:26:51 -07:00
David Rowe
ead1f00bbf Title 2017-03-28 09:10:20 +13:00
David Rowe
35305b4476 Make dialog single column with images above controls 2017-03-28 08:55:38 +13:00
David Kelly
5c1e085e7b Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 11:29:18 -07:00
David Kelly
76657a670c added notifications (faked user name for now), along with switch to avatar entities 2017-03-27 11:28:57 -07:00
Seth Alves
48ea9acfb3 Merge pull request #10016 from druiz17/tablet-goto 
Porting goto to the tablet
 2017-03-27 10:04:11 -08:00
Anthony J. Thibault
5796cbc898 Bug-fix for touching deleted entities or overlays. 2017-03-27 10:26:33 -07:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
David Rowe
e58e3fbbf7 Disconnect snapshot event handler when tablet "home" button pressed 2017-03-27 17:32:04 +13:00
David Rowe
dc3095bfcd Fix "don't share" button not closing window 2017-03-27 16:24:14 +13:00
David Rowe
d0fc352d3b Address event bridge being shared with other scripts 2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda Open snapshot dialog in tablet or window appropriately 2017-03-27 15:04:33 +13:00
Seth Alves
bb28976d0e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-26 09:32:35 -07:00
Seth Alves
90db9af2f9 Merge pull request #9978 from Triplelexx/fix-tablet-users-typo 
fix myVisibility typo
 2017-03-26 07:36:11 -08:00
Seth Alves
d45e124529 Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace 
Hide the scrollbar on the marketplace
 2017-03-25 08:36:31 -08:00
Seth Alves
3abd6b3948 Merge pull request #10006 from druiz17/tablet-help 
Ported help into the tablet
 2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704 Merge branch 'tablet-ui' into tablet-ui-audio-screen 2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Zach Fox
73a77f7f25 OK, how about now 2017-03-24 18:19:34 -07:00
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Dante Ruiz
6178a86a46 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-24 23:56:33 +01:00
Dante Ruiz
119a71d0d1 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto 2017-03-24 23:55:18 +01:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00
Faye Li
8cb771d9a8 fix conflict 2017-03-24 14:46:24 -07:00
Faye Li
405be471c3 button state change 2017-03-24 13:47:19 -07:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208 
21208 - Muted microphone indicator
 2017-03-24 13:07:43 -07:00
Zach Fox
31ae326880 Pretty sure about this now 2017-03-24 13:05:07 -07:00
Zach Fox
e5741869e5 Checkpoint 2017-03-24 12:22:11 -07:00
Anthony J. Thibault
7e6ff7c2fb Scrollbar is visible on marketplace in toolbar mode. 2017-03-24 11:40:10 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
Anthony J. Thibault
54b11bb6ee Hide the scrollbar on the marketplace 2017-03-24 11:22:50 -07:00
Faye Li
ccd4fdb540 naming 2017-03-24 10:46:52 -07:00
Faye Li
067faad9cd Fix careless math mistake 2017-03-24 10:22:08 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Zach Fox
665b21f2f7 Checkpoint 2017-03-23 17:08:32 -07:00
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
David Kelly
0edcdde746 better key mapping 2017-03-23 10:40:34 -07:00
David Kelly
a08346719c one bit of defensive code, plus some temporary logging 2017-03-23 10:29:45 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Dante Ruiz
dfa6174069 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-23 17:34:50 +01:00
Seth Alves
62f10204d9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:48 -07:00
David Kelly
aa085e577d more vis work 2017-03-23 09:19:04 -07:00
David Kelly
a0c19d6b59 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 17:02:03 -07:00
David Kelly
7b52afb58b vis changes to fade. Still needs more work 2017-03-22 17:01:42 -07:00
Zach Fox
692ef369c7 Attempted Stale PAL fix - hard to test! 2017-03-22 15:14:11 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
David Kelly
675612c1e9 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 14:56:23 -07:00
David Kelly
020dcca78d end handshake when successful, stop handshake sound if other guy pulls out 2017-03-22 14:55:57 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Zach Fox
bf191eabb7 Some new stale PAL behavior 2017-03-22 13:35:48 -07:00
David Kelly
34a89e4b9a added sounds, new haptics, and some cleanup 2017-03-22 13:26:51 -07:00
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Dante Ruiz
3a89654111 saving work 2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account. 
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
 2017-03-22 11:03:03 -07:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00
David Kelly
a594419688 friend->connection which I should have done long ago 2017-03-22 10:09:48 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Seth Alves
bd32104bc1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo 
El Boppo the Clown punching bag game
 2017-03-22 09:30:54 -07:00
David Kelly
59b02261e5 minor cleanup, remove waiting visualization completely 2017-03-21 16:08:25 -07:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00
Triplelexx
66d697873f change mat4test back to getFront 
premature, including in seperate commit
 2017-03-21 22:31:06 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e fix error from using a misspelled function 2017-03-21 22:25:45 +01:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00
David Kelly
5bcd7ca97f visuals update. Will do some cleaning shortly 2017-03-21 13:27:00 -07:00
Seth Alves
14027d4acb Merge pull request #9968 from druiz17/tablet-xbox 
Fixed the third eye for the xbox controller
 2017-03-21 11:03:53 -08:00
Seth Alves
04a334fd07 unmangle merge 2017-03-21 11:02:18 -08:00
Dante Ruiz
bf3c5dbf0e Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox 2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7 fixed third eye laser 2017-03-21 19:45:00 +01:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub
b7f48644af Merge pull request #9955 from druiz17/tablet-edit-selecting 
Fix edit.js from deselecting an object when trying to delete it
 2017-03-21 09:27:30 -07:00
Zach Fox
29e97381eb PAL open, user leaves, gray out row 2017-03-20 17:20:28 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Seth Alves
bc90e9081b Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale 
Tablet scale settings now take effect soon after they are changed.
 2017-03-20 15:05:47 -08:00
Zach Fox
d16acc5a7f Stale PAL Notification 2017-03-20 15:24:49 -07:00
Anthony J. Thibault
f5c3d41f2c Tablet scale settings now take effect soon after they are changed. 2017-03-20 14:51:47 -07:00
Dante Ruiz
de24023a21 Fix edit.js from deselecting an object when trying to delete it 2017-03-20 20:43:32 +01:00
Seth Alves
8988110c3b Merge pull request #9953 from fayeli/edit-export-entities 
Adding Export Entities Functionality in Tablet Edit
 2017-03-20 11:35:18 -08:00
David Kelly
81cb63df6b new particle effect, first pass 2017-03-20 11:42:58 -07:00
Faye Li
f57905fbb3 remove code for jump to selection 2017-03-20 10:23:55 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub
af790d8474 Merge pull request #9875 from birarda/bug/spin-strafe 
fix double snap turn strafing
 2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Atlante45
eab2c314d8 Preload sitting animation 2017-03-17 17:17:05 -07:00