Stephen Birarda
7a81c3e8e7
allow passing of custom URL on env
2017-12-12 16:32:43 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -08:00
Zach Fox
902064ed37
Cleanup debug stuff
2017-12-05 15:26:55 -08:00
Zach Fox
7521e4870e
Bugfixes
2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5
Add data tracking for wallet setup
2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222
Add data tracking for purchase and rez
2017-12-05 13:09:09 -08:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov
...
Make buildable APK from Gradle
2017-11-30 11:23:29 -08:00
Brad Davis
d769acd345
Updating Android toolchain
2017-11-28 11:32:32 -08:00
Stephen Birarda
8978254037
kick logged in by fingerprint/ip if enabled in DS settings
2017-11-27 18:23:14 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
...
Make add entity atomic
2017-11-18 14:27:12 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
ZappoMan
66454e7288
fix unix warnings
2017-11-17 16:33:43 -08:00
ZappoMan
71a46a3374
cleanup
2017-11-17 13:03:04 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id
...
Reset EntityTreeSendThread known state if client disconnects from Entity Server
2017-11-17 12:56:25 -08:00
Stephen Birarda
16d93ee168
clarify signatures in LNL to send packet lists
2017-11-17 11:17:11 -08:00
ZappoMan
cd0fa989e1
debugging
2017-11-17 08:55:55 -08:00
ZappoMan
e438ac54d5
make adds go over NLPacketList as reliable
2017-11-16 13:16:23 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -08:00
ZappoMan
4c4f23e312
Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic
2017-11-16 10:09:46 -08:00
Atlante45
e68ce97697
Remove the number of socket change tracking
2017-11-15 11:19:54 -08:00
ZappoMan
c6947dd165
some side by side plumbing for NLPackets and NLPacketLists
2017-11-09 18:20:06 -08:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466
...
Fix Avatar Rotation upon Teleporting Using PAL
2017-11-03 11:58:15 -07:00
Zach Fox
48979a5ce8
Merge pull request #11730 from zfox23/pop_avatarEntityTests
...
Commerce: Avatar Entity Tests
2017-11-02 15:34:37 -07:00
Stephen Birarda
25c10d5de2
Merge pull request #11735 from highfidelity/stable
...
Merge stable back into master
2017-11-02 14:22:31 -07:00
Ryan Huffman
edc7b91a42
Fix comment in NetworkingConstants referencing shared.js location
2017-11-01 12:57:07 -07:00
Zach Fox
bb1ffbc06f
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests
2017-11-01 12:38:34 -07:00
Ken Cooke
82d9827571
Merge branch 'master' into audio-louder-mastergain
2017-11-01 08:10:55 -07:00
Nissim Hadar
03d2ca19b9
Moving consts into mode::Haze namespace.
2017-10-31 13:46:58 -07:00
Zach Fox
90e9251176
It's a start
2017-10-31 11:28:19 -07:00
Ken Cooke
cfba6ae819
Implement master avatar gain in the audio-mixer
2017-10-31 11:18:03 -07:00
Ken Cooke
6ba2a83bbe
Send and receive Avatar MASTER Gain packets, signaled using null nodeID.
...
Packet protocol change is not needed (existing audio-mixer will ignore).
2017-10-29 10:47:56 -07:00
divya
de4fd269ef
Merge pull request #11701 from birarda/bug/local-ds-inconnect
...
only respond to expected ICE peers in DS
2017-10-28 21:23:05 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Stephen Birarda
689828e3fa
add packet version change for ICE ping change
2017-10-27 10:00:49 -07:00
Stephen Birarda
10d05ba6c9
only respond to expected ICE peers in DS
2017-10-26 16:34:49 -07:00
Zach Fox
002141724b
Return to using NetworkingConstants
2017-10-26 14:12:36 -07:00
Stephen Birarda
e450ac5bd3
don't use COW-less SpecialAddress assignment
2017-10-25 15:28:30 -07:00
Zach Fox
14150c09ac
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-25 12:59:36 -07:00
Zach Fox
91333cdf7b
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-25 10:26:50 -07:00
Zach Fox
d7bdbfb37b
Fix unix build errors
2017-10-25 09:53:59 -07:00
ZappoMan
aad91edba2
actually remove all those defines
2017-10-24 14:45:33 -07:00
Zach Fox
b092862b03
Missed another spot
2017-10-24 14:23:06 -07:00
ZappoMan
5901d1a311
clean up VERSION_ENTITIES stuff
2017-10-24 13:48:27 -07:00
Zach Fox
48c8d52c09
Cleanup
2017-10-24 13:30:27 -07:00
ZappoMan
12c32d5834
bump protocol version
2017-10-24 13:08:48 -07:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
ZappoMan
a1885926b5
some cleanup
2017-10-24 11:46:42 -07:00
ZappoMan
1128a98e88
implement callEntityClientMethod
2017-10-24 11:15:57 -07:00
Zach Fox
cda43ec1ea
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-23 11:52:59 -07:00
ZappoMan
fb7f6df694
CR feedback
2017-10-22 11:40:41 -07:00
ZappoMan
934c9479af
implement support for Entities.callEntityServerMethod()
2017-10-21 20:27:35 -07:00
Zach Fox
0dc6211a7d
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-19 14:43:33 -07:00
Daniela
832e30ad1c
Edited Packet headers.
2017-10-19 19:53:47 +01:00
Zach Fox
9537e19ad4
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-19 10:58:55 -07:00
Zach Fox
3f0b08aea8
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-18 10:37:47 -07:00
Zach Fox
552defb418
Change protocol version
2017-10-16 11:23:34 -07:00
Nissim
0a5302ce25
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-10-16 11:01:13 -07:00
Ryan Huffman
4a9aa30630
Merge pull request #10956 from birarda/feat/update-default-avatar
...
update default avatar to be better with oculus grab triggers
2017-10-13 15:57:37 -07:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
Daniela
a46ef56af9
Merge with hifi:master. Packet Headers version were increased.
2017-10-10 17:26:33 +01:00
Gerard Maguire
afb03b3d2d
Avatar pitch and roll cleared
2017-10-10 16:19:31 +01:00
Stephen Birarda
72b23a0fbb
update default avatar to be better with oculus grab triggers
2017-10-09 10:33:34 -07:00
Seth Alves
4d2f16efc3
allow project to be built with clang on Linux
2017-10-08 18:01:41 -07:00
Gerard Maguire
93caa7e259
Merge branch 'master' of https://github.com/highfidelity/hifi into 21466
2017-10-06 17:52:42 +01:00
Nissim Hadar
86c497a12f
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-10-03 10:34:33 -07:00
Daniela
2b18296cfd
Merge remote-tracking branch 'upstream/master'
...
# the commit.
2017-10-03 15:26:22 +01:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Ryan Huffman
014a7bc9b0
Fix bytes downloaded stat tracking
2017-09-27 09:33:10 -07:00
Daniela
c22d2add17
Resolve conflict with hifi/master.
2017-09-27 17:06:12 +01:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Nissim Hadar
c4419fede8
Bumped up the version number.
2017-09-22 19:07:05 -07:00
Howard Stearns
7724fc204b
working checkpoint
2017-09-22 14:19:54 -07:00
Daniela
d054c6dc36
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 18:29:45 +01:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Ryan Huffman
5950006111
Remove extraneous logging
2017-09-19 11:18:25 -07:00
Atlante45
7d9daea0f6
Transmit baking errors to interface for display.
2017-09-13 09:54:54 -07:00
Artur Gomes
b65520e788
Merge remote-tracking branch 'upstream/master'
2017-09-13 12:32:17 +01:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Clément Brisset
7d4f17506e
Merge branch 'feat/auto-bake' into feat/bake-meta-errors
2017-09-01 17:33:25 -07:00
Seth Alves
0855dfc1c6
PR-11290 didn't actually bump protocol version
2017-09-01 17:26:32 -07:00
Stephen Birarda
55d44a8c8f
Merge pull request #11285 from Atlante45/feat/baking-enabled
...
Wire "Use baked" checkbox
2017-09-01 16:25:49 -07:00
Ryan Huffman
c67fcc1384
Add RedirectFail to ResourceRequest::getResultString()
2017-09-01 10:41:31 -07:00
Ryan Huffman
bf53161a0b
Fix comparison between signed and unsigned int in MappingRequest
2017-08-31 15:55:27 -07:00
Ryan Huffman
25f64e1aa9
Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors
2017-08-31 15:17:40 -07:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Ryan Huffman
d2c7235fed
Fix update to count width in GetAllMappings
2017-08-31 14:41:29 -07:00
Atlante45
a9cfc01df3
Set Baking Enabled API
2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c
Move constant to central location
2017-08-31 13:08:18 -07:00
Stephen Birarda
b1bc899121
Merge pull request #11270 from birarda/feat/auto-bake
...
refuse to perform mapping operations in /.baked/
2017-08-31 13:06:28 -07:00
Stephen Birarda
da8ae23756
move default to the bottom of bakingStatusToString
2017-08-31 11:52:42 -07:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
Stephen Birarda
ed21ad11d2
add baking to default build, add default to baking status
2017-08-30 15:14:53 -07:00
