John Conklin II
83d2edc1d5
Merge pull request #13043 from dback2/RC67
...
RC67: Desktop equip - ignore right clicks
2018-04-30 10:16:09 -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
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
Seth Alves
a245bb2174
fix libquazip debug filename. link libatomic where needed
2018-04-28 13:30:28 -07:00
David Rowe
2cc3ed6287
List which contexts each namespace and object is available in
2018-04-28 20:00:28 +12: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
Brad Davis
8e42bb8c87
Restore the stop functionality for a browser view when it's being destroyed
2018-04-27 17:35:38 -07:00
NissimHadar
cf9b089a3c
Added option to set snapshot location (for this execution only) from the command line.
2018-04-27 17:18:16 -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
David Back
61afd12eeb
change to not left button
2018-04-27 16:06:27 -07:00
David Back
0962e1fc16
ignore right clicks
2018-04-27 16:06:14 -07: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
0b8c7daabf
Merge pull request #13036 from dback2/RC66.2
...
RC66.2: Desktop equip - ignore right clicks
2018-04-27 15:56:19 -07:00
Brad Davis
575520fe30
Ensure we actually delete the QML scenegraph!
2018-04-27 15:08:10 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
NissimHadar
3ebfe9efff
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-04-27 14:57:10 -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
NissimHadar
a5297f8447
Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester
2018-04-27 14:55:12 -07:00
John Conklin II
9bf5549000
Merge pull request #13035 from zfox23/RC67_updateCommerceFor67
...
RC67: Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 14:46:24 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable
...
Merge stable to RC66.2
2018-04-27 14:42:28 -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
Brad Davis
5f8149fd68
Remove debugging pragma
2018-04-27 13:57:22 -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
f731a2d08e
change to not left button
2018-04-27 13:33:00 -07:00
David Back
8d49d1c118
change to not left button
2018-04-27 13:32:05 -07:00
Brad Hefta-Gaub
71ef12a83c
Merge pull request #13009 from birarda/bug/skybox-in-serverless-66
...
66.2: update serverless content with uncompressed KTX skyboxes
2018-04-27 13:19:43 -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
Zach Fox
684d2b08ba
Finalize work on MS14295 and MS14559
2018-04-27 12:03:54 -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
db5e5ba99b
ignore right clicks
2018-04-27 11:50:53 -07:00
Dante Ruiz
290c31d916
don't spam resetSensors
2018-04-27 11:33:45 -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
Stephen Birarda
ceabe9aed7
Merge pull request #13024 from birarda/bug/home-to-serverless
...
66.2: make home go to DEFAULT_HIFI_ADDRESS by default
2018-04-27 10:59:28 -07:00
Bradley Austin Davis
acb21cc96a
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-27 10:50:47 -07:00
Zach Fox
c163ae63b8
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:28:59 -07:00
