Commit graph

278 commits

Author SHA1 Message Date
Alexander Behrhof
029bd08e1f Merge branch 'features/dan' into 'master'
Features/dan



See merge request !3
2015-08-16 16:19:07 -04:00
Master Jumblespeed
3c85a9e886 bans: minor changes 2015-08-15 02:40:35 -04:00
Master Jumblespeed
6a05d84b04 merge and add 2015-08-14 18:58:37 -04:00
John
b4afca2fce Teleport fail cooldown + whisper frame text fix 2015-08-14 19:47:48 +03:00
John
2689789ab1 Clickable browser whispers + cleanup 2015-08-14 19:30:11 +03:00
John
b8ef66621f CHAT_SETTINGS Account dc field 2015-08-14 00:31:23 +03:00
John
5f9592cdd7 Magic word crash prevention 2015-08-13 23:06:19 +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
Alexander
d93a8e5e60 Merge remote-tracking branch 'origin/master' into feature/deployment 2015-08-07 16:13:37 -04:00
John
4a0ac70835 Preferred district 2015-08-07 17:36:58 +03:00
John
68b8b047a5 Grammar fixes, settings.json beautify, crash fixes, GC fixes (still breaks though with #f), and gag selection fix 2015-08-06 14:55:00 +03:00
Alexander
ad206df3e9 Add some more things needed for deployment. 2015-08-05 15:41:39 -04:00
John
323d181e6f Text to speech 2015-08-03 02:48:36 +03:00
John
d4557e69fa Group Manager 2015-08-01 17:08:37 +03:00
John
f1f38cdae8 Holocaust admin nametags + do Loudrob's pro stuff 2015-08-01 02:37:41 +03:00
John
90b98ad3ef True Friends 2015-07-31 14:45:00 +03:00
John
49b2422187 Chairs.. my blood went into this.. 2015-07-31 01:15:21 +03:00
John
892addeb9b Add back yes/no/OK 2015-07-28 20:34:26 +03:00
John
6ab319db0f Stats! To-do: fix gone sad 2015-07-28 04:15:28 +03:00
John
e402d25e21 Remove Yes, No, OK (loudrob's favorite) 2015-07-27 22:52:30 +03:00
John
2c451321b2 nametags: Removed a few unused nametags, added boardinggroup and battlesos color, fixed toon statue selection GUI, doodles now have green nametags. 2015-07-18 15:25:47 +03:00
Loudrob
534f63df23 Revert "crack babies"
This reverts commit 0a248d7391.
2015-07-17 20:14:41 -04:00
Loudrob
0a248d7391 crack babies 2015-07-17 20:02:41 -04:00
John
95f67faab5 Stuff 2015-07-18 02:28:36 +03:00
John
d5dc2c9d50 PotentialAvatar cleanup 2015-07-17 19:05:29 +03: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
Loudrob
6ac39df62a District Reset Prevention. 2015-07-13 13:04:39 -04:00
John Cote
36cddfeace Add crash fix for setFov 2015-07-09 17:22:45 -04:00
John
071ee08176 It is always available. 2015-07-09 17:43:52 +03:00
John Cote
d0c0054e89 Fix an issue w/ describeException not working. 2015-07-08 08:06:14 -04:00
John
ec8ee69769 Add messages for CEO. TODO: Banquet Speech. 2015-07-07 02:39:55 +03:00
John Cote
468b1702d8 Convert range to xrange 2015-07-05 21:02:35 -04:00
John Cote
ad09d429fb yay repo cleanup 2015-07-05 19:59:25 -04:00
Master Jumblespeed
49b26c4103 csmud: adjust remotedb 2015-07-04 15:13:29 -04:00
John
3b93cd6596 Fix pick a name button 2015-07-04 11:38:44 +03:00
Loudrob
3a29c8995f Merge branch 'JawhnL5/nametags'
Conflicts:
	toontown/building/DistributedKnockKnockDoor.py
	toontown/pets/Pet.py
	toontown/safezone/Playground.py
	toontown/town/Street.py
2015-07-03 14:52:24 -04:00
John
9b5d51f65f Fix loudrob's issue 2015-07-03 18:28:18 +03:00
John
14658250e3 Fix Ambulance Chaser nametags in the margin 2015-07-03 18:04:17 +03:00
John
c1a7d64e43 Fix cog suit display name 2015-07-03 18:00:25 +03:00
John
b38f8472a5 Fixed a bunch of issues at once 2015-07-03 17:46:21 +03:00
John
3b9a4e8820 Access level on nametag 2015-07-01 13:15:05 +03:00
John
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
e4340eb131 Stuff that was bothering me 2015-06-29 21:54:28 +03:00
John
ab10d5f05f Swim Sound implemented 2015-06-27 18:14:04 +03:00
John Cote
67d8bb1a1d Add back chat balloon animation. 2015-06-26 19:15:02 -04:00
Loudrob
6eaaed8056 Another fix and Dan's nametag scaling. 2015-06-26 09:19:43 -04:00
John Cote
48539188de Some final nametag shit 2015-06-26 03:09:27 -04:00
John Cote
5cc0d8f27a More nametag translation 2015-06-25 22:59:13 -04:00