Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 15:46:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65276 commits 29 branches 28 tags 1.2 GiB
Commit graph

65276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
SamGondelman
4b1217f1f6 move all entity items to main thread 2018-02-21 15:54:07 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Stephen Birarda
e80fef4e1b fix badging for changes in tables 2018-02-21 15:52:33 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44:23 -08:00
Stephen Birarda
468ac62676 mark corrupted backups and refuse to restore from them in web UI 2018-02-21 15:33:12 -08:00
Gabriel Calero
2d4bb3bad3 Change color to QML debug info 2018-02-21 20:23:54 -03:00
Gabriel Calero
f2ce3d0268 Fix focus hack. Add QML debug info 2018-02-21 20:10:03 -03:00
Atlante45
7582395686 Cleanup backup handlers timers on the correct thread 2018-02-21 14:53:04 -08:00
David Back
10f99602bb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-21 14:32:24 -08:00
Nissim Hadar
049beba157 Corrected edge case of creating a snapshot with "" as the filename. 2018-02-21 14:15:41 -08:00
Stephen Birarda
6e6f52236e
Merge pull request #12445 from birarda/feat/content-settings 
handle permissions save with no existing permissions
 2018-02-21 14:55:37 -07:00
David Rowe
fa1f2267cf Support RC63 2018-02-22 10:06:00 +13:00
Nissim Hadar
b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-21 12:36:56 -08:00
Nissim Hadar
bf4ba07b72 Added parameters to canCastShadow - still sucks. 2018-02-21 12:36:34 -08:00
Sam Gateau
0af8507ce2
Merge pull request #12453 from SamGondelman/materialUI 
Fix new material UI indentation
 2018-02-21 12:14:32 -08:00
Zach Fox
74655bde49 Fix skeletonmodelURLchanged signal 2018-02-21 12:12:20 -08:00
Cristian Luis Duarte
6411d1b35b Android - Avoid overlapping between hint and input in Go To by clearing text when closing the window 2018-02-21 16:52:57 -03:00
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Simon Walton
619901caa0 Move up main #include for other AudioMixer* 
Having #include first will make more robust for MOC compile problems.
Also fixes previous commit to use <> form and correct case.
See Case 12527.
 2018-02-21 11:12:09 -08:00
Zach Fox
1fbc16aae2 Fix noPermissionGlyph margin 2018-02-21 10:52:17 -08:00
SamGondelman
4dde178b93 fix new material UI 2018-02-21 10:33:15 -08:00
ZappoMan
47a98d9d0f relax the deadlock time to 2 minutes 2018-02-21 10:12:04 -08:00
John Conklin II
9ba1532c26
Merge pull request #12446 from sethalves/more-logging-for-fb-11748 
more logging for fogbugz 11748
 2018-02-21 09:49:51 -08:00
Simon Walton
16ffcc7fe2 Add #include of Forward.h to AudioMixer.h 
This makes the compile by Qt MOC less dependent on order of processing.
See Manuscript case 12527.
 2018-02-21 09:48:15 -08:00
Seth Alves
cfbe082074
Merge pull request #12438 from ctrlaltdavid/21757 
Fix selecting values when tabbing between entity properties fields
 2018-02-21 09:22:46 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome 
Make sure Flickable for GridView for TabletHome will not flick
 2018-02-21 09:21:45 -08:00
John Conklin II
9e1ea191b3
Merge pull request #12443 from zfox23/commerce_SendMoneyUiFix1 
Commerce: Wallet/Send Money UI fixes
 2018-02-21 09:02:13 -08:00
John Conklin II
92249a2bee
Merge pull request #12396 from ElderOrb/double-connection-fix 
fix 4x 'fromQml' slots execution
 2018-02-21 09:01:47 -08:00
Nissim Hadar
af484d0af6 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-20 23:48:12 -08:00
Nissim Hadar
6f84e4c977 Moved shadows and ambient occlusion to menu checkboxes. 2018-02-20 23:45:07 -08:00
Liv Erickson
5cd184ddc3 change default add to world shape for asset browser 2018-02-20 17:55:30 -08:00
Seth Alves
bf73df1265 more logging for fogbugz 11748 2018-02-20 15:45:47 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
David Back
66181d93cf Merge branch 'master' of https://github.com/highfidelity/hifi 2018-02-20 15:39:26 -08:00
Stephen Birarda
4b25c9c419 handle permissions save with no existing permissions 2018-02-20 15:06:24 -08:00
Cristian Luis Duarte
00958965bc Android- Center login dialog in both big (Pixel XL, Huawei Mate 9 Pro) and smaller screens (Pixel) 2018-02-20 19:25:41 -03:00
Stephen Birarda
52a24f436c
Merge pull request #12442 from Atlante45/feat/backups-integration 
Update isCorrupted with name indexing
 2018-02-20 15:25:08 -07:00
Zach Fox
f08c66e3ac Remove debug code 2018-02-20 14:16:55 -08:00
Gabriel Calero
bd9d8ac4f9 Tune radar styles 2018-02-20 19:07:41 -03:00
SamGondelman
4f0f6709c1 fix build errors 2018-02-20 13:56:06 -08:00
Zach Fox
fd6f4b569f Fix active focus issue 2018-02-20 13:19:31 -08:00
Zach Fox
eb29bdf5d2 Don't allow tabs or newlines 2018-02-20 13:06:10 -08:00
Ryan Huffman
acda90577a
Merge pull request #11997 from ZappoMan/oldPropsFilters 
giving more info to entity edit filters to allow more flexibility
 2018-02-20 12:57:44 -08:00
Zach Fox
2daa30f125 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-20 12:41:12 -08:00
Zach Fox
9bde9f5a4f Fix height of Optional Message in Send Money 2018-02-20 12:36:11 -08:00
Gabriel Calero
5e3ad3fe9a Disable VPAD on bottom bar tapping and modes bar tapping 2018-02-20 17:20:48 -03:00
Atlante45
0c7f5250f3 Update isCorrupted with name indexing 2018-02-20 11:48:25 -08:00