Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:03:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53340 commits 76 branches 59 tags 1.2 GiB
Commit graph

53340 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Seth Alves
84a66e1003 Merge branch 'master' of github.com:highfidelity/hifi 2017-04-05 12:41:55 -07:00
Seth Alves
b6bf9c3c3c Merge branch 'master' of github.com:sethalves/hifi 2017-04-05 12:41:48 -07:00
Seth Alves
b0ccbae552 Merge pull request #10131 from druiz17/tablet-edit-box 
Fix the text input for edit's newModelDialog
 2017-04-05 12:37:26 -07:00
Seth Alves
b58fe6ee90 Merge pull request #10127 from druiz17/oculus-tracking 
Use old controller data for 3 seconds when losing track of touch controllers
 2017-04-05 12:34:43 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
fa95842c76 Merge branch 'master' of github.com:highfidelity/hifi into tablet-edit-box 2017-04-05 18:01:21 +01:00
Dante Ruiz
24b89275f2 fix new model dialog textInput 2017-04-05 18:00:43 +01:00
Anthony J. Thibault
c33f10ca1b Recenter body on teleport, also it works more consistently. 
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
 2017-04-04 18:05:46 -07:00
Seth Alves
384f404602 Merge pull request #10109 from mittens/21240 
OBJ Loader Rewrite to Support Multiple Materials
 2017-04-04 15:56:44 -07:00
Philip Rosedale
b59d0bcd59 Merge pull request #10122 from hyperlogic/bug-fix/fix-sliding-feed-in-HMD-mode 
Fix for sliding feet when leaning in HMD mode.
 2017-04-04 15:32:46 -07:00
Seth Alves
b6bda3eef2 Merge branch '21240' of github.com:mittens/hifi 2017-04-04 15:32:39 -07:00
Brad Davis
15f7e895aa More thread safety 2017-04-04 15:09:21 -07:00
Stephen Birarda
70eada0f76 replace backslashes in parsed fbx relative filepaths 2017-04-04 15:01:18 -07:00
Stephen Birarda
0b57b98970 change readFBX calls to use QUrl where possible 2017-04-04 14:53:14 -07:00
Stephen Birarda
137e73cf21 check absolute path before relative path 2017-04-04 14:42:03 -07:00
Stephen Birarda
0a7100e2d8 pass URLs to readFBX, not just URL path 2017-04-04 14:34:10 -07:00
Dante Ruiz
81ae3e44fd Merge branch 'master' of github.com:highfidelity/hifi into oculus-tracking 2017-04-04 22:11:08 +01:00
Dante Ruiz
a31812821a oculus lost tracking, delay hand to side 2017-04-04 22:10:47 +01:00
Brad Davis
cd7c1643a3 More thread safety 2017-04-04 14:03:30 -07:00
Stephen Birarda
4e07a6a865 add new logic for absolute texture paths in FBX 2017-04-04 14:02:00 -07:00
Brad Davis
54200c03a7 Fixing deadlock 2017-04-04 13:53:49 -07:00
kunalgosar
8749428ede dont assume no query tags 2017-04-04 13:51:34 -07:00
samcake
8b4696f4ec Merge and solve conflicts 2017-04-04 13:28:03 -07:00
samcake
6385a702cd FIxing the bug for image3D overlay drawn in scene 2017-04-04 12:56:43 -07:00
Howard Stearns
fa7baaa5ba Merge pull request #10124 from howard-stearns/send-initial-path 
send initial path in location update (e.g., on login)
 2017-04-04 12:40:09 -07:00
howard-stearns
6f79b2eaeb send initial path in location update (e.g., on login) 2017-04-04 12:05:43 -07:00
kunalgosar
cc81bcab66 updating url check from hifi master 2017-04-04 11:58:38 -07:00
Kunal Gosar
e5c075f107 fix typo and namespace 2017-04-04 11:54:58 -07:00
kunalgosar
8e4229b211 dont redirect people from webentity 2017-04-04 11:54:58 -07:00
kunalgosar
3b88553699 check scripts 2017-04-04 11:54:58 -07:00
kunalgosar
9d0667cb31 add url tag to web entities 2017-04-04 11:54:58 -07:00
kunalgosar
19ab7526d3 apply profile to relevant entities 2017-04-04 11:54:21 -07:00
kunalgosar
9b758dbdba updated headers 2017-04-04 11:54:21 -07:00
kunalgosar
a0f0879087 added file type filter and interceptor 2017-04-04 11:54:21 -07:00
samcake
b18d82bd19 adding different shaders for transparent for simpel 2017-04-04 11:50:38 -07:00
Stephen Birarda
b9783d768e remove fileOnUrl since it is no longer used 2017-04-04 11:08:30 -07:00
Anthony J. Thibault
c58fdb590a Fix for sliding feet when leaning in HMD mode. 2017-04-04 11:00:34 -07:00
Brad Davis
fe84232ab4 More work on thread safety 2017-04-04 10:50:56 -07:00
Brad Davis
d89104f69c Use getters instead of direct member access 2017-04-04 10:50:55 -07:00
Brad Davis
03c6275268 more thread safety 2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789 Thread safety for property getter/setters on entities 2017-04-04 10:50:53 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts 
Fix broken eventBridge on tablet after Reload All Scripts.
 2017-04-04 10:45:08 -07:00
Howard Stearns
b0fa784267 Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach 
Dk/pal improvements mostly zach
 2017-04-04 10:03:10 -07:00
David Kelly
08ac25473f wording change 2017-04-04 09:53:09 -07:00
Vladyslav Stelmakhovskyi
aa487faad1 Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings 2017-04-04 16:59:09 +02:00
Vladyslav Stelmakhovskyi
367555acdb Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set 2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi
332f9bb283 Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error 2017-04-04 16:22:40 +02:00