Commit graph

1435 commits

Author SHA1 Message Date
John Cote
fe825c8783 Cleanup 2 2015-06-05 01:32:41 -04:00
John Cote
b242d22e5d Merge pull request #39 from stevetts/temporary
Merge Content Pack Manager removal to master
2015-06-05 01:08:28 -04:00
John Cote
9b5a92c449 Merge pull request #38 from stevetts/master
Merge
2015-06-05 01:06:47 -04:00
John Cote
0d198f9f5d Cleanup 2015-06-05 01:05:01 -04:00
Conspirator
0628201fca Merge pull request #37 from loblao/master
oops.jpg
2015-06-04 20:06:58 -04:00
Loudrob
585dff5132 Default account-server secret for remotedb. 2015-06-04 19:59:27 -04:00
Conspirator
51a4e221be Merge pull request #36 from loblao/nirai
Nirai build files
2015-06-04 19:05:34 -04:00
Conspirator
5c15478178 Merge pull request #35 from loblao/master
New CSM Tokens and DC Imports
2015-06-04 18:26:14 -04:00
loblao
2176ad5c19 Nirai build files 2015-06-04 18:30:23 -03: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
56b86650f4 backups fixed 2015-05-29 16:02:46 -05:00
Zach
3a9ee31856 Merge branch 'master' of github.com:stevetts/tts_src 2015-05-29 15:59:37 -05:00
Zach
3ed02edc04 debug prints 2015-05-29 15:59:26 -05:00
John Cote
558104aadd fix this shit 2015-05-29 16:44:29 -04:00
Zach
5c51fe8037 fixed content packs and screenshots 2015-05-29 05:25:43 -05:00
Zach
ca6a06fba9 added folders 2015-05-29 05:23:31 -05:00
Zach
0dd824783a fixed gitignores 2015-05-29 05:21:29 -05:00
Zach
7000d6a0a7 organized folders 2015-05-29 05:03:48 -05:00
Zach
096fec75aa updated readme 2015-05-28 18:41:34 -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
2631dd1391 fixed gui editor 2015-05-27 07:55:06 -05:00
Zach
ac9b768270 fixed loading screen music volume 2015-05-27 03:46:48 -05:00
Zach
ea2868dc50 fixed start-game.bat 2015-05-27 03:22:15 -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