Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:55:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75835 commits 71 branches 56 tags 1.2 GiB
Commit graph

75835 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
db9b44a71a QmlMarketplace - The QML Text object has sufficient markup to handle 
all of our needs, so use that instead of webengineview
 2019-02-04 15:30:53 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7 QmlMarketplace - fix issue with footer not appearing in marketplaces list 2019-02-04 15:04:18 -08:00
John Conklin II
46fc19e101
Merge pull request #14840 from danteruiz/tablet-root-color 
Case 20973: Fix SendAsset.qml has wrong color
 2019-02-04 14:27:19 -08:00
Roxanne Skelly
1840f874ab Add Attributions to Qml Marketplace 2019-02-04 13:29:06 -08:00
Jamil Akram
bab411e001
Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again 
Make Animation Unit Tests Pass Again
 2019-02-04 12:45:12 -08:00
Andrew Meadows
1d7265f668 trust the data in the packet, Luke 2019-02-04 09:45:06 -08:00
Roxanne Skelly
39ad36a4d0 QmlMarketplace - bugfixes and Markup rendering of descriptions 
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
 2019-02-01 15:27:17 -08:00
raveenajain
d1d8832e7a read in embedded data 2019-02-01 11:27:43 -08:00
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -08:00
Simon Walton
322030fccd Remove unused variable; fix use of qCDebug 2019-01-31 16:07:26 -08:00
Simon Walton
e4ffc93bc2 Revert a cherry-picked workaround accidently committed 
This reverts commit 08b21109c1.
Stupid git - I never explicitly added this to the branch!
 2019-01-31 15:19:05 -08:00
sabrina-shanman
3d1edf4d9e Make small code improvements to PrepareJointsTask 2019-01-31 15:00:50 -08:00
Simon Walton
d0fb09a3bd Assign lowest available suffix when display-names collide 2019-01-31 14:58:58 -08:00
raveenajain
f73296182c Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded 2019-01-31 14:19:58 -08:00
Jeff Clinton
1239ca086d
Merge pull request #14831 from danteruiz/the-spot 
Case 20942: Goto the spot on first launch (80.0/master)
 2019-01-31 14:15:24 -08:00
raveenajain
997660d430 review changes 2019-01-31 13:50:17 -08:00
raveenajain
216e9bd4cb Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update 2019-01-31 13:47:38 -08:00
raveenajain
ae09aec5d9 embedded model geometry 2019-01-31 13:36:53 -08:00
Thijs Wenker
80f5cbc8ab also ignore picking on the material entity 2019-01-31 22:14:15 +01:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -08:00
Thijs Wenker
15066faaf7 ignore pickRay for zone shape visualizers 2019-01-31 19:45:29 +01:00
luiscuenca
5438bddc84 Fix assertion on shapeInfo when creating multisphere with empty data 2019-01-31 09:43:30 -07:00
SamGondelman
2d0c1184e4 only domain zone entities control flying and ghosting 2019-01-30 18:27:17 -08:00
SamGondelman
5553752d81 fall when flying not allowed 2019-01-30 18:04:44 -08:00
Clement
283dabc622 Fix reload mechanic for entity server scripts 2019-01-30 17:29:28 -08:00
Anthony Thibault
2c40b120ca Make Animation Tests Pass Again 2019-01-30 17:26:52 -08:00
SamGondelman
6e61c02d04 fix getEntityProperties 2019-01-30 17:17:39 -08:00
Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun 
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
 2019-01-30 17:00:12 -08:00
Brad Davis
9714271a2a Migrate shutdown hack applied to QtActivity to InterfaceActivity 2019-01-30 16:23:22 -08:00
Bradley Austin Davis
2db5bbd381 Fix mac frame player 2019-01-30 16:23:22 -08:00
Brad Davis
3866c7568c Update dockerfile 2019-01-30 16:23:22 -08:00
Brad Davis
eb0566b94e Fix signing configs 2019-01-30 16:23:22 -08:00
Brad Davis
67cf08e8ae Quest frame player 2019-01-30 16:23:22 -08:00
Brad Davis
b1eb0b0a46 GPU tweaks 2019-01-30 16:23:21 -08:00
Brad Davis
5d1277e1bb GL helpers cleanup 2019-01-30 16:23:21 -08:00
Brad Davis
fed9e27a66 Expose current android app name to source code 2019-01-30 16:23:21 -08:00
Brad Davis
c3c22aa84c EGL and Oculus depedency macros 2019-01-30 16:23:21 -08:00
Brad Davis
8a1a55189a CMake cleanup and modernization 2019-01-30 16:23:14 -08:00
SamGondelman
6cbc0fad7f fixes 2019-01-30 15:58:15 -08:00
Wayne Chen
03789e01da adding fix for oculus store argument check 2019-01-30 15:53:21 -08:00
Seth Alves
30d9fe705e avoid possible crash 2019-01-30 14:56:50 -08:00
Seth Alves
c6f44234f8 avoid possible crash 2019-01-30 14:56:02 -08:00
Seth Alves
f33e5ba5ae cleanup 2019-01-30 14:47:38 -08:00
Seth Alves
3ab2db96b6 deactivate grab action when grab is released 2019-01-30 14:43:11 -08:00
Seth Alves
0846eb8ec6 attempt to allow position edits in releaseGrab entity-method 2019-01-30 14:43:11 -08:00
John Conklin II
10bb637753
Merge pull request #14810 from SamGondelman/skybox 
Case 20833: Fix procedural skybox depth testing
 2019-01-30 14:16:36 -08:00
Dante Ruiz
93a91cdba2 webengine fileselector 2019-01-30 13:57:49 -08:00
Simon Walton
08b21109c1 Include the new scale float in min remaining size calculation 2019-01-30 13:55:12 -08:00