Commit graph

66824 commits

Author SHA1 Message Date
Dante Ruiz
66f78ea2c7 update bake tool 2018-04-05 10:39:27 -07:00
NissimHadar
b19fcc340d Start test steps from 1 (not from 0). 2018-04-05 10:01:29 -07:00
John Conklin II
3bc764a020
Merge pull request #12793 from samcake/rc66-normalmaps
RC66: Fixing the shader pipelines used for translucent  with normal maps
2018-04-05 07:49:35 -07:00
John Conklin II
c8a0561e20
Merge pull request #12791 from sethalves/always-use-serverless-tutorial
on first run, send user to serverless tutorial rather than checking for local sandbox
2018-04-05 07:28:43 -07:00
NissimHadar
2fbe6f9393 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 18:39:05 -07:00
samcake
78053b8b48 Refix the normal map case foro translucents 2018-04-04 18:33:27 -07:00
Simon Walton
f10bbce557 Squelch initialization warning 2018-04-04 18:32:40 -07:00
Seth Alves
4b0d338e57 on first run, send user to serverless tutorial rather than checking for a local sandbox 2018-04-04 18:00:11 -07:00
Simon Walton
93bcd1df20 Fix Linux build for std::call_once with lambda
MacOS & Ubuntu don't like the combination of std::call_once and
lambda w/ reference param, for some reason. Change to pointer
param.
2018-04-04 17:55:45 -07:00
Cristian Luis Duarte
1a967e45a6 Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity 2018-04-04 21:54:12 -03:00
NissimHadar
99a4bd65a0 Corrected message to user.
Changed ::ReadWrite to ::WriteOnly when creating MD file.
2018-04-04 17:12:46 -07:00
Simon Walton
a370d287c3 Change AudioRingBuffer.cpp to use std::call_once 2018-04-04 16:42:10 -07:00
Dante Ruiz
31783726a8 fix toolbar disappearing 2018-04-04 16:30:06 -07:00
Simon Walton
104788de50 Take out useless noisy message timer 2018-04-04 16:03:56 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class
Also change to std::call_once for the file-scope message IDs.
2018-04-04 15:44:47 -07:00
Atlante45
895023ca4b Fix unprotected tree traversals 2018-04-04 14:54:21 -07:00
Simon Walton
ce5f6da6ca Restore setup of flush timer that was inadvertently lost 2018-04-04 14:43:26 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade
Update to Transitions debugging / editing script
2018-04-04 14:31:59 -07:00
Cristian Luis Duarte
b61a436a84 Android fly - Use new asset and screen position - missing cpp 2018-04-04 18:23:03 -03:00
Cristian Luis Duarte
ffb8b0a60e Android fly - Use new asset and screen position 2018-04-04 18:19:01 -03:00
Simon Walton
ed3347a89b Repeated logging - reviewer fixes 2018-04-04 14:11:10 -07:00
WolfGang
787127b149 move subImage recalculation to it's own method 2018-04-04 22:10:54 +01:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix
Fix Y arrow translation handle issues
2018-04-04 13:46:31 -07:00
Dante Ruiz
42149e295d editing seletion style 2018-04-04 12:55:28 -07:00
Sam Gateau
4870ce1d76
Merge pull request #12771 from NissimHadar/addMDtoAutoTester
Add .md creation to autoTester
2018-04-04 12:30:11 -07:00
Seth Alves
2545e67b14 set lastEditedBy in local tree whenever a script adds or edits an entity 2018-04-04 12:27:41 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
2018-04-04 11:53:05 -07:00
John Conklin II
c3cad62bff
Merge pull request #12774 from howard-stearns/RC66-commerce-workaround-for-broken-qt5.10
Rc66 commerce workaround for broken qt5.10
2018-04-04 11:39:44 -07:00
NissimHadar
235996911a Fixed gcc warning. 2018-04-04 11:38:14 -07:00
Dante Ruiz
475a3a29ac remvoe debug statement 2018-04-04 11:14:53 -07:00
Dante Ruiz
09ced24710 hide desktop windows when switching into HMD mode 2018-04-04 11:05:25 -07:00
NissimHadar
bb0d4a66b6 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 11:03:56 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one
Remove notifications and print outs when degrading LOD
2018-04-04 10:35:05 -07:00
NissimHadar
7a6b071e46 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 10:20:35 -07:00
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1
Fix 'Private' HMD preview texture enable/disable...again
2018-04-04 10:03:18 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Zach Fox
752246d950
Merge pull request #12760 from zfox23/inspection_rightClickTweaking
Inspection: Tweak mouse-right-click-to-inspect behavior
2018-04-04 09:32:29 -07:00
Zach Fox
b641f87792
Merge pull request #12778 from zfox23/MS13792
Prevent Context Overlay from flashing when briefly hovering over certified entity
2018-04-04 09:31:33 -07:00
WolfGang
f9bcd23463 make subimage update the image anchors 2018-04-04 17:28:55 +01:00
Seth Alves
a980361afc
Merge pull request #12706 from druiz17/baking
adding python baking scripts
2018-04-04 09:08:31 -07:00
Seth Alves
2df334c50e
Merge pull request #12663 from ElderOrb/FB12870
Fix for not updating checkbox state on 'baking' / 'unbaking'.
2018-04-04 09:03:03 -07:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816
Remove Entities.currentAvatarEnergy and related from the API
2018-04-04 08:07:46 -07:00
Dante Ruiz
c9c3d8f332 adding entity selection for far grabbing 2018-04-04 08:07:35 -07:00
Olivier Prat
e3908662fe Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-04 09:50:37 +02:00
Andrew Meadows
f0fcfc432c fix typo in comment 2018-04-03 22:16:10 -07:00
Andrew Meadows
d57cb0b5d7 use list.empty() instead of comparing list.size() 2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9 use std::numeric_limtis<uint64_t>::max() instead of -1 2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8 more 'const uint64_t&' purges 2018-04-03 21:55:31 -07:00
Andrew Meadows
bd2bfb6807 DRY: simpler removal of element from middle of std::vector 2018-04-03 18:28:07 -07:00
Andrew Meadows
0a2b4a8d1d add comment about returning smart pointer by ref 2018-04-03 18:26:43 -07:00