Alexander Ivash
|
5897c9948d
|
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-06 03:52:22 +03:00 |
|
Alexander Ivash
|
b954ac6759
|
FB15569 - Debug default scripts no longer on developer menu
|
2018-06-06 03:43:27 +03:00 |
|
amantley
|
0c879d85b5
|
added print statements and removed summed coeff from avatarData.cpp
|
2018-06-05 17:33:32 -07:00 |
|
howard-stearns
|
335aeaeb38
|
purchases cleanup, wearables, and edition numbers when multiples seen.
|
2018-06-05 17:06:08 -07:00 |
|
howard-stearns
|
6aa551b35c
|
Don't getNextPage when at beginning (even if that is also the end).
|
2018-06-05 17:04:29 -07:00 |
|
amantley
|
f21431ca88
|
added check for the actual face tracker in MyHead.cpp to prevent crash
|
2018-06-05 16:33:28 -07:00 |
|
Anthony J. Thibault
|
b5a3b25adc
|
Tuned hip smoothing times.
|
2018-06-05 16:07:54 -07:00 |
|
Anthony J. Thibault
|
993d035d37
|
Smooth out fly to idle transition, to prevent hip thrusting and pops.
|
2018-06-05 15:45:19 -07:00 |
|
Dante Ruiz
|
b275bbe5a7
|
saving changes
|
2018-06-05 15:44:17 -07:00 |
|
howard-stearns
|
ce41b83bad
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 15:30:04 -07:00 |
|
Sam Gateau
|
bc0956e67b
|
Merge pull request #13299 from AndrewMeadows/workload
workload: merge master into workload and bump packet version
|
2018-06-05 15:20:18 -07:00 |
|
John Conklin II
|
07927767c9
|
Merge pull request #13302 from zfox23/MS15500_missingUserNamePAL
Fix MS15500: Ensure Connection usernames show up in PAL
|
2018-06-05 15:04:46 -07:00 |
|
Cristian Luis Duarte
|
b38eae3731
|
Only add RenderShadowTask if isDeferred
|
2018-06-05 18:54:48 -03:00 |
|
SamGondelman
|
aec7206901
|
get rid of overlay pipelines and just use forward rendering
|
2018-06-05 14:44:44 -07:00 |
|
Anthony J. Thibault
|
94c39bc4af
|
Better fix for looking down at your own body.
|
2018-06-05 14:43:33 -07:00 |
|
Bradley Austin Davis
|
e7e9ca4b2b
|
Disable chromium distance field text rendering on ATI GPUs
|
2018-06-05 14:16:03 -07:00 |
|
howard-stearns
|
3d75a793cc
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 13:35:54 -07:00 |
|
amantley
|
95bf5ce464
|
Merge remote-tracking branch 'origin/scriptedBlendshapes' into scriptedBlendshapes
syncing with remote repo
|
2018-06-05 13:34:34 -07:00 |
|
amantley
|
5132466ca0
|
kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
|
2018-06-05 13:32:45 -07:00 |
|
John Conklin II
|
dbd8e0f041
|
Merge pull request #13296 from huffman/fix/serverless-tutorial-v2-rc68
Update serverless content to v2
|
2018-06-05 13:18:30 -07:00 |
|
Alexander Ivash
|
6a09501261
|
Revert changes done to 'qmlscratchbox'
|
2018-06-05 22:59:20 +03:00 |
|
David Back
|
c1dceda4ac
|
enable gamepad by default
|
2018-06-05 12:01:06 -07:00 |
|
sabrina-shanman
|
9ac1443b83
|
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
|
2018-06-05 11:17:17 -07:00 |
|
Zach Fox
|
2932ce177d
|
Fix MS15500: Ensure Connection usernames show up in PAL
|
2018-06-05 10:57:25 -07:00 |
|
Zach Fox
|
4ebfca0c57
|
Really fix it
|
2018-06-05 10:04:37 -07:00 |
|
Zach Fox
|
82c438a174
|
CR
|
2018-06-05 10:04:26 -07:00 |
|
Zach Fox
|
b9604fdb9d
|
Fix MS14796: Fix position of tablet close button highlight
|
2018-06-05 10:04:13 -07:00 |
|
Wayne Chen
|
c18c2358d6
|
adding fix for tablet screen y offset
|
2018-06-05 10:03:59 -07:00 |
|
Ryan Huffman
|
f87775c269
|
Update serverless content to v2
|
2018-06-05 10:03:39 -07:00 |
|
SamGondelman
|
968758a022
|
CR
|
2018-06-05 09:35:17 -07:00 |
|
Ken Cooke
|
aa19794a94
|
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
|
2018-06-05 09:17:34 -07:00 |
|
Ken Cooke
|
83dda420ba
|
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
|
2018-06-05 09:16:28 -07:00 |
|
Anthony J. Thibault
|
558711f906
|
Smooth hips transition between idle and fly.
Also, take dt into account for the critically damped spring lerp calculation.
|
2018-06-04 16:57:41 -07:00 |
|
howard-stearns
|
f72f8c762b
|
goto client-side filtering (preliminary)
|
2018-06-04 16:52:20 -07:00 |
|
Andrew Meadows
|
d220d437cc
|
remove payloadGetLayer() from GameWorkloadRenderer
|
2018-06-04 16:39:29 -07:00 |
|
amantley
|
61592cdada
|
completed first try at all changes for scripted blendshapes
|
2018-06-04 16:37:47 -07:00 |
|
Zach Fox
|
c5ef5cfccb
|
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
|
2018-06-04 16:13:18 -07:00 |
|
Andrew Meadows
|
4329ea5240
|
Merge master' into 'workload'
|
2018-06-04 16:11:25 -07:00 |
|
Dante Ruiz
|
f5e2a6834b
|
fixing some issues
|
2018-06-04 16:09:31 -07:00 |
|
David Back
|
7b2a9770ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fileChooser
|
2018-06-04 16:00:13 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
David Back
|
6b7d9586d1
|
apply fixes to other file dialogs and fix tablet dialog buttons
|
2018-06-04 15:56:10 -07:00 |
|
howard-stearns
|
25ee948662
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 15:30:10 -07:00 |
|
Andrew Meadows
|
8eedf83f70
|
increment packet version for workload logic
|
2018-06-04 15:23:31 -07:00 |
|
Dante Ruiz
|
48c0b7379a
|
fix vive configuration page
|
2018-06-04 15:16:11 -07:00 |
|
Sam Gondelman
|
38e7b31c32
|
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
Try reducing concurrent downloads
|
2018-06-04 14:48:46 -07:00 |
|
Zach Fox
|
60aff7a224
|
Whoops
|
2018-06-04 14:41:18 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
Zach Fox
|
7407507f0b
|
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-04 14:13:25 -07:00 |
|
David Rowe
|
b4b63187ae
|
Fix typo
|
2018-06-05 08:48:10 +12:00 |
|