Commit graph

879 commits

Author SHA1 Message Date
John
5a4dc305d1 Fix Loudrob's stuff 2015-07-17 15:04:59 +03:00
John
c21c7d53fd Sorry loudrob 2015-07-17 14:55:14 +03:00
Loudrob
e25c163d48 Merge branch 'master' into features/ttn 2015-07-17 07:53:22 -04:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
a89e89f99a Chat Offense 2015-07-16 14:14:00 -04:00
jp187187
359e52ed11 Fix Jukeboxes for estates parties and no conflict with TV
loop needs int not float and time is float and loop was set to
getMusicRepeatTimes(length) this is time not loop
2015-07-16 08:12:20 -07:00
Loudrob
ae40f21034 Better phone scale. 2015-07-16 09:26:34 -04:00
John
603dad00cb Merge branch 'master' into features/ttn 2015-07-16 15:53:32 +03:00
John
88dca5c838 House fix 2015-07-16 15:53:19 +03:00
Loudrob
02444d4026 family 2 pls 2015-07-16 08:41:54 -04:00
John
b014a7d568 Revert "Added back ~unlimitedgags"
This reverts commit 68907397a7.
2015-07-16 14:02:37 +03:00
John
e2f45d0a0a Bitches 2015-07-15 15:35:17 -04:00
John
d9048ffd76 Bitches 2015-07-15 21:55:49 +03:00
Loudrob
6868fa1267 Merge branch 'master' into features/ttn 2015-07-14 20:49:28 -04:00
jp187187
9c349e5e42 dont fire me ;) added the 100inch cog screen 2015-07-14 17:42:29 -07:00
jp187187
68907397a7 Added back ~unlimitedgags 2015-07-14 11:38:58 -07:00
Loudrob
dfcd7c2124 Gift duplication fixed. 2015-07-14 14:35:15 -04:00
Master Voltage
1d48a7fa28 praise nacib 2015-07-14 10:40:11 -04:00
Loudrob
7f1d4b8e18 Merge branch 'master' into features/ttn 2015-07-14 06:38:49 -04:00
John
5b2f6ce816 The rounds effective for lure now shows on the battle inventory screen 2015-07-14 13:01:45 +03:00
John
d9d1d66f37 Pro fix 2015-07-14 01:53:57 +03:00
John
a6b0aeaaff HD TV + Tailor Fix 2015-07-14 01:43:13 +03:00
Loudrob
6ac39df62a District Reset Prevention. 2015-07-13 13:04:39 -04:00
John
b7d8cd0a3a Fix offline gifting 2015-07-13 18:13:17 +03:00
Loudrob
87efdba167 More gifting. 2015-07-13 10:17:56 -04:00
Loudrob
8ad6894fb5 another fix 2015-07-13 07:13:05 -04:00
Loudrob
c1654a3f42 fuck ur tabs 2015-07-12 20:17:17 -04:00
Loudrob
e4f432858e it's supposed to be like this 2015-07-12 19:16:38 -04:00
Loudrob
4e8fb45531 Current progress on gifting. 2015-07-12 15:42:55 -04:00
Loudrob
c8919bf0aa Fix buttons hiding behind catalog screen. 2015-07-12 13:44:01 -04:00
Loudrob
cb9b4f8d09 Typo. 2015-07-12 12:51:05 -04:00
Loudrob
cd56e91057 New NetMessenger 2015-07-12 12:48:58 -04:00
John
92b3eac364 Rounds a lure takes is shown in battle 2015-07-11 22:36:58 +03:00
John
b14505435c Add toon model into the detail panel 2015-07-10 22:25:09 +03:00
John
86c6598284 Hypno Glass 2015-07-09 21:23:01 +03:00
John
071ee08176 It is always available. 2015-07-09 17:43:52 +03:00
John
ff5e8c9852 Extra Options Page properly unloads now 2015-07-09 17:38:22 +03:00
John
f6744b92d2 Battles dont take forever to join 2015-07-09 16:47:39 +03:00
John
7b953dcb0e Bossbot Boss talks a lot more now 2015-07-09 13:51:51 +03:00
John
0d8027a382 fuck you and your fucking family if you do this again i will slit your fucking throat you fucking cocksucker nigger jew bunny 2015-07-09 13:08:06 +03:00
John
15d096f44d Fix 2015-07-08 15:47:52 +03:00
John
6d1cf1ae43 Video player! 2015-07-08 15:30:25 +03:00
John Cote
43c45cc285 Set Cast GUI as a background so laff meter doesn't appear behind it. 2015-07-08 08:24:41 -04:00
John Cote
059b7801cb ClientStart can screw off. 2015-07-08 08:15:51 -04:00
John Cote
d0c0054e89 Fix an issue w/ describeException not working. 2015-07-08 08:06:14 -04:00
John Cote
da7ba5ce89 Convert prints to writeServerEvents in code redemption manager AI and fix typos 2015-07-08 07:47:01 -04:00
John Cote
8825da791e Merge branch 'master' of https://github.com/stevetts/tts_src 2015-07-08 06:54:41 -04:00
John Cote
de03f7b619 Implement a better v2.0 death sequence. 2015-07-08 06:54:31 -04:00
John
3c4770ebc6 CEO Boss Speech 2015-07-08 03:12:12 +03:00
John
ac60242003 Add skelecog and waiter invasions to summon page 2015-07-07 21:16:55 +03:00