David Rowe
|
eeb7f5ca8d
|
Doc review
|
2018-03-07 17:29:39 +13:00 |
|
Elisa Lupin-Jimenez
|
c6e5f4c9c8
|
zip file drags don't auto add model textures
|
2018-03-06 19:24:09 -08:00 |
|
Thijs Wenker
|
866bec0b34
|
rule -> role
|
2018-03-07 02:36:07 +01:00 |
|
Cristian Luis Duarte
|
bde2ba9272
|
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
|
2018-03-06 22:02:23 -03:00 |
|
Elisa Lupin-Jimenez
|
251e4a3127
|
Fixed blocks importer textures being interpreted as image entities
|
2018-03-06 16:44:23 -08:00 |
|
NissimHadar
|
d72f46ec3e
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-06 16:24:53 -08:00 |
|
Zach Fox
|
04a230c20f
|
Merge pull request #12491 from ElderOrb/FB12523
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
|
2018-03-06 16:19:39 -08:00 |
|
Dante Ruiz
|
97d283cc5f
|
use correct api call for audio and correct function call to set stereo input mode
|
2018-03-06 16:17:27 -08:00 |
|
Atlante45
|
edeed95ccc
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
|
2018-03-06 15:33:12 -08:00 |
|
NissimHadar
|
dbf1be5de3
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-06 15:22:40 -08:00 |
|
Gabriel Calero
|
a2327ea0cf
|
Merge branch 'android' into android_bubble_fix
|
2018-03-06 19:03:53 -03:00 |
|
Gabriel Calero
|
069d3e40bc
|
Merge branch 'android' into android_bubble_fix
|
2018-03-06 18:58:49 -03:00 |
|
Zach Fox
|
48aa862c16
|
Show Connection instructions in Send Money when 0 connections
|
2018-03-06 13:52:42 -08:00 |
|
Brad Davis
|
6cc36136bd
|
Fix assert on interaction with stats and avatarinputs during UI setup
|
2018-03-06 12:34:21 -08:00 |
|
Alexander Ivash
|
53e1a0cae5
|
forward 'maybeEnableHmdPreview' if control is not visible
|
2018-03-06 22:25:35 +03:00 |
|
John Conklin II
|
7bc3848c36
|
Merge pull request #12533 from druiz17/stereo-checkbox
Adding Stereo checkbox in Audio settings
|
2018-03-05 12:45:01 -08:00 |
|
Brad Davis
|
8bfc610cfb
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-05 11:48:58 -08:00 |
|
NissimHadar
|
1eb0dde3d2
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-05 11:36:39 -08:00 |
|
John Conklin II
|
3f751bb5ca
|
Merge pull request #12546 from druiz17/fix-hyperlink
Fix hyperlink when far/near grabbing enitities
|
2018-03-05 08:23:51 -08:00 |
|
vladest
|
43e7f282ec
|
cleanup
|
2018-03-04 20:44:46 +01:00 |
|
vladest
|
c2c7962f66
|
return styling. set implicit sizes
|
2018-03-04 19:49:47 +01:00 |
|
vladest
|
9f151566bf
|
temporarily remove styling
|
2018-03-04 18:46:27 +01:00 |
|
vladest
|
1d43ca48bd
|
remove wrap
|
2018-03-04 17:59:56 +01:00 |
|
vladest
|
12a70d57c2
|
Set Y pos for indicator explicetly
|
2018-03-04 17:24:52 +01:00 |
|
NissimHadar
|
8536b44c61
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-02 16:09:06 -08:00 |
|
John Conklin II
|
8f403ebc23
|
Merge pull request #12543 from zfox23/improveFontLoading
Improve font loading via QRC instead of file path
|
2018-03-02 14:22:17 -08:00 |
|
Dante Ruiz
|
7ce13a3ce7
|
adding comment
|
2018-03-02 11:06:28 -08:00 |
|
Dante Ruiz
|
55d8cfd4c1
|
make sure dont make audio devices that don't use stereo use stereo
|
2018-03-02 10:56:44 -08:00 |
|
NissimHadar
|
000b08f7c0
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-02 08:07:01 -08:00 |
|
Sam Gateau
|
88ecfe7895
|
Merge pull request #12464 from jherico/android_dev
Android Master
|
2018-03-01 17:22:34 -08:00 |
|
SamGondelman
|
e3b65a9201
|
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
|
2018-03-01 16:39:31 -08:00 |
|
Dante Ruiz
|
1f4aed31f1
|
adding hyperlink
|
2018-03-01 16:16:47 -08:00 |
|
David Rowe
|
b50044fb2b
|
Remove deprecated Window.openFileChanged() signal from API
|
2018-03-02 13:15:27 +13:00 |
|
NissimHadar
|
0f2cf8ea85
|
Re-implemented shadow controls.
|
2018-03-01 14:24:20 -08:00 |
|
Dante Ruiz
|
4b572eda6b
|
changing Name
|
2018-03-01 11:05:40 -08:00 |
|
Dante Ruiz
|
8cae20f53d
|
adding stereo checkbox to audio settings
|
2018-03-01 11:03:18 -08:00 |
|
Zach Fox
|
877fa52034
|
Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading
|
2018-03-01 10:14:23 -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 |
|
Zach Fox
|
67034274fa
|
Improve font loading by using QRC instead of relative paths
|
2018-02-28 17:59:37 -08:00 |
|
Cristian Luis Duarte
|
9acb83632c
|
Android - Make joystick move up when showing the bottom bar
|
2018-02-28 18:52:13 -03:00 |
|
Cristian Luis Duarte
|
55d52f92df
|
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
|
2018-02-28 15:55:50 -03:00 |
|
samcake
|
9e5ed7b905
|
Add more timing stats in explanded mode
|
2018-02-28 10:48:35 -08:00 |
|
Cristian Luis Duarte
|
428f4b7b9d
|
Android - Make the virtual pad (joystick) position fixed. Change assets.
|
2018-02-27 21:24:21 -03:00 |
|
David Rowe
|
a782b6779a
|
Merge branch 'master' into 21709
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
|
2018-02-28 12:42:05 +13:00 |
|
samcake
|
e290f2fc3c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-27 14:54:11 -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 |
|
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 |
|
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 |
|
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 |
|
Olivier Prat
|
2d71d7da9f
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
|
2018-02-27 09:11:43 +01: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 |
|
David Rowe
|
1fb02d15d7
|
Entities actions JSDoc
|
2018-02-27 14:12:20 +13: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
3e552e5739
|
Fix warnings
|
2018-02-26 09:53:35 -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 |
|
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 |
|
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 |
|
howard-stearns
|
300f611c47
|
working, with soft reset
|
2018-02-25 14:06:06 -08:00 |
|
howard-stearns
|
3d0e3a3901
|
Merge branch 'master' of https://github.com/highfidelity/hifi into end-seeding
|
2018-02-24 13:34:00 -08:00 |
|
vladest
|
62f2ba0dad
|
More intellectual calculation of title positions taking in account actual sort indicator glyph size
|
2018-02-24 09:32:08 +01:00 |
|
Seth Alves
|
9e156deaab
|
Merge pull request #12494 from druiz17/one-menu
Remove the avatarEntitiesBookmark menu option
|
2018-02-23 19:02:25 -08:00 |
|
SamGondelman
|
b56f755034
|
material reflection
|
2018-02-23 17:58:46 -08:00 |
|
Brad Hefta-Gaub
|
3d54f4d246
|
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog
Relax deadlock watchdog
|
2018-02-23 17:09:30 -08:00 |
|
howard-stearns
|
726c1ed816
|
receiveAt with new key
|
2018-02-23 17:05:46 -08:00 |
|
howard-stearns
|
8f44a52140
|
Merge branch 'end-seeding' of github.com:howard-stearns/hifi into end-seeding
|
2018-02-23 16:37:00 -08:00 |
|
Zach Fox
|
fe515e949b
|
New UI for new HFC users
|
2018-02-23 16:36:20 -08:00 |
|
Atlante45
|
800d15b405
|
Make sure settings timer is running
|
2018-02-23 16:23:50 -08:00 |
|
howard-stearns
|
29a2fa6ca5
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-23 16:19:54 -08:00 |
|
Sam Gondelman
|
e10af9b83d
|
Merge pull request #12462 from SamGondelman/entityDelete
Fix EntityItems not getting destroyed
|
2018-02-23 16:17:52 -08:00 |
|
Zach Fox
|
cc98eb6424
|
Fix lightbox stuck
|
2018-02-23 16:14:42 -08:00 |
|
howard-stearns
|
f66e688f41
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-23 16:12:41 -08:00 |
|
howard-stearns
|
53614a1d9f
|
almost working
|
2018-02-23 16:12:01 -08:00 |
|