28896 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	558f10640b	coding standard fix	2015-07-21 08:30:33 -07:00
Thijs Wenker	5d74858500	edit.js - entityList - delete key deletes entities, hold shift to select a group of entities, moved appending single entity to selection to ctrl key	2015-07-21 17:01:54 +02:00
Brad Davis	6d4c7cd4f2	Merge pull request #5374 from ZappoMan/warningFixes ... Warning fixes and removing dead code	2015-07-21 07:23:40 -07:00
Brad Davis	57f9abe5c8	Merge pull request #5377 from samcake/punk ... Removing extra gl calls and removing cruff from Application.cpp	2015-07-21 06:28:27 -07:00
Stephen Birarda	cea8e01a01	add a verify packet operator to verify packets	2015-07-20 17:35:16 -07:00
Stephen Birarda	796dfee687	udt namespace fixes and NLPacket operator fixes	2015-07-20 17:28:04 -07:00
Brad Davis	51973674f5	Merge remote-tracking branch 'upstream/master' into marge	2015-07-20 17:26:36 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
David Rowe	ac4b64c853	Merge branch 'master' into 20602	2015-07-20 17:14:52 -07:00
Sam Gateau	5bf85961d2	removing dead code	2015-07-20 17:13:02 -07:00
Stephen Birarda	9556fecbe2	initial changes to make _nodeSocket a udt::Socket	2015-07-20 17:10:22 -07:00
Sam Gateau	ad1771c738	removing dead code	2015-07-20 17:09:11 -07:00
Brad Davis	94d57a2e43	fixing missing glew init	2015-07-20 16:51:01 -07:00
Sam Gateau	9d9142c274	cleaning commented code supposedly dead now	2015-07-20 16:50:24 -07:00
Sam Gateau	6a0ca6e113	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-20 16:22:12 -07:00
samcake	e63d122f2a	Merge pull request #5375 from birarda/protocol ... repairs to early return for sendNackPackets	2015-07-20 16:21:55 -07:00
Stephen Birarda	9fb8b55359	repairs to early return for sendNackPackets	2015-07-20 16:10:11 -07:00
ZappoMan	65a79cfefb	fix a bunch of warnings	2015-07-20 15:58:25 -07:00
Sam Gateau	b5090883a0	merge with latest network pr	2015-07-20 15:49:10 -07:00
David Rowe	a488a12151	Merge branch 'master' into 20602	2015-07-20 15:37:43 -07:00
Sam Gateau	59666f664a	merging my changes to remove cruff from application to AUstin;s latest	2015-07-20 15:37:17 -07:00
Clément Brisset	ac153699b1	Merge pull request #5372 from birarda/protocol ... fix for reading of type from SVO files	2015-07-20 15:27:58 -07:00
Stephen Birarda	74193b3dac	bump packet versions after fix	2015-07-20 15:20:14 -07:00
Stephen Birarda	0dc62dd858	Merge branch 'protocol' of https://github.com/Atlante45/hifi into protocol	2015-07-20 15:14:40 -07:00
Atlante45	bca8d8181d	fix entity data packet type value	2015-07-20 15:14:16 -07:00
Stephen Birarda	5f592df610	don't seek in Packet before open	2015-07-20 15:14:07 -07:00
ZappoMan	648d0f6d43	fix a bunch of warnings	2015-07-20 15:12:27 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Brad Davis	c0859ffd4c	Removing some dead forward declarations	2015-07-20 14:33:10 -07:00
ZappoMan	d41d86c33c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-20 14:31:58 -07:00
Andrew Meadows	7578a70c4c	Merge pull request #5359 from birarda/protocol ... Network Protocol Refactor	2015-07-20 14:30:58 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Brad Hefta-Gaub	ab67a3c5af	Merge pull request #5370 from jherico/homer ... Remove ambient occlusion and wireframe mode for naked GL violations	2015-07-20 13:49:51 -07:00
Brad Davis	488a449cb1	Merge branch 'master' into homer	2015-07-20 13:34:21 -07:00
Stephen Birarda	462ff97722	remove FlowLayout.cpp that was accidentally kept	2015-07-20 13:06:31 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Sam Gateau	1a9f6e12a5	something not compiling but just before merge with upstream	2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub	c41e20b90f	Merge pull request #5366 from jherico/marge ... Naked GL removal work	2015-07-20 12:12:22 -07:00
Brad Davis	3d09e772f9	Merge branch 'marge' into homer	2015-07-20 12:09:51 -07:00
Brad Davis	23b058e4eb	Removing starfield tilt and reducing grid alpha	2015-07-20 11:40:12 -07:00
Brad Davis	dcaaeec593	Removing AO effect (temporarily) and wireframe mode	2015-07-20 10:55:11 -07:00
Seth Alves	7c5286e804	Merge pull request #5356 from howard-stearns/isPlaying ... Make sure that Audio isPlaying is correct	2015-07-20 10:51:58 -07:00
Atlante45	fc2956342e	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 10:39:16 -07:00
David Rowe	73ffe5d9f6	Fix Avatar > Blue Sphere While Speaking not rendering	2015-07-20 10:25:59 -07:00
Brad Davis	cd677ccb18	Removing animation from star grid	2015-07-20 10:18:14 -07:00
Brad Davis	de92e66635	Removing shadows code	2015-07-20 09:59:22 -07:00
Brad Davis	d4e637c5b8	Removing superfluous lighting and naked GL in mirror	2015-07-20 09:36:05 -07:00
Stephen Birarda	54f618a502	Merge pull request #5361 from huffman/users-setting ... Update users.js to persist isMinimized value	2015-07-20 09:01:31 -07:00
Stephen Birarda	6b11495a20	resolve conflicts on merge with upstream master	2015-07-20 08:51:48 -07:00
Philip Rosedale	45a229494b	fix to correctly add to lifetime (it is always full lifetime since starting)	2015-07-20 08:40:12 -07:00