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
|
485eaa83ec
|
Fix bank money display
|
2015-07-03 17:09:04 +03:00 |
|
John
|
cf1785f7c7
|
Bank in inventory page
|
2015-07-03 00:16:47 +03:00 |
|
John Cote
|
167c5c5736
|
Current work
|
2015-06-24 13:19:10 -04:00 |
|
John Cote
|
d2b0d99175
|
Change from pandac.PandaModules to panda3d.core in some files
|
2015-06-23 19:11:48 -04:00 |
|
John
|
884e452e32
|
Reconsider toons only when switching true friends/speedchat
|
2015-06-18 17:02:51 +03:00 |
|
John
|
6c94355d39
|
FOV slider + add other sliders into TTLocalizer
|
2015-06-18 16:53:50 +03:00 |
|
Loudrob
|
b05d274158
|
Misc Fixes (prepare your asshole for daniels commits)
|
2015-06-17 11:24:52 -04:00 |
|
John
|
f0c0c08719
|
DANIEL: Cleanup
|
2015-06-17 10:11:33 -04: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
|
519a4fd111
|
Fix merit bars
|
2015-06-17 09:54:22 -04:00 |
|
John
|
704923f53a
|
DANIEL: Merits on inventory page
|
2015-06-17 09:50:29 -04:00 |
|
John
|
def7ca4372
|
Max true friends + cleanup
|
2015-06-17 09:49:18 -04:00 |
|
John
|
7bad238cbe
|
DANIEL: New npc friends page
|
2015-06-17 09:20:54 -04:00 |
|
John
|
93e0c04dce
|
DANIEL: db values cleanup
|
2015-06-17 09:08:02 -04:00 |
|
John
|
1b2c00f7a1
|
DANIEL: Beginning of chat stuff
|
2015-06-17 08:45:55 -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
|
e702145334
|
DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11'
|
2015-06-16 19:13:24 -04: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 |
|
Zach
|
7000d6a0a7
|
organized folders
|
2015-05-29 05:03:48 -05:00 |
|
John Cote
|
f86261ac97
|
Cleanup GroupPage.py
|
2015-05-26 22:21:38 -04:00 |
|
Xavier
|
12d80e79e7
|
Update for Zach
|
2015-05-26 21:37:20 -04:00 |
|
Osnapman
|
7613aaee79
|
zach c0de
|
2015-05-26 21:03:14 -04:00 |
|
Xavier
|
50a5fd545e
|
Rename BoardingPage.py to GroupPage.py
|
2015-05-26 20:50:33 -04:00 |
|
Xavier
|
aaf8b849d8
|
Delete InvsionPage.py
|
2015-05-26 20:48:01 -04:00 |
|
Osnapman
|
5819f89fb9
|
Create BoardingPage.py
|
2015-05-26 20:45:58 -04:00 |
|
Xavier
|
48f2d47cb0
|
Rename
|
2015-05-26 20:45:06 -04:00 |
|
Xavier
|
5ef740b39f
|
Create GroupInvsionPage.py
|
2015-05-26 20:24:03 -04:00 |
|
John Cote
|
b9244aea2a
|
Fix a traceback when exiting the game
|
2015-05-25 14:39:23 -04:00 |
|
Zach
|
bca7063344
|
gui sliders for audio
|
2015-05-25 06:50:59 -05:00 |
|
John
|
9a4af9c686
|
Remove Welcome Valley
|
2015-05-24 17:21:40 +03:00 |
|
Master Jumblespeed
|
d882959bfa
|
switch to remote
|
2015-05-18 22:11:33 -04:00 |
|
John Cote
|
aba9368632
|
Revert "Some shticker book cleanup, add Speedchat Plus and True Friends to shticker book, but we really need a OptionsPage rewrite."
This reverts commit 0d5b0cbee9 .
|
2015-05-17 00:56:44 -04:00 |
|
John Cote
|
35b064a59e
|
Some revert k
|
2015-05-17 00:52:07 -04:00 |
|
John Cote
|
834e0f4385
|
More name changing
god fucking damn voltage
|
2015-05-16 23:00:56 -04:00 |
|
DenialMC
|
0f4521a19e
|
Initial work on gifting (still broken right now), and sry zach
|
2015-05-16 13:23:30 +03:00 |
|
DenialMC
|
0d5b0cbee9
|
Some shticker book cleanup, add Speedchat Plus and True Friends to shticker book, but we really need a OptionsPage rewrite.
|
2015-05-16 12:09:03 +03:00 |
|
Loudrob
|
9d54f4f88a
|
Murdered TTI's promotion system.
|
2015-05-13 07:41:49 -04:00 |
|
DenialMC
|
2d055f2dea
|
PDB must be crucified
|
2015-05-11 22:58:11 +03:00 |
|
DenialMC
|
cbc94f56bb
|
Added a bunch of new decoration and games, but those games dont work
|
2015-05-06 21:04:18 +03:00 |
|
DenialMC
|
a617cf7252
|
Fix logout, add notice to Bug Report site, add bug report site to ToontownGlobals.
|
2015-05-06 10:36:27 +03:00 |
|
Loudrob
|
f814b63c08
|
Added year field, and appropriate message for month, day and year code rejection.
|
2015-05-05 18:10:39 -04:00 |
|
DenialMC
|
dd0b4fdbbe
|
Fixed Tug-o-War, removed Trolley Tracks and temp minigame AI
|
2015-05-05 21:43:30 +03:00 |
|
Loudrob
|
c623f806cc
|
Bug report button k.
|
2015-05-03 12:38:18 -04:00 |
|
DenialMC
|
d4d5e61941
|
RIP Achievements, we are gonna have Top Toons tho
|
2015-04-29 10:49:58 +03:00 |
|
Zach
|
475e4f37f7
|
Merge branch 'master' of gitlab.com:ToontownUnited/src
|
2015-04-23 21:08:12 -05:00 |
|
Zach
|
eec533a48b
|
GroupManager updates
|
2015-04-23 21:07:17 -05:00 |
|
DenialMC
|
f27d6392db
|
Holeycaust - more preparations
|
2015-04-23 20:55:47 +03:00 |
|
Loudrob
|
342105302b
|
I like the name extra better.
|
2015-04-21 18:20:07 -04:00 |
|