29896 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
bwent	8c47bcc141	implement new UI	2015-08-13 16:00:55 -07:00
bwent	c585f24e27	Refining UI, introduce tween functionality for zooming into planets	2015-08-12 20:28:32 -07:00
bwent	e61ba997e5	Fix trail functionality with new classes	2015-08-12 20:28:32 -07:00
bwent	861c9f0ca0	more refactoring	2015-08-12 20:28:32 -07:00
bwent	e27335fc5e	Refactoring to use Planet class, set up framework for UI	2015-08-12 20:28:32 -07:00
Seth Alves	8cbb0c2ac3	Merge pull request #5560 from howard-stearns/no-version-constants ... No symbolic names for non-entity contants.	2015-08-12 16:57:00 -07:00
Howard Stearns	daae750d68	No symbolic names for non-entity contants.	2015-08-12 16:40:00 -07:00
Ryan Huffman	1000033f53	Merge pull request #5559 from SeijiEmery/js-widgets ... Js widgets	2015-08-12 16:39:11 -07:00
Seiji Emery	fdacb894a5	tabs to spaces	2015-08-12 16:28:06 -07:00
Seiji Emery	81588f7db0	renamed Icon to Image	2015-08-12 16:26:47 -07:00
Seth Alves	2dbbc5c184	Merge pull request #5553 from howard-stearns/remove-obsolete-avatar-mixer-data ... Warning: protocol change - Remove obsolete AvatarMixer wire data	2015-08-12 16:01:42 -07:00
Seiji Emery	778100e075	Merge branch 'master' of https://github.com/highfidelity/hifi into js-widgets	2015-08-12 15:57:04 -07:00
Seiji Emery	c175fe9e04	moved example code to widgets-example.js	2015-08-12 15:48:21 -07:00
Seiji Emery	10ca3f7a8f	fixes	2015-08-12 15:39:34 -07:00
Brad Hefta-Gaub	acf9933925	Merge pull request #5557 from jherico/marge ... Fixing crash in vive controllers	2015-08-12 12:45:57 -07:00
Brad Davis	0ff283d09e	Fixing crash in vive controllers	2015-08-12 12:24:53 -07:00
Howard Stearns	2fbcede9b2	Merge pull request #5554 from ZappoMan/aaboxOptimization ... cache calculation of aabox and aacubes	2015-08-12 12:09:33 -07:00
Seiji Emery	293f146cfc	added debug ui, fixed non-targetable ui boxes/labels	2015-08-12 10:44:46 -07:00
Seiji Emery	f45afe050b	Added drag actions	2015-08-12 00:19:11 -07:00
Seiji Emery	986a821c91	cleanup	2015-08-11 22:00:53 -07:00
Seiji Emery	f247f0390c	Cleanup + refactoring	2015-08-11 21:56:00 -07:00
Seiji Emery	8c47c7b989	Added attachment	2015-08-11 20:12:21 -07:00
ZappoMan	0990229c64	cache calculation of aabox and aacubes	2015-08-11 18:05:22 -07:00
Howard Stearns	a5d8125aa7	Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.)	2015-08-11 17:53:49 -07:00
Seiji Emery	bb205294b9	uiwidgets.js	2015-08-11 16:33:30 -07:00
Seth Alves	6ce4820b9f	Merge pull request #5552 from jherico/homer ... Fixing bad success macro for the Oculus SDK on windows	2015-08-11 14:21:10 -07:00
Brad Davis	3595f6a8a0	Fixing bad success macro for the Oculus SDK on windows	2015-08-11 14:06:35 -07:00
samcake	0a8a43f8bd	Merge pull request #5539 from jherico/homer ... Breaking up transfers and draw calls	2015-08-11 12:12:48 -07:00
Brad Davis	f539e95e53	Fixing includes	2015-08-11 12:02:40 -07:00
Bradley Austin Davis	e94cff594d	Working on breaking up transfers and draws	2015-08-11 12:02:39 -07:00
Brad Hefta-Gaub	b726769f15	Merge pull request #5402 from highfidelity/plugins ... New plugins architecture	2015-08-11 11:11:27 -07:00
Seth Alves	cbe38d5fa5	Merge pull request #5533 from ctrlaltdavid/20637 ... CR for 20637 - Add WebWindow setPosition() method	2015-08-11 11:03:14 -07:00
Brad Hefta-Gaub	35d6528d08	Merge pull request #5550 from jherico/marge ... PLUGINS - Cleaning up HMD tools	2015-08-11 10:46:59 -07:00
Howard Stearns	60b74af2a8	Merge pull request #5549 from ctrlaltdavid/fix-hmd-lean ... Fix avatar lean forwards and sideways per HMD movements	2015-08-11 09:31:22 -07:00
Howard Stearns	295d655eec	Merge pull request #5545 from AndrewMeadows/chlorine ... rotation constraints in preparation for inverse kinematics	2015-08-11 09:19:16 -07:00
Andrew Meadows	8e82e48f76	remove more std::max/min favor of glm utilities	2015-08-11 08:17:54 -07:00
Andrew Meadows	23c92662ee	relaxed error, more rigor for using fabsf()	2015-08-10 23:09:11 -07:00
Andrew Meadows	a38c1c82d1	use glm::clamp() instead if std::max() and min()	2015-08-10 23:08:36 -07:00
Andrew Meadows	4655bd21dd	added some comments to clarify algorithm	2015-08-10 23:08:10 -07:00
Bradley Austin Davis	7694c1c0a6	Cleaning up HMD tools	2015-08-10 21:39:36 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -07:00
David Rowe	2c1ba9b6b1	Fix avatar lean forwards and sideways per HMD movements	2015-08-10 21:25:18 -07:00
Brad Hefta-Gaub	34f6699fb7	Merge pull request #5547 from jherico/marge ... PLUGINS - Retina display issues	2015-08-10 15:39:25 -07:00
Andrew Meadows	a1d8a97675	Merge pull request #5546 from sethalves/fix-protocol-version ... missed this in the last commit -- bump protocol version	2015-08-10 15:21:52 -07:00
Bradley Austin Davis	61ecee93b8	Fix mis-positioning of QML elements when moving from retina to non-retina display	2015-08-10 15:18:49 -07:00
Seth Alves	7403929323	missed this in the last commit -- bump protocol version	2015-08-10 15:15:54 -07:00
Andrew Meadows	80b36f9f12	fix typo	2015-08-10 15:11:00 -07:00
Seth Alves	b26d6d2b9c	Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization ... Renderable model entity item optimizations	2015-08-10 15:10:12 -07:00
Seth Alves	74287c3cf5	Merge pull request #5482 from ericrius1/polyLineInProgress ... Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please	2015-08-10 14:57:52 -07:00
Andrew Meadows	75ab6a00aa	add unit tests for RotationConstraints	2015-08-10 14:48:46 -07:00