Conspirator
|
5c15478178
|
Merge pull request #35 from loblao/master
New CSM Tokens and DC Imports
|
2015-06-04 18:26:14 -04:00 |
|
John Cote
|
9050b1abff
|
John L: GardenGlobals edit
|
2015-06-04 15:33:27 -04:00 |
|
John Cote
|
2d37860963
|
Patch by John L: Fix AI crash caused by CatalogGenerator
|
2015-06-04 14:40:55 -04:00 |
|
Zach
|
990dcd0d5f
|
lel
|
2015-06-02 22:55:38 -05:00 |
|
John Cote
|
965708844c
|
Bye bye content pack manager
|
2015-06-02 19:12:08 -04:00 |
|
Zach
|
9033861dfb
|
pillow gravity
|
2015-06-01 16:14:34 -05:00 |
|
loblao
|
0b2107c04d
|
CSM: new tokens + holocaust dc imports
|
2015-05-31 17:08:46 -03:00 |
|
Zach
|
fa284fe558
|
fixed boss crash
|
2015-05-31 14:18:47 -05:00 |
|
Loudrob
|
1303af5a13
|
Revert "Slightly buffed high level cogs, slightly nerfed sound and toon up."
This reverts commit 4a787248e9 .
|
2015-05-30 13:45:20 -04:00 |
|
Zach
|
d962bd6ea0
|
removed track shop
|
2015-05-30 10:06:50 -05:00 |
|
Zach
|
ce79646583
|
high grav method
|
2015-05-30 09:26:01 -05:00 |
|
Zach
|
e3832ffac7
|
lobby manager
|
2015-05-30 09:01:18 -05:00 |
|
Zach
|
2b8298856f
|
gui removes correctly
|
2015-05-30 09:01:06 -05:00 |
|
Zach
|
81e104a80a
|
255 > 8
|
2015-05-30 07:56:05 -05:00 |
|
Zach
|
097ea4942f
|
lobby manager and GUI update
|
2015-05-30 06:16:23 -05:00 |
|
Zach
|
e560829a14
|
created an awesome GUI editor
|
2015-05-29 21:49:55 -05:00 |
|
Zach
|
6bb564c2f5
|
removed star from gui
|
2015-05-29 16:59:23 -05:00 |
|
Zach
|
3ed02edc04
|
debug prints
|
2015-05-29 15:59:26 -05:00 |
|
Zach
|
7000d6a0a7
|
organized folders
|
2015-05-29 05:03:48 -05:00 |
|
Zach
|
3f37efea21
|
bouncing
|
2015-05-28 15:39:46 -05:00 |
|
Master Voltage
|
7d5739c442
|
this bugged me k
|
2015-05-28 16:27:08 -04:00 |
|
John Cote
|
3436e6a8e4
|
Less hacky suitA hands fix
|
2015-05-28 14:57:11 -04:00 |
|
Zach
|
0b8f650966
|
fixed doors
|
2015-05-27 14:47:33 -05:00 |
|
Zach
|
279c2913ec
|
Merge branch 'master' of github.com:stevetts/tts_src
|
2015-05-27 08:07:32 -05:00 |
|
Zach
|
0425544dfc
|
cog hq doors and lobbies
|
2015-05-27 08:07:12 -05:00 |
|
Zach
|
ac9b768270
|
fixed loading screen music volume
|
2015-05-27 03:46:48 -05:00 |
|
Zach
|
3056946f04
|
laff restock npc's suits fixed
|
2015-05-27 02:08:39 -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 |
|
Zach
|
2545b2ba37
|
forgot these. also remove magic cat sos
|
2015-05-26 17:58:02 -05:00 |
|
Zach
|
f0ac25e0f9
|
rental suits
|
2015-05-26 17:57:35 -05:00 |
|
Xavier
|
1813fd2f6a
|
Final
|
2015-05-26 00:44:49 -04:00 |
|
Xavier
|
21fc265b20
|
Revert "Now heading to street name"
This reverts commit 039bff5da7 .
|
2015-05-26 00:42:55 -04:00 |
|
Xavier
|
039bff5da7
|
Now heading to street name
|
2015-05-26 00:40:49 -04:00 |
|
Xavier
|
e568d13f0c
|
Final Fix I promise
|
2015-05-25 21:12:56 -04:00 |
|
Xavier
|
4d2cfe01fd
|
Finally Fixed Language Selector
|
2015-05-25 21:06:00 -04:00 |
|
Xavier
|
b65375e482
|
Fixed text staying on screen
|
2015-05-25 20:56:50 -04:00 |
|
Xavier
|
00b94dc669
|
Replaced Brazilian with Portuguese
|
2015-05-25 20:28:49 -04:00 |
|
John Cote
|
437571aefb
|
suitA Cogs now have their proper hand colors
And with this I'd like to point out that this is technically a hack fix
since it's just not using the preloaded models whilst everything else is
|
2015-05-25 20:01:38 -04:00 |
|
Xavier
|
1074f255f3
|
Added Brazilian and German
For whenever we add the localizer
|
2015-05-25 20:00:47 -04:00 |
|
John Cote
|
bf006b5617
|
bool for garden game k
|
2015-05-25 15:27:34 -04:00 |
|
John Cote
|
b9244aea2a
|
Fix a traceback when exiting the game
|
2015-05-25 14:39:23 -04:00 |
|
Zach
|
d5595c3a74
|
added collisions to pillow and new tunnel
|
2015-05-25 13:12:27 -05:00 |
|
Master Voltage
|
b8b9891c1e
|
disabled garden drop k
|
2015-05-25 14:03:51 -04:00 |
|
John Cote
|
0d8319be38
|
Parties will work now k
|
2015-05-25 13:42:55 -04:00 |
|
John Cote
|
85b8923d35
|
Add back Zach's fixes
|
2015-05-25 13:31:34 -04:00 |
|
John Cote
|
913f29b745
|
Fix party bugs
but def not all
|
2015-05-25 13:27:32 -04:00 |
|
Zach
|
bca7063344
|
gui sliders for audio
|
2015-05-25 06:50:59 -05:00 |
|
Zach
|
023cbc6acb
|
jukebox at estate
|
2015-05-25 05:17:14 -05:00 |
|
John Cote
|
aa51d3d448
|
Add DLLs back and fix ARGManager crash
|
2015-05-25 02:38:20 -04:00 |
|
John Cote
|
9e389b985d
|
Temporarily place logo on every loading screen
This will be reverted once we get more detailed background art.
Currently, the loading screen is rather empty and boring.
|
2015-05-25 01:20:35 -04:00 |
|
John Cote
|
64160f9aa9
|
Revert "Fixing Scratch Glitch"
This reverts commit 4e91128ab8 .
|
2015-05-25 01:14:46 -04:00 |
|
Zach
|
7a7bdc1b16
|
Merge branch 'master' of github.com:stevetts/tts_src
|
2015-05-24 23:34:21 -05:00 |
|
Zach
|
fcc048ac12
|
removed teleport anim
|
2015-05-24 23:33:52 -05:00 |
|
Zach
|
eea2c7ee08
|
chat balloon anim changed
|
2015-05-24 23:22:53 -05:00 |
|
John Cote
|
3be3fcc10f
|
Revert some whisper color changes
|
2015-05-25 00:20:15 -04:00 |
|
Xavier
|
ae614c372f
|
Undo
|
2015-05-24 22:26:28 -04:00 |
|
Xavier
|
b315e0e5d8
|
Changed labels of TP to HQs
|
2015-05-24 22:24:39 -04:00 |
|
Xavier
|
4e91128ab8
|
Fixing Scratch Glitch
Timer change might help.
|
2015-05-24 21:01:13 -04:00 |
|
Zach
|
0f622cfe27
|
fixed bug
|
2015-05-24 18:56:45 -05:00 |
|
Zach
|
f25ad9caf8
|
merge fix and my bs devs fix
|
2015-05-24 18:42:26 -05:00 |
|
Zach
|
8bf8cf5f55
|
GARDENING, BITCHES
|
2015-05-24 18:23:54 -05: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 |
|
John
|
9a4af9c686
|
Remove Welcome Valley
|
2015-05-24 17:21:40 +03:00 |
|
Master Jumblespeed
|
8fb39a1d49
|
uberfixes
|
2015-05-23 20:58:38 -04:00 |
|
John Cote
|
adafe84346
|
Clean
|
2015-05-23 01:05:43 -04:00 |
|
John Cote
|
1fbd0602dc
|
Organize the repo a bit more
|
2015-05-22 23:47:35 -04:00 |
|
Master Jumblespeed
|
baaf4e787b
|
fix clientservices + automatic name approval
|
2015-05-21 20:52:40 -04:00 |
|
Loudrob
|
820732c776
|
No more pro lackers who pass the limit.
|
2015-05-21 19:45:40 -04:00 |
|
Master Jumblespeed
|
6f93be4677
|
fixes
|
2015-05-18 22:28:54 -04:00 |
|
Master Jumblespeed
|
d882959bfa
|
switch to remote
|
2015-05-18 22:11:33 -04:00 |
|
John Cote
|
8f7978052c
|
Fix Silly Street crash
|
2015-05-18 00:28:51 -04:00 |
|
John Cote
|
badea7d47e
|
These need some more work
|
2015-05-17 22:46:24 -04:00 |
|
John Cote
|
76a8190ed7
|
Cleanup config files, add a bool to enable/disable language selector
|
2015-05-17 02:04:51 -04:00 |
|
John Cote
|
e7f17e5299
|
Fix Toon deletion bug
|
2015-05-17 01:37:00 -04:00 |
|
John Cote
|
0247ec5daf
|
Remove this
|
2015-05-17 01:11:46 -04:00 |
|
John Cote
|
a195cbe230
|
Remove skid colors
|
2015-05-17 01:11:05 -04:00 |
|
John Cote
|
5d55436cec
|
Revert "Fix article names"
This reverts commit 8dea0edf21 .
|
2015-05-17 00:57:15 -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
|
88606b3876
|
Revert "No more accessory, clothing, furniture item gender discrimination! (except for skirts)"
This reverts commit c866a4a52f .
|
2015-05-17 00:52:14 -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 |
|
Master Voltage
|
b23c33c957
|
i committed them rename edits k
|
2015-05-16 21:04:41 -04:00 |
|
Loudrob
|
1d0d5fc2fe
|
Revert "I fucked this up"
This reverts commit 74abc6ac57 .
|
2015-05-16 14:38:34 -04:00 |
|
Loudrob
|
c1e1f5164a
|
Decorations should only be used on their correct holidays pls.
|
2015-05-16 14:34:31 -04:00 |
|
DenialMC
|
a03c70c0e6
|
Replace ugly method with beautiful
|
2015-05-16 14:03:46 +03:00 |
|
DenialMC
|
0f4521a19e
|
Initial work on gifting (still broken right now), and sry zach
|
2015-05-16 13:23:30 +03:00 |
|
DenialMC
|
87a77a8740
|
Fix minigame speedchat crash
|
2015-05-16 12:40:45 +03:00 |
|
DenialMC
|
bd7488dd49
|
Fix special tab
|
2015-05-16 12:19:31 +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 |
|
Master Voltage
|
6c3682bd75
|
i is good engrish now
|
2015-05-15 19:41:19 -04:00 |
|
John Cote
|
0bc41b75f9
|
how dare you use tabs voltage
|
2015-05-15 19:22:19 -04:00 |
|
Master Voltage
|
6cc8c2a7ba
|
added more phrases k
|
2015-05-15 19:09:45 -04:00 |
|