20541 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	aad49e4404	Update camera tool to only show when edit entities is enabled	2015-01-13 08:26:32 -08:00
Ryan Huffman	80351a768e	Enable camera tool	2015-01-13 08:26:11 -08:00
Brad Hefta-Gaub	47aba6c23b	Merge pull request #4096 from Atlante45/move_hydra_grab ... Move scripts to correct directory	2015-01-12 17:50:50 -08:00
Atlante45	2b48d31cbb	Move scripts to correct directory	2015-01-12 17:48:54 -08:00
Brad Hefta-Gaub	535f6e267b	Merge pull request #4069 from ctrlaltdavid/static-glew ... Use static GLEW in render-utils for Windows	2015-01-12 17:30:47 -08:00
Clément Brisset	60aafba0ce	Merge pull request #4077 from huffman/fix-render-hud-windows-linux ... Fix gl projection matrix stack overflow when rendering to HUD	2015-01-12 16:22:09 -08:00
Clément Brisset	206e1e48f6	Merge pull request #4086 from huffman/std-to-qstring ... Std to qstring	2015-01-12 16:19:28 -08:00
Clément Brisset	10331c52a8	Merge pull request #4094 from birarda/master ... repairs to AudioScriptingInterface playSound	2015-01-12 16:18:41 -08:00
Stephen Birarda	661221a189	repairs to AudioScriptingInterface playSound	2015-01-12 16:04:00 -08:00
Stephen Birarda	208af5cbca	Revert "don't play muzak from lobby to avoid error" ... This reverts commit 69f5c769b8.	2015-01-12 15:14:49 -08:00
Andrew Meadows	2274a119be	Merge pull request #4083 from ctrlaltdavid/sdl2-instructions ... Add instructions for building with SDL2	2015-01-12 14:24:45 -08:00
Andrew Meadows	22d500bd54	Merge pull request #4074 from huffman/rescale-properties ... Add rescale button to edit properties window	2015-01-12 14:22:45 -08:00
Andrew Meadows	9f1a612865	Merge pull request #4073 from Atlante45/editModels ... editModels => hydraGrab	2015-01-12 14:21:02 -08:00
Stephen Birarda	037726815b	Merge pull request #4087 from birarda/master ... remove muzak in lobby to avoid error	2015-01-12 10:08:01 -08:00
Stephen Birarda	69f5c769b8	don't play muzak from lobby to avoid error	2015-01-12 10:07:20 -08:00
Ryan Huffman	bf71aa6163	Remove Visage dependency from cmaklists	2015-01-12 09:15:14 -08:00
Brad Hefta-Gaub	3ccb81803d	Merge pull request #4085 from AndrewMeadows/bispinor ... remove functional code from inside assert	2015-01-11 15:30:15 -08:00
Andrew Meadows	89a782c55a	remove functional code from inside assert	2015-01-11 13:31:37 -08:00
Philip Rosedale	343ee4ea67	Merge pull request #4084 from ZappoMan/master ... Fix Philip's entity delete crash	2015-01-11 12:46:46 -08:00
ZappoMan	60f55c7f3f	remove important code from assert so it still runs in release build	2015-01-11 12:07:16 -08:00
David Rowe	968a34f966	Add instructions for building with SDL2	2015-01-11 11:44:16 -08:00
Brad Hefta-Gaub	d1eddad00b	Merge pull request #4082 from AndrewMeadows/bispinor ... remove lock at EntityTreeRenderer::loadEntityScript	2015-01-11 11:11:29 -08:00
Andrew Meadows	5309fb6a43	remove lock at EntityTreeRenderer::loadEntityScript	2015-01-11 10:44:36 -08:00
Brad Hefta-Gaub	c80414dd96	Merge pull request #4081 from AndrewMeadows/inertia ... move static const variables in EntityItem to be simple consts	2015-01-10 20:00:58 -08:00
Andrew Meadows	e711b86519	scale DEFAULT_DIMENSIONS correctly ... also remove a block of commented out cruft	2015-01-10 19:07:58 -08:00
Andrew Meadows	1184f5b668	merge upstream/master into andrew/inertia	2015-01-10 12:45:14 -08:00
Andrew Meadows	25e64d619c	move statics out of EntityItem ... This makes for much more readable core dumps	2015-01-10 11:46:42 -08:00
Philip Rosedale	33bb241f8a	Merge pull request #4080 from AndrewMeadows/bispinor ... fixes for EntityServer crashes	2015-01-10 10:40:41 -08:00
Andrew Meadows	ecd352fd4d	merge upstream/master into andrew/bispinor	2015-01-10 07:47:52 -08:00
Andrew Meadows	99e1fdd46e	fix for EntityServer crash ... adding EntityItem::_element backpointer for easier add/remove logic	2015-01-10 07:44:26 -08:00
chris	8bb69d0a90	Update std::string instances to QString	2015-01-09 16:22:52 -08:00
Andrew Meadows	58b965c9a2	lock Octree higher when extracting things from bag	2015-01-09 16:12:43 -08:00
Ryan Huffman	e00b629133	Fix gl projection matrix stack overflow when rendering to HUD ... The projection matrix stack is considerably smaller than the modelview stack and was overflowing on Windows and Linux machines that were tested.	2015-01-09 16:11:17 -08:00
Brad Hefta-Gaub	f18594cfdb	Merge pull request #4076 from Atlante45/master ... Don't call delete later unless you have to	2015-01-09 15:43:45 -08:00
Atlante45	6d67b8e20c	Don't call delete later unless you have to	2015-01-09 15:32:08 -08:00
Philip Rosedale	225563ba00	Merge pull request #4075 from Atlante45/head_rotation_fix ... Head rotation fix	2015-01-09 15:11:21 -08:00
Atlante45	063e95bd79	Clement doesn't know how to use radians	2015-01-09 14:31:34 -08:00
chris	981f8bb224	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-01-09 11:41:47 -08:00
Atlante45	02b9aaacf8	Bump packet version	2015-01-09 11:16:58 -08:00
Atlante45	f2b7cb005a	Removed leans/Changed Head rotation in avatardata packets	2015-01-09 11:16:49 -08:00
Atlante45	16e1fc8c3a	Added isMyAvatar to AvatarData too	2015-01-09 11:16:05 -08:00
Atlante45	05d2887c94	Move Torso twist to HeadData with Lean	2015-01-09 11:15:01 -08:00
Ryan Huffman	8d8352946b	Add rescale button to edit properties window	2015-01-09 10:01:58 -08:00
Andrew Meadows	4946ec18b6	remove some TODO comments	2015-01-09 09:28:01 -08:00
Philip Rosedale	336378679f	Merge pull request #4068 from ctrlaltdavid/type-definitions ... Fix miscellaneous types and casts	2015-01-09 08:40:08 -08:00
Philip Rosedale	285e588266	Merge pull request #4072 from Atlante45/network_replies_cleanup ... Windows crash fix	2015-01-09 07:42:36 -08:00
Atlante45	441a1e4fee	Turns out windows doesn't like constexpr	2015-01-08 18:35:23 -08:00
Atlante45	5ab0df3288	removed editModels	2015-01-08 18:31:10 -08:00
Atlante45	22e7c6d507	Merge branch 'master' of https://github.com/highfidelity/hifi into editModels ... Conflicts: examples/editModels.js	2015-01-08 18:30:38 -08:00
Atlante45	891d8d5abf	Removed unecessary foreach	2015-01-08 18:22:25 -08:00