Seth Alves
|
507dfa5ec3
|
more code review response
|
2018-03-02 11:35:34 -08:00 |
|
Seth Alves
|
bdd926f89e
|
cleanups
|
2018-03-02 10:38:35 -08:00 |
|
Seth Alves
|
45157a16f2
|
merge from upstream
|
2018-03-02 09:57:27 -08:00 |
|
Seth Alves
|
82bfd25d8b
|
fix placename in title-bar, fix domain-spawning-point
|
2018-03-02 09:54:54 -08:00 |
|
Sam Gateau
|
88ecfe7895
|
Merge pull request #12464 from jherico/android_dev
Android Master
|
2018-03-01 17:22:34 -08:00 |
|
Seth Alves
|
9ee65ab474
|
don't use clipboard when loading serverless domains
|
2018-03-01 13:31:43 -08:00 |
|
Seth Alves
|
2d374583b4
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-01 11:07:50 -08:00 |
|
Seth Alves
|
33065fb51c
|
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
|
2018-03-01 11:07:37 -08:00 |
|
John Conklin II
|
1e1836c009
|
Merge pull request #12502 from elisa-lj11/2dimages-update
Image entity has correct orientation and is collisionless
|
2018-03-01 09:57:08 -08:00 |
|
samcake
|
9e5ed7b905
|
Add more timing stats in explanded mode
|
2018-02-28 10:48:35 -08:00 |
|
samcake
|
e290f2fc3c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-27 14:54:11 -08:00 |
|
Seth Alves
|
a44ddbbc26
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-27 14:09:05 -08:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Seth Alves
|
636c271dc3
|
merge from upstream
|
2018-02-27 09:21:08 -08:00 |
|
samcake
|
efba6bb524
|
Adding a counter for the other parts of the gameloop
|
2018-02-27 09:11:14 -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 |
|
Stephen Birarda
|
aa7bd2066a
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-26 17:02:00 -08:00 |
|
howard-stearns
|
2f6e2f6b84
|
new wallet help
|
2018-02-26 16:52:41 -08:00 |
|
Seth Alves
|
642e7b7c37
|
Merge pull request #24 from druiz17/serverless-domains
Some bug fixes
|
2018-02-26 15:25:59 -08:00 |
|
Elisa Lupin-Jimenez
|
b56c78d36c
|
image has correct orientation and is collisionless
|
2018-02-26 14:44:46 -08:00 |
|
Zach Fox
|
0802bd2c21
|
Fix going to marketplace main page from WalletChoice
|
2018-02-26 14:27:59 -08:00 |
|
Dante Ruiz
|
a23c425f5e
|
actions and serverless status fixes
|
2018-02-26 14:24:51 -08:00 |
|
Seth Alves
|
666fa77be2
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-26 13:53:20 -08:00 |
|
Brad Davis
|
b9387f2a21
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-26 13:18:14 -08:00 |
|
Zach Fox
|
8223ebf393
|
Correctly handle referrer from WalletChoice
|
2018-02-26 12:44:41 -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 |
|
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 |
|
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 |
|
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 |
|
howard-stearns
|
30a6cca4b3
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 09:26:09 -08:00 |
|
Seth Alves
|
f08864f17b
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-26 09:01:41 -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 |
|
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 |
|