1457 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John	0a0b8b4019	Cleanup battle globals, buff drop accuracy, organic level 7 drop can take out a level 12, all tracks have the same carry limit	2015-08-31 11:50:53 +03:00
John	88888c3457	Merge branch 'master' into feature/dan	2015-08-31 10:31:12 +03:00
John	758d515886	New git	2015-08-31 10:30:44 +03:00
Loudrob	db303e34c6	Fuck off TTR Deployment.	2015-08-30 18:25:57 -04:00
Loudrob	9f8a7e7519	Revert "Upload batty's change to hide the gameserver IP, update astron." ... This reverts commit 21b5edae04.	2015-08-30 18:20:39 -04:00
Loudrob	01da0e2393	Revert "Ignore DNS (new way of hiding gameserver IP) and Toon Bot folder (LEL)" ... This reverts commit ae2ff366f3.	2015-08-30 18:20:30 -04:00
John	9b443fb3fe	Merge branch 'master' into feature/dan	2015-08-31 01:07:00 +03:00
John	14b389a734	Independence day!	2015-08-31 00:58:55 +03:00
John	4f0c2fd9cd	Merge branch 'master' into feature/dan	2015-08-31 00:04:25 +03:00
John	e2b8582261	Merge branch 'feature/deployment'	2015-08-31 00:03:21 +03:00
John	cc283ad32b	Pushed what I have so far for grand prix	2015-08-31 00:01:13 +03:00
Alexander	62d1aed98a	Update linux astron.	2015-08-30 02:17:12 -04:00
Alexander	ae2ff366f3	Ignore DNS (new way of hiding gameserver IP) and Toon Bot folder (LEL)	2015-08-29 23:09:57 -04:00
Alexander	21b5edae04	Upload batty's change to hide the gameserver IP, update astron.	2015-08-29 22:38:10 -04:00
Billy Bob	e157c01f30	Merge branch 'feature/dan' into 'feature/deployment' ... Feature/dan See merge request !7	2015-08-29 16:25:51 -04:00
John	160315ff39	Add FPS meter and option to Shticker Book	2015-08-29 22:05:53 +03:00
Loudrob	95078d05ea	endDecade	2015-08-29 14:51:44 -04:00
Loudrob	93004f9c20	Black cats shouldn't be on every single 13th + racing tempo back to normal, but music needs to be fixed lel.	2015-08-29 12:14:26 -04:00
John	f6e77208bb	Move shticker book buttons up a bit so stats button can fit + add a frame to the left if we add another button.	2015-08-29 19:05:44 +03:00
John	0936ef9c71	Racing district crash fix	2015-08-29 17:38:03 +03:00
John	7bb4b60bd2	Furniture button is now hidden when on the phone	2015-08-29 16:23:40 +03:00
John	e2c4f64f22	Decrease suit and toon max run time in battles	2015-08-29 16:14:26 +03:00
John	5d56463f51	Fix CFO jump	2015-08-29 16:08:11 +03:00
Loudrob	0607c19a1c	lel new astron	2015-08-29 08:46:37 -04:00
John	6becda3f16	The teleport button now takes jellybeans for usage + add proper teleport coordinates for Toon Hall	2015-08-29 15:24:40 +03:00
John	64a4f9fe92	FUCK YOU ERROR CODE 10054	2015-08-29 14:28:32 +03:00
John	06d4c8320a	Add proper count for wardrobe and done it for trunk too	2015-08-28 22:39:10 +03:00
John	c9e0f0deac	Closet clothing count display	2015-08-28 13:38:36 +03:00
John	99083861c3	Only start chat in tutorial after talking to Flippy	2015-08-28 12:55:53 +03:00
John	2662ca6d3f	Confirm dialog for Delete All button	2015-08-28 12:00:31 +03:00
John	d906d45312	V2 Cog GUI fix	2015-08-27 23:29:14 +03:00
John	0d1595417d	Only toon up after the joke	2015-08-27 22:15:41 +03:00
John	b91320d9f8	Remove VP cog part takeaway on death	2015-08-27 22:03:04 +03:00
John	9bc2312adc	VP Greening fix	2015-08-27 21:50:48 +03:00
John	03ccb2ee48	Resources update	2015-08-27 20:42:46 +03:00
John	48a811cd0d	Stats page format fix	2015-08-27 20:42:24 +03:00
John	b2688c9107	Stats page update!	2015-08-27 20:34:48 +03:00
John	1f9dddf534	Quest map fixes in suit interiors	2015-08-27 19:37:18 +03:00
John	db14609bb6	Added exclaim noises to cogs	2015-08-27 15:15:57 +03:00
John	6e354b5fc3	Chat is now persistent even after leaving zones	2015-08-27 15:06:13 +03:00
John	8e620d589a	CJ fix	2015-08-27 14:59:01 +03:00
John	aee605bb19	Fix SOS selection of the same type in a row	2015-08-27 14:11:58 +03:00
John	fbf84238a8	Oops!	2015-08-27 13:14:23 +03:00
John	3a5e708396	Cog hover panel improvements	2015-08-27 13:13:37 +03:00
John	1c01fddd82	Revert lure number showing + use invisible.png in color shop	2015-08-27 12:10:34 +03:00
John	85f8122dbc	Fix 'SOS left' display in the battle GUI	2015-08-27 12:02:43 +03:00
John	8a667e602b	Fix gag selection	2015-08-27 12:00:22 +03:00
John	9f4baa883e	Fix not being able to see the X button on the cast gui	2015-08-27 10:02:54 +03:00
John	13962b35d1	Fixed selling fish on Fish Bingo	2015-08-27 09:45:07 +03:00
Master Jumblespeed	b16654e456	whoops...fix resources	2015-08-26 20:27:09 -04:00