Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 13:13:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63356 commits 67 branches 56 tags 1.2 GiB
Commit graph

900 commits

Author SHA1 Message Date
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
David Back
1aeadcbc64 prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors 2017-11-22 11:38:52 -08:00
Elisa Lupin-Jimenez
b6e75d1222 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
88823a169b changed url for blocks app 2017-11-20 10:01:33 -08:00
Alexander Ivash
c5d2f598d7 8244 Rename captionColorOverride to captionColor 2017-11-16 15:46:49 +03:00
Brad Davis
bb2e061d77 Fixing global declarations in JS 2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
luiscuenca
ee3900be4f Corrections 2017-11-07 18:26:41 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Brad Davis
d162e1cff6 Whitelist functionality for tablet apps 2017-11-04 15:14:06 -07:00
David Rowe
7cb6bae1e6 Remove stopwatch source in favor of using source in hifi-content repo 2017-10-26 14:09:50 +13:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
74899e4798 Preload PNG files also 2017-10-12 13:58:18 +13:00
David Rowe
f3b2ccf5f8 Preload asset files so that they're in disk cache ready for use 2017-10-12 09:09:57 +13:00
David Rowe
765f3fc381 Move Shapes app files from scripts directory to marketplace directory 2017-10-09 10:38:40 +13:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
Andrew Meadows
fcff198b61 Merge pull request #11410 from humbletim/21545 
WL 21545: Fix up the doppleganger mirror script
 2017-09-21 08:47:24 -07:00
David Rowe
80f56e48ca Fix Record app's toolbar button not highlighting when app dialog open 2017-09-20 16:50:19 +12:00
humbletim
708698f079 potential fix for the doppleganger "scrunching into a ball" issue 2017-09-19 23:21:46 -04:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Menithal
59746c564b 21536: Applied forgotten beutify to file 2017-09-13 21:24:24 +03:00
Menithal
40beb4bca8 Some minor tweaks 2017-09-12 22:12:30 +03:00
Menithal
79603765c4 Removed unused check 2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3 Switched from marketplace links to local 2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
Menithal
30c979bd31 Added Clap App to Repository 
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
 2017-09-11 23:48:30 +03:00
Melissa Brown
fe1b614f39 Merge pull request #11213 from MidnightRift/21341 
WL 21341 DodgeBall
 2017-09-05 15:33:31 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
Elisa Lupin-Jimenez
5c027705ba removed extraneous line from active tablet button code 2017-08-24 12:01:08 -07:00
Elisa Lupin-Jimenez
3444b0e84c blocks icon button now has active state 2017-08-24 11:38:01 -07:00
Elisa Lupin-Jimenez
20b6cddc56 attempt to add active tablet button 2017-08-23 15:38:11 -07:00
Midnight
9185e1d80d code style. 2017-08-21 14:48:10 -07:00
Midnight
6892cdb57d Consolidate Clear Prox Code, Add Clear Prox to collisionWithEntity. 2017-08-18 19:20:34 -07:00
Midnight
9ff68ce10c Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:51:44 -07:00
Midnight
37ee2a31d4 Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:50:03 -07:00
Midnight
397d2a6853 Minor Code Cleanup. 2017-08-18 16:12:56 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Midnight
7da4bc04d3 Add DodgeBall. 2017-08-18 13:36:07 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
Elisa Lupin-Jimenez
a9d5cb45e9 changed icon to white 2017-08-17 10:11:29 -07:00
Elisa Lupin-Jimenez
930f163ca1 added app icon 2017-08-16 17:57:32 -07:00
Elisa Lupin-Jimenez
e032979794 a little cleanup 2017-08-16 17:33:14 -07:00
Elisa Lupin-Jimenez
bf35b08179 Emoji tablet app 2017-08-16 17:27:29 -07:00
vladest
15f8bc0141 Keep old function names for compatibility 2017-08-16 22:17:34 +02:00
vladest
51a5c30353 Reimplement asset browsing for async 2017-08-15 17:05:55 +02:00