60676 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
vladest	83c14bba5c	Fix popups misbehavior, wrong links with double http etc	2017-10-20 11:55:41 +02:00
vladest	92fc6daecc	Merge branch 'master' into webbrowser_updates	2017-10-19 14:56:31 +02:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
Seth Alves	28d0da51b9	Merge pull request #11628 from luiscuenca/case8269 ... 8269 controllerDispatcher is creating log spam with web entities	2017-10-18 18:11:13 -07:00
Sam Gateau	4d7accabdf	Merge pull request #11439 from NissimHadar/hazeZone ... Adding haze component to the zone entity.	2017-10-18 16:14:28 -07:00
Zach Fox	77f967c7e1	Merge pull request #11623 from zfox23/mergeRC57IntoMaster_20171018 ... 2017-10-18: Merge RC57 into Master	2017-10-18 15:52:51 -07:00
luiscuenca	6e8756e8af	Debug mode has been turned off	2017-10-18 15:40:03 -07:00
Bradley Austin Davis	aa6c841357	Merge pull request #11588 from jherico/future/qrc ... Package all UI resources into a QRC built into the application.	2017-10-18 15:29:34 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
John Conklin II	08cfa32858	Merge pull request #11610 from ElderOrb/case8217_RC57 ... 8217 Search in tablet doesn't update (RC-57)	2017-10-18 10:41:33 -07:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
Melissa Brown	8965f2aac3	Merge pull request #11620 from cain-kilgore/21571 ... WL 21571 - Remove "common questions" button	2017-10-18 08:38:20 -07:00
Thijs Wenker	7b2dbc34dc	Merge pull request #11622 from ctrlaltdavid/21572 ... Fix importing entities from URL	2017-10-18 14:25:42 +01:00
David Rowe	fcc7a3e440	Code review	2017-10-18 21:08:10 +13:00
David Rowe	f31e014e8b	Quat.ZERO --> Quat.IDENTITY	2017-10-18 20:34:55 +13:00
David Rowe	5b6d33bcb2	Missing semicolon	2017-10-18 20:29:34 +13:00
David Rowe	f74c33f597	Fix importing entities from URL	2017-10-18 17:44:36 +13:00
Cain Kilgore	16467128a2	WL 21571	2017-10-18 02:42:08 +01:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	52813d1abe	Merge pull request #11607 from jherico/fix/cmake_command_line ... CMake tweaks	2017-10-17 17:39:54 -07:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
Seth Alves	e9d4da5a01	Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard ... Fix web3Doverlays and webEntities keyboard not showup	2017-10-17 17:32:04 -07:00
Bradley Austin Davis	9e46e288b1	Merge pull request #11604 from SamGondelman/endSphere ... Scale LaserPointer end overlay in C++	2017-10-17 16:37:35 -07:00
druiz17	9a881c5e57	fix keyboard	2017-10-17 15:43:23 -07:00
Nissim	5249e97fa0	Merge branch 'master' into hazeZone	2017-10-17 15:09:22 -07:00
Nissim	845f3e4bee	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone	2017-10-17 15:03:57 -07:00
Nissim	935180bf09	Fixed my bloody stupid mistake...	2017-10-17 15:02:05 -07:00
Andrew Meadows	5225ca3ca7	Merge pull request #11448 from jherico/future/clang_format ... Use clang format to enforce coding standards	2017-10-17 13:34:01 -07:00
Nissim	d53aadc617	Merge branch 'master' into hazeZone	2017-10-17 12:13:40 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00
Nissim	5a1c4d5a30	Fixed gcc warning.	2017-10-17 11:08:15 -07:00
John Conklin II	31b8013ed9	Merge pull request #11538 from kencooke/audio-mac-bugfix2 ... Additional cleanup of audio noise gate	2017-10-17 11:02:55 -07:00
Nissim	3e228acdb6	Fixed gcc warning.	2017-10-17 10:41:49 -07:00
Nissim	afa93f46e5	Merge branch 'master' into hazeZone	2017-10-17 09:28:07 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
Brad Hefta-Gaub	f7a1816a99	Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue ... Reduce present traffic on main thread event queue.	2017-10-16 18:02:11 -07:00
Nissim	072ac13120	Fixed gcc warnings.	2017-10-16 17:12:59 -07:00
Brad Hefta-Gaub	b0fc050fe2	Merge pull request #11586 from Zvork/hdrcube ... HDR cube map equirectangular bug fix	2017-10-16 16:49:20 -07:00
Brad Hefta-Gaub	c1ce84b060	Merge pull request #11602 from kencooke/audio-startup-fix ... Fix loud screeching sound when certain users join a domain	2017-10-16 16:47:42 -07:00
John Conklin II	42a018c2c5	Merge pull request #11606 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords (RC-57)	2017-10-16 16:14:43 -07:00
beholder	fa7892e5c6	8217 Search in tablet doesn't update	2017-10-17 02:02:21 +03:00
Seth Alves	648ae731da	Merge pull request #11603 from MiladNazeri/fogBugz/8382 ... Fix for fogbugz:8382 to shutdown debug window on reload scripts	2017-10-16 15:32:28 -07:00
Bradley Austin Davis	1f8bd50d2b	Add clang format specification	2017-10-16 15:19:12 -07:00
Bradley Austin Davis	17a6847609	Fix CMake command line options	2017-10-16 14:58:19 -07:00
Brad Hefta-Gaub	c4e672d6b8	Merge pull request #11582 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords	2017-10-16 14:57:18 -07:00
Nissim	1b42572f99	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone ... # Conflicts: # scripts/system/html/js/entityProperties.js	2017-10-16 14:29:56 -07:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00