John Cote
|
ad09d429fb
|
yay repo cleanup
|
2015-07-05 19:59:25 -04: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
|
1c84579924
|
Fix trophy score
|
2015-07-03 18:11:03 +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 Cote
|
48539188de
|
Some final nametag shit
|
2015-06-26 03:09:27 -04:00 |
|
John Cote
|
167c5c5736
|
Current work
|
2015-06-24 13:19:10 -04:00 |
|
John
|
784535541d
|
Tons of work.. but christmas/halloween are still not implemented properly. However fishing works now.
|
2015-06-24 16:49:20 +03:00 |
|
John Cote
|
d2b0d99175
|
Change from pandac.PandaModules to panda3d.core in some files
|
2015-06-23 19:11:48 -04:00 |
|
John
|
2c8ac1add9
|
Scavenger hunts!! :D
|
2015-06-23 23:20:41 +03:00 |
|
John
|
5a76de3d72
|
Proper positions for everything above the head
|
2015-06-20 15:19:09 +03:00 |
|
John
|
c57ebf03ed
|
Cleanup
|
2015-06-20 12:24:08 +03:00 |
|
John
|
e0765526be
|
Remove setGM and gm name, now combined with setAdminAccess. TODO: disables
|
2015-06-18 22:26:42 +03:00 |
|
John
|
884e452e32
|
Reconsider toons only when switching true friends/speedchat
|
2015-06-18 17:02:51 +03:00 |
|
John
|
6d24fb4390
|
Add merits unite which restocks 16.66% of the total merits required (meaning it needs a bit more than 6 unites to restock fully, even for BIg Cheese 23300 promotions.)
|
2015-06-17 10:08:57 -04:00 |
|
John
|
8751f73779
|
DANIEL: More cleanup
|
2015-06-17 10:04:20 -04:00 |
|
John
|
704923f53a
|
DANIEL: Merits on inventory page
|
2015-06-17 09:50:29 -04:00 |
|
John
|
e9842a8b65
|
Laff meter above head in bosses
|
2015-06-17 09:49:30 -04:00 |
|
John
|
7a9da93d39
|
DANIEL: Crash fixes
|
2015-06-17 09:47:43 -04:00 |
|
John
|
67f7c45f68
|
DANIEL: Chat color shit
|
2015-06-17 09:37:55 -04:00 |
|
John
|
e082fecf0b
|
DANIEL: Fix whispering
|
2015-06-17 09:35:54 -04:00 |
|
John
|
7bad238cbe
|
DANIEL: New npc friends page
|
2015-06-17 09:20:54 -04:00 |
|
John
|
0c56b7c78d
|
DANIEL: True friends
|
2015-06-17 09:15:30 -04:00 |
|
John
|
338d83a907
|
DANIEL: Friends cleanup
|
2015-06-17 09:10:17 -04:00 |
|
John
|
93e0c04dce
|
DANIEL: db values cleanup
|
2015-06-17 09:08:02 -04:00 |
|
John
|
1749768a8d
|
DANIEL: TalkAssistant cleanup
|
2015-06-17 09:06:48 -04:00 |
|
John
|
b48fb01fb0
|
DANIEL: Work on whitelist
|
2015-06-17 09:01:28 -04:00 |
|
John
|
33f99305df
|
DANIEL: Work on chat
|
2015-06-17 08:57:10 -04:00 |
|
John
|
d9454000b4
|
Work on chat garbler
|
2015-06-17 08:46:14 -04:00 |
|
John
|
a6e7fb9d83
|
Darn, this was necessary after all.
|
2015-06-17 08:29:22 -04:00 |
|
John
|
aeed161e9a
|
Misc stuff
|
2015-06-17 08:28:54 -04:00 |
|
John
|
e3a76a4bbf
|
Redirect to correct area if player goes sad in a cog battle
|
2015-06-17 08:28:33 -04:00 |
|
John
|
f1ffdc9a1e
|
DANIEL: Proper toonKilledCogs method
|
2015-06-17 08:24:00 -04:00 |
|
John
|
d92c28de27
|
Remove single cog summon, add Field Office cog summon, add V2 invasion cog summon, add Cog name to V2 invasion bulletins.
|
2015-06-17 08:14:19 -04:00 |
|
Loudrob
|
e22248e742
|
Merge commit 'ea14534efb0dc67c86459c86d327b160111e3f60'
|
2015-06-16 19:14:25 -04:00 |
|
John
|
64b1f372a8
|
Splash Effect fix
|
2015-06-16 20:30:38 +03:00 |
|
John
|
35b646c4e6
|
Revert "Spring cleaning"
This reverts commit 1e4bad8c6b .
|
2015-06-16 20:26:44 +03:00 |
|
John Cote
|
1e4bad8c6b
|
Spring cleaning
|
2015-06-15 20:56:12 -04:00 |
|
John
|
ea14534efb
|
Unicode chat warning
|
2015-05-24 19:04:49 +03:00 |
|
John
|
c100370140
|
Splash Effect fix
|
2015-05-24 18:03:46 +03:00 |
|
Master Jumblespeed
|
d882959bfa
|
switch to remote
|
2015-05-18 22:11:33 -04:00 |
|
John Cote
|
834e0f4385
|
More name changing
god fucking damn voltage
|
2015-05-16 23:00:56 -04:00 |
|
Loudrob
|
64aafa769c
|
Merge branch 'master' of https://gitlab.com/ToontownUnited/src
Conflicts:
otp/distributed/DCClassImports.py
|
2015-05-13 07:43:36 -04:00 |
|
Loudrob
|
9d54f4f88a
|
Murdered TTI's promotion system.
|
2015-05-13 07:41:49 -04:00 |
|
DenialMC
|
509a9697e6
|
True Friends holocausted until I make the new system tomorrow, using the panel
|
2015-05-13 14:04:03 +03:00 |
|
DenialMC
|
2d055f2dea
|
PDB must be crucified
|
2015-05-11 22:58:11 +03:00 |
|
John Cote
|
267310adc7
|
File cleanup and some fixes.
|
2015-05-11 15:05:59 -04:00 |
|
DenialMC
|
d4d5e61941
|
RIP Achievements, we are gonna have Top Toons tho
|
2015-04-29 10:49:58 +03:00 |
|
DenialMC
|
b2bab83cbb
|
So much Jizzney removing that Hitler toke his life
|
2015-04-25 10:26:27 +03:00 |
|
DenialMC
|
ac224306b2
|
Singing removed
|
2015-04-24 16:36:03 +03:00 |
|