Commit graph

67131 commits

Author SHA1 Message Date
Zach Fox
249e2a2bac Tons of stability and clarity improvements 2018-05-01 13:00:04 -07:00
Zach Fox
c115f2bd36 Camera should never be dynamic 2018-04-30 17:12:59 -07:00
Zach Fox
502ce8f04f More bugfixes 2018-04-30 16:12:04 -07:00
Zach Fox
47627fd1de Fix edge case 2018-04-30 15:02:20 -07:00
Zach Fox
1f16c5f987 Bugfixes for HMD use 2018-04-30 14:05:44 -07:00
Zach Fox
7957c12bb9 Degree symbol 2018-04-30 13:56:52 -07:00
Zach Fox
eab2feb543 Lots of little improvements and stability fixes 2018-04-30 13:54:10 -07:00
Zach Fox
aafcf056c4 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-04-30 12:36:00 -07:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson
Enable sideloading .app.json Apps from local disk
2018-04-30 11:14:24 -07:00
MiladNazeri
a2e2b2cb8c
Merge pull request #13047 from ctrlaltdavid/21856-b
Fix JSDoc for Entities.findEntitiesByName
2018-04-30 11:00:35 -07:00
Anthony Thibault
f520abc6f9
Merge pull request #13048 from ctrlaltdavid/21856-c
Fix and reorder custom JSDoc tags
2018-04-30 10:22:37 -07:00
John Conklin II
47f68364d2
Merge pull request #13012 from misslivirose/fix/particle-prop-caps
Limits for alpha sliders in particle explorer
2018-04-30 10:13:05 -07:00
John Conklin II
ed39b4f63e
Merge pull request #13014 from druiz17/fix-localhost-port
hide default port from addresses, fix localhost scheme
2018-04-30 10:10:06 -07:00
John Conklin II
b6afaccdf3
Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix
New model dialog fix
2018-04-30 10:08:54 -07:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1
Backtrace Attributes
2018-04-30 10:07:11 -07:00
Anthony Thibault
94b9db5013
Merge pull request #13053 from kitely/add-missing-break
Added a missing 'break' in AnimExpression::evalUnaryMinus()
2018-04-30 09:57:11 -07:00
Oren Hurvitz
69b97b423f Added a missing 'break' in AnimExpression::evalUnaryMinus() 2018-04-30 15:42:45 +03:00
David Rowe
fada958e72 Handle possibly undefined value 2018-04-28 19:57:45 +12:00
David Rowe
fc4837b51c Reorder listing of context tags 2018-04-28 16:00:49 +12:00
David Rowe
e39aecfb2a Fix custom JSDoc tags 2018-04-28 16:00:22 +12:00
David Rowe
8d71d72258 Fix JSDoc for Entities.findEntitiesByName 2018-04-28 13:16:26 +12:00
Zach Fox
1b29946a48 I feel so close; why isn't this variable capturing? 2018-04-27 17:26:05 -07:00
Ken Cooke
1e25d48941
Merge pull request #13044 from roxanneskelly/roxie-arm64-fixes
Two fixes for arm64 on linux
2018-04-27 17:15:03 -07:00
Roxanne Skelly
ac8b3e4f5e Two fixes for arm64 on linux
1) size_t is not defined by default in gcc, so stddef.h needed to be added
to AudioDynamics.h to handle some size_t usage.
2) gcc defaults char to unsigned, where windows defaults to signed.  OctalCode.cpp
was assuming signed
2018-04-27 23:21:54 +00:00
John Conklin II
37f4a2d3a8
Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background
Debug Draw rendering now is visible on background skybox
2018-04-27 15:56:44 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
Quiet logging
2018-04-27 14:59:38 -07:00
John Conklin II
1f4a9b6bcc
Merge pull request #12950 from SimonWalton-HiFi/batch-compile-shaders2
Batch compile more shaders
2018-04-27 14:55:57 -07:00
Zach Fox
e0352bbb29 Put SpecCam v2.0 in the source tree 2018-04-27 14:53:06 -07:00
David Back
729f3366ff
Merge pull request #13033 from dback2/desktopEquip
Desktop equip - ignore right clicks
2018-04-27 14:36:26 -07:00
RebeccaStankus
269a7f0e15 Changed maximum line count for warning message 2018-04-27 14:34:08 -07:00
Zach Fox
dbd7d7e2b4 Small cleanup 2018-04-27 14:19:58 -07:00
Zach Fox
ea716f2a1e Enable sideloading .app.json Apps from local disk 2018-04-27 14:08:53 -07:00
Zach Fox
c0fe504713
Merge pull request #13030 from zfox23/finalize_14295_14559
Finalize work on MS14295 and MS14559
2018-04-27 13:49:02 -07:00
David Back
8d49d1c118 change to not left button 2018-04-27 13:32:05 -07:00
John Conklin II
ddedfce8a3
Merge pull request #12932 from ZappoMan/fixBug349
fix bug 349
2018-04-27 12:48:17 -07:00
John Conklin II
73b175a1f2
Merge pull request #12934 from misslivirose/fix/import-whitespace
trim before importing from clipboard
2018-04-27 12:44:35 -07:00
RebeccaStankus
678ba087fc Merge branch 'master' of https://github.com/highfidelity/hifi into newModelDialog-Fix 2018-04-27 11:59:48 -07:00
Howard Stearns
f8ad36afd0
Merge pull request #13028 from zfox23/updateCommerceFor67
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 11:55:40 -07:00
David Back
78436ebcbf ignore right clicks 2018-04-27 11:30:45 -07:00
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -07:00
Zach Fox
0f36fb113d Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:20:55 -07:00
RebeccaStankus
9e641e6efa Merge branch 'master' of https://github.com/highfidelity/hifi into newModelDialog-Fix 2018-04-27 09:04:48 -07:00
Brad Hefta-Gaub
e4f5eb9cca
Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes
MS14295: Fix lingering Gifts UI Bugs
2018-04-27 07:30:14 -07:00
Brad Hefta-Gaub
ac513cdd29
Merge pull request #13019 from zfox23/MS14559_fixNearbyClick1
MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC
2018-04-27 07:29:57 -07:00
Seth Alves
6fb36c495c
Merge pull request #13021 from birarda/bug/serverless-needs-path
update RC67 serverless content to include default path
2018-04-26 17:53:21 -07:00
Anthony Thibault
2455fb678b
Merge pull request #13017 from hyperlogic/feature/jsdoc-custom-hifi-tags
Added custom jsdoc tags to hifi jsdoc plugin
2018-04-26 16:56:33 -07:00
RebeccaStankus
ad422b1012 Merge branch 'master' of https://github.com/highfidelity/hifi into newModelDialog-Fix 2018-04-26 16:34:14 -07:00
RebeccaStankus
4c9514f257 remove landscaping app 2018-04-26 16:34:08 -07:00
Stephen Birarda
e9ac581309 update RC67 serverless content to include default path 2018-04-26 16:31:31 -07:00