Seth Alves
23cb7d8bee
Merge pull request #11030 from MiladNazeri/editJs-edit
...
Fix Parent Joint in edit js WL # 21471 :
2017-07-24 14:11:48 -07:00
Andrew Meadows
a44b33ab11
Merge pull request #11023 from jherico/audio_deadlock
...
Fix for audio deadlock & audio device selection
2017-07-24 14:03:29 -07:00
Chris Collins
c90442137c
Merge pull request #11032 from Atlante45/stable
...
Stable => Master
2017-07-24 11:42:59 -07:00
Atlante45
d21ca3f1fc
Merge branch 'stable' of https://github.com/highfidelity/hifi into stable
2017-07-24 11:41:02 -07:00
Brad Hefta-Gaub
0ba8d43522
Merge pull request #10994 from vladest/avatar_default_speeds
...
Change default mouse speeds for avatar
2017-07-24 10:13:27 -07:00
Stephen Birarda
26be7e1a01
Merge pull request #10999 from birarda/bug/html-path-on-mac-build
...
fix create tab load on OS X
2017-07-24 10:12:40 -07:00
Chris Collins
ceb218f4cc
Merge pull request #10798 from humbletim/add-persistent-console-history
...
Save JS "Console..." history across sessions
2017-07-24 09:24:04 -07:00
milad
1ce1204a64
WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS
...
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));
The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));
createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
2017-07-24 10:06:44 -05:00
humbletim
300b926464
only call QList::constFirst when history list isn't empty
2017-07-23 14:12:52 -04:00
Andrew Meadows
bec7f7c644
Merge pull request #11010 from druiz17/bug-tablet-third-person
...
You can now properly grab and move the tablet in third person
2017-07-21 13:33:55 -07:00
vladest
615a3c52e4
Ooops..
2017-07-21 21:26:33 +02:00
Brad Davis
5b5e94700e
Additional audio fixes
2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31
Temporary patch for deadlock
2017-07-21 09:52:36 -07:00
vladest
33a8ab2d58
Adjusted according discussion in PR
2017-07-21 18:18:23 +02:00
vladest
b13cbd5bde
Merge branch 'master' into avatar_default_speeds
2017-07-21 17:45:11 +02:00
Clément Brisset
1cb030992f
Merge pull request #10945 from rickdaniels/jh21402
...
Address #21402 Added a handler to Sit.js script for the onLoadComplet…
2017-07-20 18:02:47 -07:00
Stephen Birarda
7cfdf7d5ae
Merge pull request #11000 from highfidelity/bug/6219
...
made changes to size of content to display 'choose file' button
2017-07-20 17:46:15 -07:00
rick@ghostpunch.com
52c8d77d8e
Merge branch 'master' of git://github.com/highfidelity/hifi into jh21402
2017-07-20 17:03:46 -04:00
rick@ghostpunch.com
451b7ec1de
Revert the role name filter change as it has already been added to the repo
2017-07-20 17:01:02 -04:00
Clément Brisset
c128a3ff86
Merge pull request #11001 from Atlante45/fix/debug-builds
...
Fix debug builds startup crash
2017-07-20 13:31:55 -07:00
Clément Brisset
d2e64a52e1
Merge pull request #11013 from Atlante45/update-sit
...
Update sit script in the repo
2017-07-20 13:28:29 -07:00
rick@ghostpunch.com
2b9da2bcba
Fix another typo. Sigh...
2017-07-20 15:44:59 -04:00
rick@ghostpunch.com
cc0ed9ead4
Corrected typo in role name search filter. Removed commented out debug print
2017-07-20 15:26:12 -04:00
Atlante45
c0da0cb439
Update sit script in the repo
2017-07-20 11:56:41 -07:00
Brad Hefta-Gaub
cdb7652423
Merge pull request #11007 from MiladNazeri/patch-2
...
Update CONTRIBUTING.md
2017-07-20 11:55:26 -07:00
Seth Alves
38a955b886
Merge pull request #11011 from trentpolack/21434-obj-vertexcolors
...
WL21434 - Add vertex color support for OBJ files.
2017-07-20 10:37:37 -07:00
trent
559e2e0ebb
Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex.
2017-07-20 13:09:17 -04:00
Chris Collins
13262afec7
Merge pull request #10972 from highfidelity/RC-48
...
Beta Release 48 - Includes up to Developer Release 6863
2017-07-20 08:57:47 -07:00
trent
ff3e9263ef
Stupid tabs.
2017-07-20 11:40:42 -04:00
trent
786535a001
Merge branch 'master' of https://github.com/highfidelity/hifi into 21434-obj-vertexcolors
2017-07-20 11:38:54 -04:00
trent
d71b0802a7
Added vertex color support to OBJReader.h|cpp.
2017-07-20 11:38:42 -04:00
Dante Ruiz
3805228b70
fixed grab the tablet in third person
2017-07-20 16:26:51 +01:00
MiladNazeri
13274fb9a3
Update CONTRIBUTING.md
...
Same issue as the readme.md change.
2017-07-20 10:20:56 -04:00
Ken Cooke
87d9dfd243
Merge pull request #11002 from ctrlaltdavid/21461
...
Fix noise reduction checkbox not always working
2017-07-19 19:22:28 -07:00
David Rowe
091b666d7e
Fix noise reduction checkbox not always working
2017-07-20 12:06:19 +12:00
Stephen Birarda
3936ee93f0
use default scripts path in EditTabView to fix load on OS X
2017-07-19 16:34:04 -07:00
Atlante45
70a5916ef3
Fix debug builds startup crash
2017-07-19 16:18:01 -07:00
utkarshgautamnyu
ce5ff23e70
made changes to size of content to dosplay 'choose file' button
2017-07-19 16:15:34 -07:00
Clément Brisset
d76039387a
Merge pull request #10992 from Atlante45/fix/heap-use-after-free
...
Fix potential data corruption in the FileCache
2017-07-19 10:44:02 -07:00
Andrew Meadows
d48f45f7e6
Merge pull request #10990 from druiz17/bug-help-issue
...
fixed another instance of the tablet getting stuck on the help screen
2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013
Merge pull request #10970 from Atlante45/feat/ac-shutdown-info
...
AC shutdown info + PPID watcher on Unix
2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb
made requested changes
2017-07-19 16:28:16 +01:00
Brad Hefta-Gaub
044b8fc19a
Merge pull request #10993 from druiz17/bug-rogue-laser
...
Do not show lasers when editing in 2D mode.
2017-07-18 16:53:11 -07:00
Brad Davis
009df176c5
Ensure we continue calling idle when minimized
...
Conflicts:
interface/src/Application.cpp
2017-07-18 16:14:17 -07:00
Brad Davis
43476afff5
Merge pull request #10995 from AndrewMeadows/fix-debug-build
...
fix broken debug build
2017-07-18 16:00:18 -07:00
Brad Davis
90048cdb4b
Merge pull request #10991 from jherico/minimized_deadlock
...
Ensure we continue calling idle when minimized
2017-07-18 15:59:28 -07:00
Andrew Meadows
8dafc30bf9
fix debug build: stub pure virtual function
2017-07-18 15:57:00 -07:00
Dante Ruiz
b3ec306063
better version
2017-07-18 23:48:21 +01:00
Clément Brisset
18be917358
Merge pull request #10574 from humbletim/21180
...
CR #21180 Camera control app
2017-07-18 15:35:32 -07:00
David Kelly
4d4d9421d3
Merge pull request #10983 from davidkelly/dk/marketplaceIDHack
...
Get marketplaceID into imported entities
2017-07-18 15:25:49 -07:00
