21352 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	6cfb51283e	Working on the text renderer	2015-02-03 01:49:06 -08:00
Brad Davis	5d9aee16cb	Merging develop branch	2015-02-03 00:28:52 -08:00
Brad Davis	0fab50a388	Updating example text	2015-02-03 00:27:58 -08:00
Brad Davis	2d029314e6	Merge branch 'develop' into text-renderer	2015-02-02 23:30:16 -08:00
Brad Davis	f7b2266f92	Fixing oglplus find	2015-02-02 23:30:07 -08:00
Brad Davis	68448daa18	Moving closer to the original coordinate system	2015-02-02 23:29:46 -08:00
Brad Davis	8d81607e28	Tweaking the example text renderer	2015-02-02 23:27:57 -08:00
Brad Davis	e71b61a256	remove oglplus references	2015-02-02 12:01:21 -08:00
Brad Davis	0726f7cd21	Example images from text rendering test	2015-02-01 19:49:01 -08:00
Brad Davis	8bac67abf9	Merge branch 'develop' into text-renderer	2015-02-01 19:47:05 -08:00
Brad Davis	a096c79747	Working on text rendering test	2015-02-01 19:46:49 -08:00
Brad Davis	96a5a02e18	Merge branch 'develop' into text-renderer	2015-02-01 16:25:34 -08:00
Brad Davis	ab1624b0a8	Adding matrix stack (currently not used	2015-02-01 16:25:17 -08:00
Brad Davis	6835068496	Adding text rendering test tool	2015-02-01 16:24:43 -08:00
Brad Davis	711506e055	Moving implementation details out of header	2015-02-01 14:15:34 -08:00
Brad Davis	0ca928ca3d	Merge branch 'oglplus' into text-renderer	2015-02-01 11:48:28 -08:00
Brad Davis	95a4e1626e	Merge branch 'oglplus' into develop	2015-02-01 11:48:10 -08:00
Brad Davis	acf0b292e9	Adding example images	2015-01-31 21:53:34 -08:00
Brad Davis	60317b3526	Working on signed distance fields text rendering	2015-01-31 21:42:54 -08:00
Brad Davis	71b677ef5c	Removing nsight dependency as it breaks on my machine	2015-01-31 19:43:55 -08:00
Brad Davis	11f0d149f7	Adding cmake support for finding and using oglplus / boostconfig	2015-01-31 19:41:04 -08:00
Brad Hefta-Gaub	2eeb2a5ec5	Merge pull request #4205 from AndrewMeadows/isentropic ... small models get box collision shape	2015-01-30 18:30:55 -08:00
Andrew Meadows	a723c748f5	check initialization of _needsInitialSimulation	2015-01-30 18:08:00 -08:00
Brad Hefta-Gaub	e73a000bb8	Merge pull request #4208 from birarda/master ... update to @problem's new interface icon	2015-01-30 16:53:32 -08:00
Brad Hefta-Gaub	918349b227	Merge pull request #4196 from ctrlaltdavid/20277 ... CR for Job #20277 - Interface user agent string change	2015-01-30 16:52:30 -08:00
Andrew Meadows	7a2def167b	Merge pull request #4206 from sethalves/rework-bandwidth-meter ... Rework bandwidth meter dialog	2015-01-30 16:41:07 -08:00
Andrew Meadows	9da6b623a3	move shape polymorphism to ModelEntityItem	2015-01-30 16:25:35 -08:00
Andrew Meadows	bc52ba1d29	restore polymorphism for Box and Sphere entities	2015-01-30 16:18:50 -08:00
David Rowe	729fbbf5ac	A further custom User-Agent string	2015-01-30 15:56:01 -08:00
Stephen Birarda	f78f6ab4cf	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
Stephen Birarda	2c74502394	move Interface icon back in icon sub-folder	2015-01-30 15:26:29 -08:00
Stephen Birarda	c4a2da15d1	change interface icon to lowercase	2015-01-30 15:26:07 -08:00
Seth Alves	067deefeb6	avoid use of snprintf	2015-01-30 15:23:40 -08:00
Stephen Birarda	ae87dac523	update to new interface icon	2015-01-30 15:22:21 -08:00
Seth Alves	eda7785d3b	minor edit to make diff nicer	2015-01-30 14:41:03 -08:00
Andrew Meadows	80f6f718d0	EntityItem base class now computes shapeInfo	2015-01-30 14:17:29 -08:00
Andrew Meadows	b035c5b082	fix for updating moving models	2015-01-30 14:16:32 -08:00
David Rowe	5474c0634e	Merge branch 'master' into 20277 ... Conflicts: libraries/script-engine/src/ScriptEngine.cpp	2015-01-30 13:49:45 -08:00
Seth Alves	5c9d64c482	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-01-30 13:46:43 -08:00
Seth Alves	620efb2bbe	change display style of bandwidth detail dialog, include a totals line	2015-01-30 13:43:28 -08:00
Brad Hefta-Gaub	53534cea61	Merge pull request #4203 from huffman/remove-auto-on-edit-entities ... Fix editEntities.js automatically turning on	2015-01-30 13:15:57 -08:00
Ryan Huffman	a98829ed8a	Fix editEntities.js automatically turning on	2015-01-30 13:12:00 -08:00
samcake	efbf043f7d	Merge pull request #4202 from Atlante45/master ... Edge case when removing all scripts	2015-01-30 13:01:53 -08:00
Atlante45	fae59ab939	Edge case when removing all scripts	2015-01-30 12:20:00 -08:00
Seth Alves	dd9d054286	Start on refactoring of bandwidth metrics	2015-01-30 11:44:57 -08:00
samcake	1c89e27718	Merge pull request #4201 from Atlante45/master ... Fix not saving stopped scripts	2015-01-30 11:39:40 -08:00
Atlante45	18c77e1cca	Fix not saving stopped scripts	2015-01-30 11:27:45 -08:00
Seth Alves	2999a77f87	merge from master	2015-01-30 11:15:01 -08:00
Seth Alves	f0edba9a6b	Start on refactoring of bandwidth metrics	2015-01-30 11:11:17 -08:00
samcake	e3fa2e1995	Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval ... Removal of glColorXXX()	2015-01-30 10:21:18 -08:00