Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 11:00:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 72 branches 59 tags 1.2 GiB
Commit graph

19698 commits

Author SHA1 Message Date
Seth Alves
511f94a4fc Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-16 14:01:54 -08:00
Zach Fox
d64b35729f Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 13:44:29 -08:00
David Rowe
85bda1da8e Add Window browseChanged signal as replacement for openFileChanged 2018-01-17 09:57:20 +13:00
David Kelly
d8f8f9ff1a First cut at alan's new design 2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable 
Merge stable (RC62) to master
 2018-01-16 11:01:07 -08:00
SamGondelman
c3eb4b5ecd destroy pointermanager before pickmanager 2018-01-16 10:31:42 -08:00
Mohammed Nafees
885801c5ca Fix copying to clipboard from JS scripts 2018-01-16 13:17:47 -05:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Seth Alves
12db51728e Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-16 07:50:55 -08:00
MiladNazeri
c7cdf6b8f6
Merge pull request #12145 from ctrlaltdavid/21684 
Update Window JSDoc per recent API changes
 2018-01-15 14:50:40 -08:00
Seth Alves
06dd680dc9 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-15 13:48:10 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
John Conklin II
c3648fb04c
Merge pull request #12168 from druiz17/RC62 
fix Asset browser for tablet (RC62)
 2018-01-15 10:16:56 -08:00
Zach Fox
f7ed8c10fa Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-15 10:13:07 -08:00
Seth Alves
a7d658c857 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-14 12:34:31 -08:00
Dante Ruiz
8e4bd2d662 fix asset browser for tablet 2018-01-12 17:11:02 -08:00
Dante Ruiz
a48304b104 fix Asset browser for tablet 2018-01-12 17:06:07 -08:00
Zach Fox
e627925bd3 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 15:14:42 -08:00
David Kelly
6cedc016c4 Adding sender/recipient to transaction history for hfc transfers 2018-01-12 16:08:52 -07:00
David Kelly
579a4d85b3 Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory 2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 13:31:58 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
David Rowe
5dca387055 Remove old, unused overlay panel code 2018-01-12 12:47:22 +13:00
David Rowe
9b0fb19cfa Remove unused "anchor" Overlays property 2018-01-12 12:16:58 +13:00
howard-stearns
2987d21f66 remove some more 2018-01-11 13:15:34 -08:00
Zach Fox
81ab5ac81c hfc_key -> public_key 2018-01-11 12:50:25 -08:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995 do not delete wallet file when things go wrong, and remove obsolete 
reset machinery
 2018-01-11 11:50:23 -08:00
Seth Alves
c09f644612 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-11 09:09:11 -08:00
David Rowe
a543d90090 Miscellaneous fixes 2018-01-11 15:53:45 +13:00
David Rowe
7ba42f0e76 Update JSDoc per recent changes in Window API 2018-01-11 15:52:56 +13:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI 
Fix and improve currentAPI.js
 2018-01-10 17:55:08 -08:00
Seth Alves
aefd294bf2
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera 
Improve stability for HMD third person avatars
 2018-01-10 17:46:47 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body 
Bug fix to prevent wrists entering the avatar's torso.
 2018-01-10 17:22:50 -08:00
MiladNazeri
301731554f
Merge pull request #12102 from cain-kilgore/21664 
WL 21664 - Window.innerHeight should not include the menu bar
 2018-01-10 17:10:14 -08:00
Zach Fox
939012a2d0 Hook up the endpoints! 2018-01-10 17:10:05 -08:00
Zach Fox
c15b1669b1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 15:53:23 -08:00
Seth Alves
ddc730f49f Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-10 13:49:07 -08:00
MiladNazeri
b73106fa7e
Merge pull request #12120 from cain-kilgore/21666 
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
 2018-01-10 12:30:21 -08:00
Cain Kilgore
b26e31a362
Copy paste? Never! 2018-01-10 20:27:19 +00:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665 
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
 2018-01-10 12:06:58 -08:00
Anthony J. Thibault
250e4032b0 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.

(cherry picked from commit ae997928c1)
 2018-01-10 12:04:50 -08:00
MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations 
Update JSDoc with some deprecations
 2018-01-10 12:04:21 -08:00
Anthony J. Thibault
ae997928c1 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.
 2018-01-10 11:51:44 -08:00
Anthony J. Thibault
220b7f5e55 Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-10 10:14:09 -08:00
Dante Ruiz
d0bff29471 fixing merge conflict 2018-01-10 10:11:53 -08:00
Zach Fox
e5abdc77d9 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 10:02:56 -08:00
Andrew Meadows
7060cd9a90
Merge pull request #12122 from druiz17/fix-double-set-tablet-root 
don't call setQmlTabletRoot twice
 2018-01-10 09:53:09 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats 
more context for update performance stats
 2018-01-10 09:10:26 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta 
Model meta render item is only withTypeShape if visual geometry request fails
 2018-01-10 09:09:19 -08:00
Seth Alves
3816c732c0 Merge branch 'run' of github.com:sethalves/hifi into run 2018-01-10 08:11:55 -08:00
Seth Alves
8cf94547e4 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-10 08:11:46 -08:00
Cain Kilgore
330b266ca8 Merge branch 'master' of https://github.com/highfidelity/hifi into 21665 2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal 2018-01-10 11:31:46 +00:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination 
Commerce: Support pagination at History endpoint; improve Purchases scrolling
 2018-01-09 15:57:34 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
Zach Fox
edf25c3e4e Remove code duplication... 2018-01-09 14:14:54 -08:00
Zach Fox
a6259a5ef5 Initial progress 2018-01-09 13:39:28 -08:00
Andrew Meadows
8c6edc749a provide more context for update perf stats 2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Zach Fox
d31dec7acb Fix unix build errors 2018-01-09 12:41:56 -08:00
John Conklin II
b1790cccbe
Merge pull request #12113 from druiz17/fix-double-set-tablet-root 
Don't call setQmlTabletRoot twice for Web3dOverlays RC62
 2018-01-09 12:25:00 -08:00
Zach Fox
360a7cc4c6 CR feedback 2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-09 10:34:04 -08:00
Cain Kilgore
0e3913baff Removed Window.menuHeight 2018-01-09 09:07:26 +00:00
Cain Kilgore
773461bd30 Merge branch 'master' of https://github.com/highfidelity/hifi into 21666 2018-01-09 08:33:44 +00:00
Cain Kilgore
46de7ed83b WL 21666 - Window.domainChanged() isn't emitted if domain isn't running 2018-01-09 08:32:59 +00:00
luiscuenca
9a81410762 refactor 2018-01-08 20:51:15 -07:00
luiscuenca
319913e6af Fix toolbar appears on HMD mode 2018-01-08 20:37:07 -07:00
David Back
13c34b2d33 add AccountServices context 2018-01-08 17:37:48 -08:00
David Rowe
3d9d2a1859 Filed overlay property has been removed 2018-01-09 14:35:02 +13:00
David Back
43cd5586f3 nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface 2018-01-08 17:25:58 -08:00
Seth Alves
d0ddbc0092 fix warning 2018-01-08 16:52:07 -08:00
Dante Ruiz
4cf40554c0 don't call setQmlTabletRoot twice 2018-01-08 16:06:31 -08:00
Seth Alves
8ed72dd276 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:53:21 -08:00
David Rowe
8016ae1bf3 Fix typo 2018-01-09 12:47:12 +13:00
David Rowe
ceb2d38103 Deprecate Overlays.getOverlayObject() 2018-01-09 12:45:12 +13:00
Seth Alves
e0bbf9ee41 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:28:02 -08:00
Seth Alves
ad389e5072 make avatar walk-speed adjustable from js. add a tablet button to control walking vs running 2018-01-08 15:27:41 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch 
Touch feeling for near grab
 2018-01-08 12:50:30 -08:00
Seth Alves
1c94c9c11d Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 12:27:42 -08:00
Seth Alves
f1c03b2d40 adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run 2018-01-08 12:27:35 -08:00
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646 
Window JSDoc
 2018-01-08 11:53:34 -08:00
Zach Fox
2231bf2bdd Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-08 11:45:20 -08:00
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -08:00
Anthony J. Thibault
61edd83987 Improve stability for HMD third person avatars 
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.

To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
 2018-01-08 11:26:29 -08:00
David Rowe
7a971b2d26 Fix typo 2018-01-09 08:17:15 +13:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit 
Bug fix for sit script.
 2018-01-08 09:59:17 -08:00
Seth Alves
f6fed444b0 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 07:49:09 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
Cain Kilgore
47038e4349 WL 21664 - Window.innerHeight should not include the menu bar 2018-01-07 08:31:36 +00:00
Seth Alves
fdead46642 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-06 08:07:28 -08:00
David Rowe
673bc7de38 Update Window JSDoc 2018-01-06 16:05:55 +13:00
Anthony J. Thibault
243dcb88ee Bug fix for sit script. 2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection 
Fix bugs related to inspecting entities with hand controllers
 2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00