SamGondelman
|
cc53b338db
|
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
|
2018-02-27 13:30:03 -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 |
|
SamGondelman
|
a4b04d9d43
|
merge
|
2018-02-27 10:08:30 -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 |
|
howard-stearns
|
053640f216
|
a guess a linking bank
|
2018-02-27 08:36:45 -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 |
|
howard-stearns
|
2f6e2f6b84
|
new wallet help
|
2018-02-26 16:52:41 -08:00 |
|
Atlante45
|
2a204533f4
|
Add comments to startup processes
|
2018-02-26 16:25:41 -08:00 |
|
humbletim
|
d3bae87066
|
* remove unneeded Q_DECLARE_METATYPEs
* CR feedback
|
2018-02-26 19:07:55 -05: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 |
|
Zach Fox
|
0802bd2c21
|
Fix going to marketplace main page from WalletChoice
|
2018-02-26 14:27:59 -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 |
|
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 |
|
Zach Fox
|
8223ebf393
|
Correctly handle referrer from WalletChoice
|
2018-02-26 12:44:41 -08:00 |
|
SamGondelman
|
6fe2d46d7c
|
merge
|
2018-02-26 12:40:14 -08:00 |
|
howard-stearns
|
4e4aebc7ee
|
get WalletChoice setup flow from My Purchases and confirmation. Still
not correct referrer.
|
2018-02-26 12:02:56 -08:00 |
|
Sam Gondelman
|
d1d6adf447
|
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1
fix osx shadows
|
2018-02-26 11:46:43 -08:00 |
|
John Conklin II
|
7d450daaa1
|
Merge pull request #12397 from hyperlogic/bug-fix/entity-mat-avatar-dual-quaternions
Bug fix/entity mat avatar dual quaternions
|
2018-02-26 11:37:33 -08:00 |
|
John Conklin II
|
4feea929ce
|
Merge pull request #12449 from misslivirose/fix/atp-collisions
change default add to world shape for asset browser
|
2018-02-26 11:15:01 -08:00 |
|
John Conklin II
|
6316f33282
|
Merge pull request #12485 from dback2/avatarMotors
Add dynamic mode for scripted avatar motor
|
2018-02-26 11:03:30 -08:00 |
|
Anthony J. Thibault
|
f5fcaae283
|
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
|
2018-02-26 10:55:44 -08:00 |
|
howard-stearns
|
2de72c125d
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 10:54:22 -08:00 |
|
John Conklin II
|
e586a35d38
|
Merge pull request #12489 from vladest/fix_table_sort_indicator
Make sure sort indicator is attached to the right of title
|
2018-02-26 10:33:27 -08:00 |
|
howard-stearns
|
a5cedde3c8
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 10:33:03 -08:00 |
|
John Conklin II
|
3201d2ba21
|
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
|
2018-02-26 10:13:40 -08:00 |
|
Anthony J. Thibault
|
c8af9c6f04
|
Missing EPSILON
|
2018-02-26 10:05:15 -08:00 |
|
Anthony J. Thibault
|
0404b722e4
|
Code review feedback
|
2018-02-26 10:00:32 -08:00 |
|
NissimHadar
|
c0f20900a0
|
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
Corrected edge case of creating a snapshot with "" as the filename.
|
2018-02-26 09:39:16 -08:00 |
|
John Conklin II
|
c227c11aa2
|
Merge pull request #12475 from ElderOrb/FB12518
fix for 'help icon in toolbar does not highlight when help window is open'
|
2018-02-26 09:35:56 -08:00 |
|
howard-stearns
|
30a6cca4b3
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 09:26:09 -08:00 |
|
Zach Fox
|
b5c42bfeca
|
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps
Commerce: Extended Certificates - Apps!
|
2018-02-26 08:24:53 -08:00 |
|
vladest
|
77ef0e05a1
|
Search main window by checking object name
|
2018-02-26 13:43:50 +01:00 |
|
humbletim
|
3dbe5d79bb
|
fix windows punctilious warnings
|
2018-02-26 06:01:16 -05:00 |
|
humbletim
|
54dc0240b0
|
remove bufferviewscripting refs; fix compiler warnings
|
2018-02-26 05:26:35 -05:00 |
|
humbletim
|
f824edd04e
|
* remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
|
2018-02-26 04:58:22 -05:00 |
|
howard-stearns
|
dee3df5299
|
remove debugging
|
2018-02-25 15:26:18 -08:00 |
|
howard-stearns
|
5e78de61ee
|
remove debugging
|
2018-02-25 15:24:08 -08:00 |
|