December 2011 Commit Log

Number of Commits:

43

Number of Active Developers:

1

culim 2011-12-19 06:02 #43 Rev.: 55

caught edge cases

39 lines of code changed in 3 files:

• bin-debug: CMSProject.swf (changed)
• src/edu/mit/icelab/games/cmsproject/music: MusicManager.as (+33 -2)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+6)

culim 2011-12-19 05:42 #42 Rev.: 54

tied up some loose ends

529 lines of code changed in 18 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed), agg_encounters.xml (+75 -378), con_encounters.xml (+1 -1), suspicious_npc.xml (+14 -11)
• src/edu/mit/icelab/games/cmsproject/objects: MapScroller.as (+1), NPCOctopus.as (new 20), OctopusCharacter.as (+4 -3)
• src/edu/mit/icelab/games/cmsproject/screens: EndScreen.as (new 29), MainGameScreen.as (+6 -1), MapScreen3.as (new 185), MapScreen4.as (new 186)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial1.as (+1 -1), Tutorial2.as (+3 -5), Tutorial3.as (+1 -1), Tutorial4.as (+1 -1)
• src/edu/mit/icelab/games/cmsproject/world: World.as (+2)

culim 2011-12-19 04:11 #41 Rev.: 53

updated encounters

84 lines of code changed in 15 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/objects: MapScroller.as (+7 -1), MoodColorObject.as (+1 -1), NPC.as (+9 -8), NPCAngler.as (+5), NPCHorse.as (+3), NPCJelly.as (+3), NPCShark.as (+2), OctopusCharacter.as (+7 -4)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+6), MainGameScreen.as (+5 -1), MapScreen2.as (+3)
• src/edu/mit/icelab/games/cmsproject/world: World.as (new 33)

culim 2011-12-19 02:53 #40 Rev.: 52

new world map.

283 lines of code changed in 13 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/events: MapEvent.as (new 27)
• src/edu/mit/icelab/games/cmsproject/objects: MapScroller.as (new 124)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+8 -8), MainGameScreen.as (+4), MapScreen.as (+1 -1), MapScreen2.as (new 89)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial1.as (+8 -1), Tutorial2.as (+7 -1), Tutorial3.as (+8 -1), Tutorial4.as (+7 -1)

culim 2011-12-19 00:36 #39 Rev.: 51

Added new map background.

0 lines of code changed in 1 file:

• res: GameAssets.fla (changed)

culim 2011-12-19 00:31 #38 Rev.: 50

Morphing tweaks.

10 lines of code changed in 3 files:

• bin-debug: CMSProject.swf (changed)
• src/edu/mit/icelab/games/cmsproject/objects: MoodColorObject.as (+1 -1)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+9 -9)

culim 2011-12-19 00:22 #37 Rev.: 49

login screen callback functioning.

61 lines of code changed in 4 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+61 -6)

culim 2011-12-18 23:48 #36 Rev.: 48

facebook integration complete.

291 lines of code changed in 8 files:

• bin-debug: CMSProject.swf (changed)
• lib: GraphAPI_Web_1_8_1.swc (new)
• src/edu/mit/icelab/games/cmsproject/facebook: FacebookEvent.as (new 24), FacebookManager.as (+98), FacebookUser.as (new 22)
• src/edu/mit/icelab/games/cmsproject/music: MusicManager.as (+97 -1)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+33 -3), MainGameScreen.as (+17 -7)

culim 2011-12-18 20:09 #35 Rev.: 47

fixed permissions issues.

50 lines of code changed in 7 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/music: MusicEvent.as (+3), MusicManager.as (+7 -2)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+39 -15), MainGameScreen.as (+1 -1)

culim 2011-12-18 18:22 #34 Rev.: 46

morphing fixes.

13 lines of code changed in 4 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+13 -4)

culim 2011-12-18 17:44 #33 Rev.: 45

Allowed adding of new artistes

104 lines of code changed in 4 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+104 -14)

culim 2011-12-18 17:04 #32 Rev.: 44

interface tweaks.

48 lines of code changed in 4 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+48 -21)

culim 2011-12-18 16:05 #31 Rev.: 43

facebook music connect image loader.

38 lines of code changed in 5 files:

• bin-debug: CMSProject.swf (changed)
• res/images: facebook-logo.png (new)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (+3 -1), MusicManager.as (+2 -1)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+33 -1)

culim 2011-12-18 15:36 #30 Rev.: 42

Facebook connection

183 lines of code changed in 9 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/engine: GameEngine.as (+32)
• src/edu/mit/icelab/games/cmsproject/facebook: FacebookManager.as (new 44)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (+30), MusicManager.as (+2 -1)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+55 -1), MainGameScreen.as (+20 -3)

culim 2011-12-18 05:10 #29 Rev.: 41

query bridge complete.

75 lines of code changed in 6 files:

• bin-debug: CMSProject.swf (changed)
• src/edu/mit/icelab/games/cmsproject/engine: GameEngine.as (-1)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (+6 -1), MusicEvent.as (new 22), MusicManager.as (+38 -14)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+9 -1)

culim 2011-12-18 04:32 #28 Rev.: 40

queued music query

132 lines of code changed in 9 files:

• bin-debug: CMSProject.swf (changed)
• music: genreLookup.php (new), index.htm (new), moodLookup.php (new), moodlookup.zip (new), moods.php (new)
• src/edu/mit/icelab/games/cmsproject: CMSProject.as (+4)
• src/edu/mit/icelab/games/cmsproject/music: MusicManager.as (new 96)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+32 -12)

culim 2011-12-18 02:05 #27 Rev.: 39

js communication bridge

62 lines of code changed in 4 files:

• bin-debug: CMSProject.html (+35 -1), CMSProject.swf (changed)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+25), MainGameScreen.as (+2 -12)

culim 2011-12-17 20:08 #26 Rev.: 38

facebook connect

50 lines of code changed in 8 files:

• .actionScriptProperties (+5 -3)
• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject: CMSProject.as (+1 -2)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (+3 -3)
• src/edu/mit/icelab/games/cmsproject/screens: LoginScreen.as (+16 -3), MainGameScreen.as (+25 -2)

culim 2011-12-17 17:55 #25 Rev.: 37

Squiad Ink animated Objects

71 lines of code changed in 8 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/engine: AnimatedObject.as (new 48), GameObject.as (+1), GameScreen.as (+3)
• src/edu/mit/icelab/games/cmsproject/objects: OctopusCharacter.as (+18 -2)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+1 -1)

culim 2011-12-17 03:23 #24 Rev.: 36

Linear blend.

18 lines of code changed in 2 files:

• bin-debug: CMSProject.swf (changed)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+18 -18)

culim 2011-12-17 03:10 #23 Rev.: 35

updated artists

0 lines of code changed in 4 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• res/images: davidguetta.jpg (changed)

culim 2011-12-17 03:05 #22 Rev.: 34

adding genre integration to octopus

78 lines of code changed in 8 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (+9 -1)
• src/edu/mit/icelab/games/cmsproject/objects: OctopusCharacter.as (+12)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (+39 -3)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial1.as (+2), Tutorial4.as (+16 -16)

culim 2011-12-17 02:06 #21 Rev.: 33

integrated morphed genres

0 lines of code changed in 1 file:

• res: GameAssets.fla (changed)

culim 2011-12-17 02:05 #20 Rev.: 32

added morphs

0 lines of code changed in 4 files:

• res/fla/morphs: anglerfish.fla (new), jellyfish.fla (new), seahorse.fla (new), shark.fla (new)

culim 2011-12-17 00:23 #19 Rev.: 31

added file

0 lines of code changed in 1 file:

• res/fla: bg5.fla (new)

culim 2011-12-17 00:19 #18 Rev.: 30

moving files around.

0 lines of code changed in 19 files:

• res: aggressive5.fla (del), bg.fla (del), bgtest5.fla (del), confused5.fla (del), neutral5.fla (del), oblivious5.fla (del), shark.fla (del), suspicious5.fla (del)
• res/concept: mockup.png (new), mockup.xcf (new), mockup2.png (new)
• res/fla: aggressive5.fla (new), bg.fla (new), bgtest5.fla (new), confused5.fla (new), neutral5.fla (new), oblivious5.fla (new), shark.fla (new), suspicious5.fla (new)

culim 2011-12-17 00:10 #17 Rev.: 29

added aggressive encounters to res

505 lines of code changed in 1 file:

• res: agg_encounters.xml (new 505)

culim 2011-12-14 12:46 #16 Rev.: 28

added missing file

505 lines of code changed in 1 file:

• bin-debug: encounters.xml (new 505)

culim 2011-12-14 12:46 #15 Rev.: 27

updates

1188 lines of code changed in 14 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed), con_encounters.xml (new 310), suspicious_npc.xml (new 253)
• src/edu/mit/icelab/games/cmsproject: CMSProject.as (+3 -1)
• src/edu/mit/icelab/games/cmsproject/engine: GameScreen.as (+1 -1)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+9 -5), MainGameScreen.as (+3 -2), MapScreen.as (new 85)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial1.as (+25 -17), Tutorial2.as (+8 -3), Tutorial3.as (new 245), Tutorial4.as (new 246)

culim 2011-12-14 11:50 #14 Rev.: 26

integrated new npcs

169 lines of code changed in 13 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/engine: GameEngine.as (+3 -1)
• src/edu/mit/icelab/games/cmsproject/objects: NPC.as (new 47), NPCAngler.as (new 20), NPCHorse.as (new 20), NPCJelly.as (new 20), NPCShark.as (+4 -19)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+20 -14)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial.as (+6), Tutorial1.as (+12), Tutorial2.as (+17 -4)

culim 2011-12-14 11:21 #13 Rev.: 25

added new npcs

0 lines of code changed in 5 files:

• bin-debug: CMSProject.swf (changed)
• res: GameAssets.fla (changed)
• res/fla: anglerfish.fla (new), horse.fla (new), jelly.fla (new)

culim 2011-12-14 04:28 #12 Rev.: 24

added posing.

30 lines of code changed in 7 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (+2)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+8 -1), LoginScreen.as (+16 -3), MainGameScreen.as (+4)

culim 2011-12-14 03:40 #11 Rev.: 23

gradient filters

255 lines of code changed in 9 files:

• .actionScriptProperties (+1 -1)
• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject: CMSProject.as (+14 -1)
• src/edu/mit/icelab/games/cmsproject/objects: MoodColorObject.as (new 37)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+8 -1), LoginScreen.as (new 48), MainGameScreen.as (+147 -3)

culim 2011-12-08 16:22 #10 Rev.: 22

removed redundant files

0 lines of code changed in 5 files:

• octopusflash5: aggressive5.fla (del), confused5.fla (del), neutral5.fla (del), oblivious5.fla (del), suspicious5.fla (del)

culim 2011-12-07 12:30 #9 Rev.: 21

added second track

462 lines of code changed in 8 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• octopus: suspicious5.fla (new)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+8 -2)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial.as (-193), Tutorial1.as (new 227), Tutorial2.as (new 227)

culim 2011-12-07 06:21 #8 Rev.: 20

updates.

4 lines of code changed in 5 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+1 -1)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial.as (+3 -3)

culim 2011-12-07 06:10 #7 Rev.: 19

scnario entered.

393 lines of code changed in 14 files:

• .actionScriptProperties (+1), .project (+4 -3)
• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/engine: GameAssetManager.as (+11), GameEngine.as (+1 -1)
• src/edu/mit/icelab/games/cmsproject/objects: DialogBar.as (+55 -2), NPCShark.as (+13 -1), OctopusCharacter.as (+10)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+16)
• src/edu/mit/icelab/games/cmsproject/tutorial: Tutorial.as (new 221)
• src/edu/mit/icelab/games/cmsproject/xml: EncountersXMLObject.as (new 34), XMLObject.as (new 27)

culim 2011-12-07 03:34 #6 Rev.: 18

Added text and frame to dialog box.

49 lines of code changed in 4 files:

• bin-debug: CMSProject.swf (changed), GameAssets.swf (changed)
• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/objects: DialogBar.as (+49 -9)

culim 2011-12-07 02:52 #5 Rev.: 17

updates to dialog bar

74 lines of code changed in 3 files:

• res: GameAssets.fla (changed)
• src/edu/mit/icelab/games/cmsproject/objects: DialogBar.as (+62)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (+12 -2)

culim 2011-12-07 02:34 #4 Rev.: 16

source code updates.

8 lines of code changed in 3 files:

• src/edu/mit/icelab/games/cmsproject: CMSProject.as (+2 -1)
• src/edu/mit/icelab/games/cmsproject/engine: GameObject.as (-4), GameScreen.as (+6 -2)

culim 2011-12-07 02:34 #3 Rev.: 15

Removed unwanted files

0 lines of code changed in 25 files:

• res: acdc.jpg (del), aliciakeys.jpg (del), avengedsevenfold.jpg (del), avrillavigne.jpg (del), backstreetboys.jpg (del), blackeyedpeas.jpg (del), blink182.jpg (del), cherylcole.jpg (del), coldplay.jpg (del), davidguetta.jpg (del), gorillaz.jpg (del), greenday.jpg (del), jasonmraz.jpg (del), katyperry.jpg (del), kingsofleon.jpg (del), ladygaga.jpg (del), linkinpark.jpg (del), maroon5.jpg (del), muse.jpg (del), music.jpg (del), oasis.jpg (del), redhotchillipeppers.jpg (del), systemofadown.jpg (del), taylorswift.jpg (del), thekillers.jpg (del)

culim 2011-12-07 02:32 #2 Rev.: 14

Updates to mimesis.

218 lines of code changed in 25 files:

• shark.fla (new)
• octopus: AuthortimeSharedAssets.fla (new), aggressive5.fla (new), confused5.fla (new), neutral5.fla (new), oblivious5.fla (new), octopus.fla (new), octopus2.fla (new)
• octopusflash5: aggressive5.fla (new), confused5.fla (new), neutral5.fla (new), oblivious5.fla (new), suspicious5.fla (new)
• res: aggressive5.fla (new), bg.fla (new), bgtest5.fla (new), confused5.fla (new), neutral5.fla (new), oblivious5.fla (new), shark.fla (new), suspicious5.fla (new)
• src/edu/mit/icelab/games/cmsproject/objects: DialogBar.as (new 25), NPCShark.as (new 30), OctopusCharacter.as (new 86)
• src/edu/mit/icelab/games/cmsproject/screens: EncounterScreen.as (new 77)

culim 2011-12-01 15:20 #1 Rev.: 11

Adding cms project into the repository

2903 lines of code changed in 73 files:

• .actionScriptProperties (new 35), .project (new 17)
• .settings: org.eclipse.core.resources.prefs (new 3)
• bin-debug: CMSProject.html (new 105), CMSProject.swf (new), GameAssets.swf (new), playerProductInstall.swf (new), swfobject.js (new 777)
• bin-debug/history: history.css (new 6), history.js (new 710), historyFrame.html (new 29)
• res: GameAssets.fla (new), acdc.jpg (new), aliciakeys.jpg (new), avengedsevenfold.jpg (new), avrillavigne.jpg (new), backstreetboys.jpg (new), blackeyedpeas.jpg (new), blink182.jpg (new), cherylcole.jpg (new), coldplay.jpg (new), davidguetta.jpg (new), gorillaz.jpg (new), greenday.jpg (new), jasonmraz.jpg (new), katyperry.jpg (new), kingsofleon.jpg (new), ladygaga.jpg (new), linkinpark.jpg (new), maroon5.jpg (new), muse.jpg (new), music.jpg (new), oasis.jpg (new), redhotchillipeppers.jpg (new), systemofadown.jpg (new), taylorswift.jpg (new), thekillers.jpg (new)
• res/images: acdc.jpg (new), aliciakeys.jpg (new), avengedsevenfold.jpg (new), avrillavigne.jpg (new), backstreetboys.jpg (new), blackeyedpeas.jpg (new), blink182.jpg (new), cherylcole.jpg (new), coldplay.jpg (new), davidguetta.jpg (new), gorillaz.jpg (new), greenday.jpg (new), jasonmraz.jpg (new), katyperry.jpg (new), kingsofleon.jpg (new), ladygaga.jpg (new), linkinpark.jpg (new), maroon5.jpg (new), muse.jpg (new), music.jpg (new), oasis.jpg (new), redhotchillipeppers.jpg (new), systemofadown.jpg (new), taylorswift.jpg (new), thekillers.jpg (new)
• src/edu/mit/icelab/games/cmsproject: CMSProject.as (new 82)
• src/edu/mit/icelab/games/cmsproject/engine: GameAssetManager.as (new 140), GameEngine.as (new 96), GameObject.as (new 77), GameScreen.as (new 67)
• src/edu/mit/icelab/games/cmsproject/music: MusicElement.as (new 104)
• src/edu/mit/icelab/games/cmsproject/objects: Button.as (new 69), InfoPanel.as (new 47), LeftPanel.as (new 28), SwapPanel.as (new 73)
• src/edu/mit/icelab/games/cmsproject/screens: MainGameScreen.as (new 438)