Brad Davis
|
136ced98c3
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-27 13:44:00 -08:00 |
|
John Conklin II
|
b4000c04bc
|
Merge pull request #12432 from highfidelity/feat/content-settings
Add content archives to domain server web interface
|
2018-02-27 13:30:53 -08:00 |
|
Howard Stearns
|
1fb0f898b4
|
Merge pull request #12505 from howard-stearns/wallet-help
new wallet help
|
2018-02-27 13:18:36 -08:00 |
|
Howard Stearns
|
0e4f3460b3
|
Merge pull request #12497 from howard-stearns/end-seeding
End seeding
|
2018-02-27 13:18:13 -08:00 |
|
Sam Gondelman
|
354fae5063
|
Merge pull request #12513 from SamGondelman/revertShadows
Revert can cast shadow work
|
2018-02-27 13:13:09 -08:00 |
|
howard-stearns
|
e21d9f7950
|
Merge branch 'wallet-help' of github.com:howard-stearns/hifi into wallet-help
|
2018-02-27 12:05:00 -08:00 |
|
howard-stearns
|
30896c264b
|
reduced text
|
2018-02-27 12:04:41 -08:00 |
|
howard-stearns
|
53b976b400
|
fix typo in bank href
|
2018-02-27 11:46:06 -08:00 |
|
Zach Fox
|
1119998c7a
|
Fix semicolon
|
2018-02-27 11:45:59 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
|
2018-02-27 11:33:05 -08:00 |
|
howard-stearns
|
1f2d270419
|
Merge branch 'master' of github.com:highfidelity/hifi into wallet-help
|
2018-02-27 11:20:56 -08:00 |
|
Ryan Huffman
|
a6a38d8b3d
|
Merge pull request #12511 from birarda/feat/content-settings
merge master into feat/content-settings
|
2018-02-27 10:03:28 -08:00 |
|
Stephen Birarda
|
9cc348ef27
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-27 09:59:37 -08:00 |
|
Zach Fox
|
9170244312
|
Make WindowScriptingInterface available to tablet
|
2018-02-27 09:36:02 -08:00 |
|
John Conklin II
|
abe7c29b5e
|
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
Export boolean entity properties properly
|
2018-02-27 09:18:46 -08:00 |
|
Brad Davis
|
6254e2b569
|
PR feedback
|
2018-02-27 09:11:40 -08:00 |
|
Brad Davis
|
f01c42dcc9
|
Fixing merged dual-quat pipelines
|
2018-02-27 08:54:46 -08:00 |
|
Ryan Huffman
|
44f3b00a92
|
Merge pull request #12509 from huffman/feat/content-settings
Fix entity data not being stored when Id and DataVersion are null
|
2018-02-27 08:43:44 -08:00 |
|
howard-stearns
|
053640f216
|
a guess a linking bank
|
2018-02-27 08:36:45 -08:00 |
|
Ryan Huffman
|
88931d9c95
|
Fix entity data not being stored when Id and DataVersion are null
|
2018-02-27 08:33:20 -08:00 |
|
howard-stearns
|
ce0ae61947
|
Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help
|
2018-02-27 08:10:17 -08:00 |
|
John Conklin II
|
48f0cded05
|
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
|
2018-02-27 07:53:25 -08:00 |
|
John Conklin II
|
25144f0fec
|
Merge pull request #12456 from Atlante45/fix/min-spec-crash
Fix crash when passing --checkMinSpec flag
|
2018-02-26 17:35:46 -08:00 |
|
Clément Brisset
|
2a7a71db13
|
Merge pull request #12477 from Atlante45/new-master
Merge stable back into master
|
2018-02-26 17:18:24 -08:00 |
|
howard-stearns
|
eb683d4793
|
mail is a link
|
2018-02-26 17:09:33 -08:00 |
|
Stephen Birarda
|
7e3d4d7503
|
Merge pull request #12506 from birarda/feat/content-settings
merge upstream/master into upstream/feat/content-settings
|
2018-02-26 18:08:58 -07:00 |
|
Stephen Birarda
|
19fac01445
|
Merge pull request #12507 from huffman/feat/content-settings
Fix writeSubclassData in octree data
|
2018-02-26 18:08:20 -07:00 |
|
Ryan Huffman
|
8a8830bbd4
|
Fix writeSubclassData in octree data
|
2018-02-26 17:06:25 -08:00 |
|
Stephen Birarda
|
aa7bd2066a
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-26 17:02:00 -08:00 |
|
Stephen Birarda
|
2af0e5fc2b
|
Merge pull request #12501 from huffman/feat/content-settings
Code review changes
|
2018-02-26 17:58:08 -07:00 |
|
howard-stearns
|
2f6e2f6b84
|
new wallet help
|
2018-02-26 16:52:41 -08:00 |
|
Ryan Huffman
|
ec210e1750
|
Move OctreeUtils to OctreeDataUtils
|
2018-02-26 16:51:42 -08:00 |
|
Ryan Huffman
|
3fa538d42d
|
Add RawEntityData subclass
|
2018-02-26 16:32:09 -08:00 |
|
Atlante45
|
2a204533f4
|
Add comments to startup processes
|
2018-02-26 16:25:41 -08:00 |
|
Stephen Birarda
|
f13412dd56
|
Merge pull request #12500 from birarda/feat/content-settings
fixes for comments from code reviews
|
2018-02-26 17:12:30 -07:00 |
|
humbletim
|
d3bae87066
|
* remove unneeded Q_DECLARE_METATYPEs
* CR feedback
|
2018-02-26 19:07:55 -05:00 |
|
Stephen Birarda
|
9c546ce43d
|
Merge pull request #12503 from Atlante45/feat/backups-integration
timing CR for content archives
|
2018-02-26 16:48:50 -07:00 |
|
Atlante45
|
8580d181ce
|
Change refresh threshold to 5 minutes.
|
2018-02-26 15:40:57 -08:00 |
|
Ryan Huffman
|
975bfa6809
|
Clean up std::chrono usage in DomainContentBackupManager
|
2018-02-26 15:39:33 -08:00 |
|
Ryan Huffman
|
f23f751e80
|
Add check to make sure entity data gets written to zip
|
2018-02-26 15:27:24 -08:00 |
|
humbletim
|
767569bc40
|
* changes per CR feedback
* make MeshPart.topology read-only
* JS Graphics API starter documentation
* remove redundant qscriptvalue sequence registrations
|
2018-02-26 18:00:22 -05:00 |
|
Atlante45
|
3592fcf3c2
|
CR
|
2018-02-26 14:52:27 -08:00 |
|
Ryan Huffman
|
65a4b3d316
|
Revert change to packet reading in Socket.cpp
|
2018-02-26 14:43:50 -08:00 |
|
Stephen Birarda
|
2872412f9c
|
fixes for comments from code reviews
|
2018-02-26 14:35:34 -08:00 |
|
Ryan Huffman
|
cd9cdea3e8
|
Update backup formats to filter out non-whitelisted characters
|
2018-02-26 14:29:13 -08:00 |
|
Zach Fox
|
0802bd2c21
|
Fix going to marketplace main page from WalletChoice
|
2018-02-26 14:27:59 -08:00 |
|
Ryan Huffman
|
dbfbee5406
|
CR
|
2018-02-26 13:53:20 -08:00 |
|
Ryan Huffman
|
24da043937
|
Merge pull request #12437 from sethalves/fix-qt-5-10-udt
fix Qt 5.10 udt packet reading
|
2018-02-26 13:50:41 -08:00 |
|
Brad Davis
|
b9387f2a21
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-26 13:18:14 -08:00 |
|
Seth Alves
|
d60d8fe702
|
Merge pull request #12498 from vladest/fix_crash_startup
Search main window by checking object name
|
2018-02-26 13:06:10 -08:00 |
|