Commit graph

90 commits

Author SHA1 Message Date
Harvir
431732ac5a global: Clean up usage of base.config (using builtin config). 2014-08-15 00:35:01 +01:00
Harvir
575dded46d global: Clean up usage of simbase.config (using builtin config). 2014-08-15 00:14:12 +01:00
Harvir
ca1f342f58 rewards: Fix positioning for RewardPanel. 2014-08-05 20:10:04 +01:00
Harvir
6e7e051810 Revert "battle: Fix Reward Screen scale and experience speed"
This reverts commit ce559c6576.
2014-08-05 20:05:14 +01:00
Joey Z
ce559c6576 battle: Fix Reward Screen scale and experience speed 2014-07-27 15:18:59 -04:00
Joey Z
e7e179d1fe battle: Adjust magnet for the new model/textures, bump resources 2014-07-02 23:26:56 -04:00
Joey Z
d8d9c0c0c1 battle: Visually improve "Fountain Pen" and "Fill with Lead" suit attacks 2014-06-24 18:31:12 -04:00
Joey Z
6a33b0f47f battle: Improve train animation even more 2014-06-24 01:02:27 -04:00
Joey Z
b27fbd9bff battle: Improve train animation 2014-06-24 00:18:56 -04:00
Joey Z
d57c5c795a battle: Improve camera position when using the train gag 2014-06-23 23:56:16 -04:00
Joey Z
309f61d3b0 battle: Improve TNT animation 2014-06-21 14:44:04 -04:00
Joey Z
242bcf75ec battle: Don't freeze the toon at the end of the glass animation 2014-06-09 12:49:27 -04:00
Joey Z
10fc7f04f1 battle: Fix Big Wig's "Finger Wag" attack 2014-05-26 00:23:23 -04:00
Harvir
c69064ddeb battles: Continue with for loop rather than stopping entirely. 2014-05-23 14:05:30 +01:00
Harvir
bf12a7e199 battles: Hack-fix for the crash when entering SBHQ. This was becoming far too common for my liking. 2014-05-23 14:00:32 +01:00
Aidan
5878b27413 battle: 🐬 2014-05-19 21:38:44 -04:00
Aidan
601d2b28d2 battle: better skip disabling 2014-05-19 21:38:24 -04:00
Aidan
d615a997be Revert "battle: Don't let people skip the reward screen with escape"
This reverts commit bea72827b3.
2014-05-19 21:35:56 -04:00
Harvir
9fef32f68d Revert "battle: Significantly reduce the chances of throw hitting for Slate's account"
This reverts commit e15257db99.

Conflicts:
	toontown/battle/BattleCalculatorAI.py
2014-05-20 00:19:22 +01:00
Anthony Castelli
e772242c0c Fore ugly formatted lists 2014-05-19 16:17:36 -07:00
Joey Z
bea72827b3 battle: Don't let people skip the reward screen with escape 2014-05-19 16:28:16 -04:00
Joey Z
02a44ce38b toontorial: Define Tom from NPC Toons 2014-05-16 16:42:12 -04:00
Joey Z
e15257db99 battle: Significantly reduce the chances of throw hitting for Slate's account 2014-05-14 21:33:45 -04:00
Jeremy Koletar
d6efec989c battle: Improve the battle-cogs-defeated log 2014-05-12 19:28:55 -05:00
Anthony Castelli
f75d5465dc coghq: Bossbot HQ 2014-05-11 17:53:49 -04:00
Harv
9e10622c7e Merge branch 'beta-key-value-events' of /home/git/repositories/privatetoon/toontown into beta-wip 2014-05-11 15:48:10 -06:00
Harvir
bc26103ae2 Merge branch 'beta-wip' into beta-key-value-events
Conflicts:
	toontown/distributed/ToontownInternalRepository.py
2014-05-11 22:23:56 +01:00
Joey Z
3b7b7ed0b1 battle: Add sound effect for Schmooze attack 2014-05-10 23:54:16 -04:00
Joey Z
e3c91adc7c battle: Add sound effect for the half-windsor attack 2014-05-10 23:18:54 -04:00
Joey Z
e278e1fd71 battle: Add unused animation to show that a cog is lured 2014-05-10 23:01:31 -04:00
Joey Z
786a97f7db Revert "Revert "general: Use VFS to resolve paths to resources in dev environments; simplifies dev-prod parity.""
This reverts commit 90cac26612.
2014-05-10 02:57:42 -04:00
Joey Z
1a8201f089 Merge branch 'beta-wip' of git@git.riotcave.com:privatetoon/toontown.git into beta-wip 2014-05-10 00:46:34 -04:00
Sam Edwards
7a264bfacc resources: Remove explicit .bam filenames. 2014-05-09 14:53:36 -06:00
Harvir
c1fb30162d Revert "Revert "general: Use VFS to resolve paths to resources in dev environments; simplifies dev-prod parity.""
This reverts commit 693112604b.
2014-05-09 14:48:30 +01:00
Harvir
693112604b Revert "general: Use VFS to resolve paths to resources in dev environments; simplifies dev-prod parity."
This reverts commit 0415c53af1.
2014-05-09 14:26:14 +01:00
Joey Z
90cac26612 Revert "general: Use VFS to resolve paths to resources in dev environments; simplifies dev-prod parity."
This reverts commit 0415c53af1.
2014-05-08 19:02:39 -04:00
Sam Edwards
0415c53af1 general: Use VFS to resolve paths to resources in dev environments; simplifies dev-prod parity. 2014-05-07 20:08:59 -06:00
Sam Edwards
c02b6a62bb battle: Adjust camera FOV for widescreen support. 2014-05-06 08:37:19 -06:00
Jeremy Koletar
192f807dfe logging: Migrate a batch of files over to key-value 2014-05-04 20:43:26 -05:00
Sam Edwards
8421adf550 distributed: Revert all of the old object-sorting code. 2014-05-01 00:16:08 -06:00
Aidan Noll
fc4dd61545 coghq: somewhat non-hacky VP, not completely tested 2014-04-30 02:51:12 -04:00
Joey Z
ddb9526b47 battle: WIP - Use Disney's unused "squirt-large" animation for Fire Hose gags 2014-04-27 22:58:30 -04:00
Aidan
f6d8c146db battle: remove unnecessary whitespace 2014-04-27 19:11:16 -04:00
Aidan
3c9be90450 battle: annoy harv less 2014-04-27 19:08:37 -04:00
Aidan
c08d20560c battle: fix sounds on mirai 2014-04-27 18:26:36 -04:00
Harvir
c3a9db26f5 toon: Add immortal and unlimitedGags magic words. 2014-04-27 03:12:57 +01:00
Harv
a70bee8358 Merge branch 'messy-sorted-generate' of /home/git/repositories/privatetoon/toontown into beta-wip 2014-04-25 23:45:09 -06:00
Harvir
8e3489dc06 suits: A few fixes including enabling battles to check PromoMgrAI. 2014-04-26 06:37:11 +01:00
Aidan
35a3a27eee suit: replace deferFor with sortOrder 2014-04-26 01:10:17 -04:00
Joey Z
32c5f62cf9 battle: Undo a bad Disney update from last year (The gag screens going too fast, and the skip button) 2014-04-25 23:51:30 -04:00