Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 09:22:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75692 commits 76 branches 59 tags 1.2 GiB
Commit graph

75692 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shannon Romano
30a6f25b69
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor 
case 20048: don't allow MyAvatar to move until physics enabled
 2019-02-06 11:52:42 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace 
Qml marketplace
 2019-02-06 11:20:49 -08:00
Shannon Romano
26927aaec6
Merge pull request #14847 from AndrewMeadows/trust-the-packet 
Case 20959: fix crash for incorrect parsing of AvatarEntity data
 2019-02-06 11:15:13 -08:00
John Conklin II
3ee412faf7
Merge pull request #14854 from danteruiz/quest-default 
Case 21037: Allow the script engine to use FileSeclector when loading scriopts
 2019-02-06 07:21:03 -08:00
John Conklin II
ae6672533c
Merge pull request #14788 from jherico/feature/quest_gpu_timers 
Case 20876: Quest: Support gpu timing on systems with disjoint timer extension
 2019-02-05 14:49:40 -08:00
John Conklin II
ec0bdba7fb
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab 
case 20919: Fix edit in release grab
 2019-02-05 14:48:59 -08:00
danteruiz
30bd9774b2 script engine to load platform specific files 2019-02-05 13:11:54 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector 
Case 20879: Migrate  webEngine referencing  QML into +webengine folder
 2019-02-05 12:57:38 -08:00
Roxanne Skelly
d3bc536b58 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-05 11:35:28 -08:00
Andrew Meadows
cbd83f972c remove unsued variable 2019-02-05 10:17:10 -08:00
Roxanne Skelly
2b40260953 QmlMarketplace - disable HTML for quest 2019-02-05 09:27:12 -08:00
Brad Hefta-Gaub
936837c886
Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master 
[master] Fix reload mechanic for entity server scripts
 2019-02-05 09:19:56 -08:00
Andrew Meadows
e50892b3d2 MyAvatar is unmovable until physics is enabled 2019-02-05 09:00:48 -08:00
Andrew Meadows
5a4960b300 add crash::doAssert() for debug purposes 2019-02-05 09:00:48 -08:00
Roxanne Skelly
364a1698fe QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions 2019-02-04 17:24:30 -08:00
Jamil Akram
35c0af0bf3
Merge pull request #14818 from wayne-chen/oculusLoginFeature 
MS20925: Oculus login button not appearing
 2019-02-04 17:20:07 -08:00
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
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -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
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -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
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
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
SamGondelman
93e32f1bd5 fix skybox depth testing 2019-01-30 12:25:48 -08:00
Ryan Huffman
9c8e21ec6b
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren 
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
 2019-01-30 09:55:39 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors 
Case 20888: Fix color space
 2019-01-30 09:09:07 -08:00
Sam Gateau
d418fa282a
Merge pull request #14801 from SamGondelman/transparent 
Case 20867: Fix translucent textures not getting reset
 2019-01-30 08:54:48 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering 
Case 20902: Give SendAsset.qml a background color
 2019-01-30 08:54:03 -08:00
Thijs Wenker
132d293c3c skip child entities of mismatching entityHostType when copy/delete/duplication of entities 2019-01-30 03:15:32 +01:00
Dante Ruiz
ccf02d8b65 fix SendAssets.qml 2019-01-29 17:16:27 -08:00
Jamil Akram
cc38a96bff
Merge pull request #14415 from Atlante45/feat/rc-branch-script 
RC branch script
 2019-01-29 16:32:49 -08:00
Roxanne Skelly
0fdbca8ade QmlMarketplace Bugfixes 
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
 2019-01-29 16:07:27 -08:00
Shannon Romano
4c4a2036c7
Merge pull request #14791 from SimonWalton-HiFi/pal_username_update 
Don't update PAL namecard with empty strings
 2019-01-29 15:41:31 -08:00
SamGondelman
56096708d3 one more try 2019-01-29 15:26:49 -08:00