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

4317 commits

Author SHA1 Message Date
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal 
Case 21147, Case 20944: Fix setTextures (pal, etc.)
 2019-02-13 17:50:08 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
SamGondelman
189ccfde4a clement's comments from PR14858 2019-02-12 09:51:11 -08:00
SamGondelman
61346437da working on material mapping 2019-02-12 09:22:31 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
SamGondelman
4f03157f39 working on fst material mapping 2019-02-11 10:20:55 -08:00
Roxanne Skelly
e6b2c890d0 Case21085 - Changing domains with scripting APIs not working 
AccountManager was earlier changed to support QUrlQuery for
query strings in it's 'send.'  Unfortunately, QUrlQuery isn't
a scriptable property type so using AM was failing from scripts
 2019-02-07 22:21:05 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
9193704173 trying to get hashes working 2019-02-06 11:47:38 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
Roxanne Skelly
d3cffa50d6 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 11:11:28 -08:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11 
Case 20700: Add missing pulse properties to certain Entity types
 2019-01-28 10:51:00 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Roxanne Skelly
49e6120e73 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 14:06:44 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Roxanne Skelly
cfaf01b22a Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9 
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
 2019-01-24 14:36:27 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision 
Avatar Protocol: Fix for precision issues with translation
 2019-01-23 14:07:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter 
Limit upstream bandwidth to the Avatar Mixer
 2019-01-18 13:32:03 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
2d16e71e74 adding sending oculus ID including username 2019-01-16 17:05:52 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6 staging 2019-01-16 17:05:48 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
Simon Walton
024cb70fce Change member-initializer order to fix warnings 2019-01-16 12:58:13 -08:00