21 commits

Author	SHA1	Message	Date
Daniel	f38f910638	Upstream update	2015-03-29 18:41:02 +03:00
Loudrob	64845859ff	Began work on emblem items, we don't really need these urgently.	2015-03-29 09:06:13 -04:00
Loudrob	4855f1c3b9	Rental items 95% done.	2015-03-23 16:28:42 -04:00
Loudrob	0f24fb0ffd	RENTALS: Began work on rentals.	2015-03-23 08:56:48 -04:00
loblao	e06dde7709	DNA: Finish C++ reader implementation	2015-03-15 13:26:22 -03:00
Loudrob	b3fd5e37ae	95% Done implementing C++ DNA Reader	2015-03-14 19:23:50 -04:00
Zach	9ea697b1cb	trees and boxes	2015-03-13 18:52:45 -05:00
Zach	bf46f64382	daniel and loud, look at the current error	2015-03-13 16:18:59 -05:00
Zach	a5fcaa8426	gardening stuff	2015-03-12 22:06:36 -05:00
Zach	662acabe1f	Merge branch 'master' of gitlab.com:toontownunited/src	2015-03-12 21:41:31 -05:00
Zach	556db6b6b6	gardens generate correctly :)	2015-03-12 21:12:43 -05:00
Loudrob	8864582ced	Revert "fuck you daniel, and fixed snapshot length and added some rental item shit that i cant test because of daniel" ... This reverts commit 8fcd496874.	2015-03-12 19:10:42 -04:00
Loudrob	8fcd496874	fuck you daniel, and fixed snapshot length and added some rental item shit that i cant test because of daniel	2015-03-12 08:12:48 -04:00
Zach	f772456727	gardening stuff	2015-03-09 17:02:16 -05:00
Daniel	876868179c	Some phase_3 cleanup	2015-03-09 22:47:59 +02:00
Daniel	7fe35ebb38	Oops, forgot this one	2015-03-09 19:34:39 +02:00
Daniel	1256f21e0b	Implement TTR's catalog	2015-03-09 19:33:29 +02:00
Zach	94c1b92776	gardening stuff	2015-03-07 18:31:55 -06:00
Loudrob	5d445f8a15	Added Garden Drop game.	2015-03-06 16:24:29 -05:00
Loudrob	5727c4355b	Added Zach's getPos, CatalogGUI and furniture fixes.	2015-03-04 05:45:35 -05:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00