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 |
|
Seth Alves
|
be48268be8
|
getMeshes handles registration point
|
2017-07-19 15:02:40 -07:00 |
|
Seth Alves
|
8a732e7d4b
|
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
|
2017-07-19 13:58:07 -07:00 |
|
Seth Alves
|
750b7192af
|
trying to get the resulting model to line up with the originals
|
2017-07-19 13:58:03 -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 |
|
Seth Alves
|
a8698c2fbc
|
EntityScriptingInterface::getMeshes support for Model entities
|
2017-07-19 08:59:09 -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 |
|
Mike Moody
|
c56450b986
|
Moved function to a differnt location that handles both mouse and controller inputs.
|
2017-07-19 01:49:39 -07: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 |
|
vladest
|
4b94d24c29
|
Change default mouse speeds for avatar
|
2017-07-18 23:51:19 +02:00 |
|
Dante Ruiz
|
8cbe63f296
|
removed search laser in edit mode for 2d mode
|
2017-07-18 22:45:54 +01:00 |
|
Brad Davis
|
02363e06de
|
Ensure input and output device containers are protected by mutex
|
2017-07-18 14:01:25 -07:00 |
|
Brad Davis
|
aeabfe84f0
|
Cleanup dead code, fix startup behavior
|
2017-07-18 14:01:18 -07:00 |
|
Brad Davis
|
4ad36ccec9
|
Trying to resolve QML / Audio deadlocks
|
2017-07-18 14:01:11 -07:00 |
|
Atlante45
|
497fd7f714
|
Pin File pointer during eject
|
2017-07-18 13:45:46 -07:00 |
|
Brad Davis
|
1aee8f1f4d
|
Ensure we continue calling idle when minimized
|
2017-07-18 13:44:58 -07:00 |
|
Chris Collins
|
e99683fdcf
|
Merge pull request #10985 from jherico/audio_deadlock
Trying to resolve QML / Audio deadlocks
|
2017-07-18 12:40:03 -07:00 |
|
Dante Ruiz
|
06a69c8bd7
|
fixed another tablet stuck on help screen
|
2017-07-18 20:27:55 +01:00 |
|
Brad Hefta-Gaub
|
0ba9d65732
|
Merge pull request #10989 from druiz17/bug-whitespace-script-url
Fixed not being able to load a script url that has a white space
|
2017-07-18 11:39:10 -07:00 |
|
David Kelly
|
c4d5d16eb3
|
cr feedback
|
2017-07-18 11:12:06 -07:00 |
|
Andrew Meadows
|
6e59e451c4
|
Merge pull request #10986 from Atlante45/fix/avatar-audio-timer
Use timer instead of dedicated thread to tick AC scripted avatar audio
|
2017-07-18 10:25:35 -07:00 |
|
Andrew Meadows
|
888f2f64a5
|
Merge pull request #10981 from druiz17/bug/delete-avatar-entity
Fixed not being able to delete avatar entities when switching domains
|
2017-07-18 10:09:34 -07:00 |
|
Dante Ruiz
|
bcc15dd4ae
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url
|
2017-07-18 17:59:56 +01:00 |
|
Dante Ruiz
|
976fec66f8
|
fixed loading script whitespace
|
2017-07-18 17:59:42 +01:00 |
|
Clément Brisset
|
bcc9cf7c60
|
Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
Fix Avatar/Audio Mixer crash
|
2017-07-18 09:59:30 -07:00 |
|
Brad Davis
|
9f13533560
|
Ensure input and output device containers are protected by mutex
|
2017-07-18 08:58:17 -07:00 |
|
Dante Ruiz
|
7fe47e4e2f
|
Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity
|
2017-07-18 16:51:41 +01:00 |
|
Dante Ruiz
|
d504000604
|
made requested changes
|
2017-07-18 16:51:21 +01:00 |
|
Brad Hefta-Gaub
|
2dfaf7b02a
|
Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
|
2017-07-18 08:51:13 -07:00 |
|
Brad Hefta-Gaub
|
d94365cc44
|
Merge pull request #10979 from zfox23/hoverOverlay_lasers
Create/Destroy Hover Overlays using hand controller lasers
|
2017-07-18 08:44:48 -07:00 |
|
Brad Hefta-Gaub
|
a7e328285e
|
Merge pull request #10969 from druiz17/bug/addmodel-textbox
allow user move the cursor with the mouse for the add model URL textbox
|
2017-07-18 08:41:08 -07:00 |
|
Brad Hefta-Gaub
|
0d504e57a9
|
Merge pull request #10984 from druiz17/bug/tablet-position
trying new tablet spawn position.
|
2017-07-18 08:07:56 -07:00 |
|