1360 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John	0154fb4453	Remove black, gray, white toons from the make a toon and random toon generation (Sorry, Sid Sonata!)	2015-08-14 17:43:59 +03:00
John	d686796023	Merge SnowUtil and SkyUtil into SZUtil, fix mayChange spam in log because of the map, fix the various issues with the underwater fog.	2015-08-14 17:23:45 +03:00
John	699c54b40d	DisplaySettingsDialog fix	2015-08-14 16:47:05 +03:00
Alexander	a38ca63a30	Add submodule's from nirai branch.	2015-08-14 02:31:35 -04:00
Alexander	ad81064fb7	Add back files from old deployment branch.	2015-08-14 02:23:24 -04:00
Alexander	21ce879162	Update submodule.	2015-08-14 02:19:53 -04:00
Alexander	57bb586613	Add resources submodule.	2015-08-14 02:17:05 -04:00
Alexander	412bd7526f	Merge branch 'master' into feature/deployment	2015-08-13 18:51:53 -04:00
Alexander	0368de40e3	Update libpandanda.	2015-08-13 18:51:27 -04:00
Alexander	1e8045172b	Add submodule and upload the deployment files.	2015-08-13 18:38:01 -04:00
Alexander Behrhof	1ea800b4bd	Merge branch 'features/dan' into 'master' ... Features/dan See merge request !2	2015-08-13 18:20:28 -04:00
John	655d77a401	Add chat settings RPC command: untested	2015-08-14 00:38:00 +03:00
John	b8ef66621f	CHAT_SETTINGS Account dc field	2015-08-14 00:31:23 +03:00
John	be54eb19df	2X merit multiplier for factories	2015-08-13 23:39:09 +03:00
John	5f9592cdd7	Magic word crash prevention	2015-08-13 23:06:19 +03:00
Loudrob	ecc33e1c3d	some more mongo stuff (sorry that i pushed it here :()	2015-08-13 16:00:50 -04:00
John	ae3a7e7dc5	Nerf fish rarity properly	2015-08-13 22:42:29 +03:00
John	a3822b5099	Proper resistance toon DNAs + scarecrow fix in CFO battle	2015-08-13 15:41:18 +03:00
John	fc0a24904c	Tutorial chat bubble click fix + arrows fix	2015-08-13 14:47:51 +03:00
John	1d1e96d055	Fix cast member crash	2015-08-13 14:03:08 +03:00
John	0976a80bef	Carry 3 TNTs and 7 trapdoors	2015-08-13 13:58:38 +03:00
John	dc83a72cc4	Widescreen whisper frame	2015-08-13 13:54:13 +03:00
John	3880d7e032	NPCToons cleanup	2015-08-13 13:23:57 +03:00
John	6bdc129b67	Organic gag display in the battle GUI and better ~trackBonus command	2015-08-13 03:55:51 +03:00
John	3d5a138a68	SOS friends are now sorted by rarity	2015-08-13 03:19:58 +03:00
John	b155962dca	Fix a bug with the teleport button	2015-08-12 22:46:34 +03:00
John	2098275dfa	Cog HQ teleport crash fix	2015-08-12 22:03:58 +03:00
John	9299357345	Color picker fixes	2015-08-12 21:49:51 +03:00
John	0489a156a3	Color drag	2015-08-12 21:37:20 +03:00
John	b3efea4a6d	Teleport button fixed	2015-08-12 20:17:34 +03:00
John	7a8552c10e	More fixes	2015-08-12 19:14:40 +03:00
John	19608959c5	Tutorial fix	2015-08-12 19:10:45 +03:00
John	f137f3f047	Toons now stop when greeted with a warning message while trying to go into a door instead of running in 1 place	2015-08-12 18:44:35 +03:00
John	1dcba024d5	NPC fix!!	2015-08-12 18:37:17 +03:00
John	c7011bc757	Don't send trophies on result	2015-08-12 14:55:03 +03:00
John	41307f6a0f	Revert "Another friend fix" ... This reverts commit 156752b4a7.	2015-08-12 14:51:07 +03:00
John	156752b4a7	Another friend fix	2015-08-12 14:45:48 +03:00
John	da0366d02a	TV proper loop	2015-08-12 14:39:31 +03:00
John	bacd4b365c	Boarding Group messages are now clickable	2015-08-12 14:21:39 +03:00
John	9d43264adc	Friends list bug fix	2015-08-12 14:17:43 +03:00
John	e2d7b9b674	POPSICLES	2015-08-10 16:33:28 +03:00
Alexander	7b07c84a79	Update resources.	2015-08-10 00:48:28 -04:00
John	1d8fe20587	Refactor suit health bar	2015-08-09 15:23:35 +03:00
John	7019d1ba9a	Rewritten (no pun intended) cog panel	2015-08-09 14:32:13 +03:00
John	a2d5b004c9	Holocaust fire cost	2015-08-09 13:41:30 +03:00
Alexander	1d4caa84e9	Revert to old way for now.	2015-08-08 22:53:39 -04:00
Alexander	9b1dfba315	Let's try this.	2015-08-08 22:38:16 -04:00
Alexander	4ac30dbe52	Forgot a import.	2015-08-08 22:29:39 -04:00
Alexander	4a12f647ee	Fix game crashing now?	2015-08-08 22:24:05 -04:00
Alexander	aa99dab28d	Avoid using the account-bridge on prod.	2015-08-08 22:14:29 -04:00