{"push_id":1125198791,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"7909b967c2d49f5f09d29d464623e8830a31e6c9","before":"2f01a1a85a5458ebbe3b45402da95e349c4d8dbf","commits":[{"sha":"7909b967c2d49f5f09d29d464623e8830a31e6c9","author":{"email":"219b36cd45e9445b958ca7a8e87ac4f4c1818fec@192.168.123.37","name":"Olivier"},"message":"Merge origin/master\n\nConflicts:\n\t.gitignore\n\tbuild.xml\n\tlib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar\n\tlib/jinput.jar\n\tlib/lwjgl.jar\n\tlib/lwjgl_util.jar\n\tlib/nblibraries.properties\n\tlib/slick.jar\n\tmanifest.mf\n\tnbproject/build-impl.xml\n\tnbproject/genfiles.properties\n\tnbproject/project.properties\n\tnbproject/project.xml\n\tsrc/ca/qc/bdeb/info204/Game.java\n\tsrc/entities/Entity.java\n\tsrc/entities/Mob.java\n\tsrc/entities/Player.java\n\tsrc/gameEngine/Model.java\n\tsrc/maps/MiniMap.java\n\tsrc/maps/WorldMap.java\n\tsrc/playerEngine/EquipementInventory.java\n\tsrc/playerEngine/Inventory.java\n\tsrc/playerEngine/PlayerEngine.java\n\tsrc/res/maps/New folder/ItemsAndEffects.zip\n\tsrc/res/maps/New folder/ItemsAndEffects/credits.txt\n\tsrc/res/maps/New folder/ItemsAndEffects/effects.png\n\tsrc/res/maps/New folder/ItemsAndEffects/items1.png\n\tsrc/res/maps/New folder/LPC Base Assets.zip\n\tsrc/res/maps/New folder/LPC Base Assets/CREDITS.TXT\n\tsrc/res/maps/New folder/LPC Base Assets/UI/frame.gif\n\tsrc/res/maps/New folder/LPC Base Assets/UI/lpc_home_cup.gif\n\tsrc/res/maps/New folder/LPC Base Assets/UI/shadow.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/bat.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/bee.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/big_worm.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/eyeball.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/ghost.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/man_eater_flower.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/pumpking.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/slime.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/small_worm.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/monsters/snake.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/female_hurt.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/female_slash.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/female_spellcast.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/female_walkcycle.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/hairfemale.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/hairfemale.xcf\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/hairmale.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/hairmale.xcf\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_hurt.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_hurt_pants.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_pants.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_slash.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_slash_pants.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_spellcast.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_spellcast_pants.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/male_walkcycle.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/princess.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/princess.xcf\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/soldier.png\n\tsrc/res/maps/New folder/LPC Base Assets/sprites/people/soldier_altcolor.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/barrel.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/brackish.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/bridges.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/buckets.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/cabinets.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/castle_lightsources.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/castle_outside.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/castlefloors.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/castlefloors_outside.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/castlewalls.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/cement.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/cementstair.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/chests.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/country.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/cup.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/dirt.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/dirt2.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/dungeon.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/grass.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/grassalt.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/hole.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/holek.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/holemid.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/house.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/house_7.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/inside.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/kitchen.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/lava.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/lavarock.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/mountains.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/rock.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/signs.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/stairs.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/treetop.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/trunk.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/victoria.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/water.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/waterfall.png\n\tsrc/res/maps/New folder/LPC Base Assets/tiles/watergrass.png\n\tsrc/res/maps/New folder/LPC_cavern_ruins.zip\n\tsrc/res/maps/New folder/LPC_cavern_ruins/cavern_ruins.png\n\tsrc/res/maps/New folder/LPC_cavern_ruins/credits.txt\n\tsrc/res/maps/New folder/LPC_cavern_ruins/preview0.png\n\tsrc/res/maps/New folder/LPC_cavern_ruins/preview1.png\n\tsrc/res/maps/New folder/LPC_cavern_ruins/preview2.png\n\tsrc/res/maps/New folder/LPC_city_inside.zip\n\tsrc/res/maps/New folder/LPC_city_inside/city_inside.png\n\tsrc/res/maps/New folder/LPC_city_inside/credits.txt\n\tsrc/res/maps/New folder/LPC_city_inside/preview0.png\n\tsrc/res/maps/New folder/LPC_city_inside/preview1.png\n\tsrc/res/maps/New folder/LPC_city_inside/preview2.png\n\tsrc/res/maps/New folder/LPC_city_inside/preview3.png\n\tsrc/res/maps/New folder/LPC_dongeon/boil.gif\n\tsrc/res/maps/New folder/LPC_dongeon/boil.png\n\tsrc/res/maps/New folder/LPC_dongeon/credit.txt\n\tsrc/res/maps/New folder/LPC_dongeon/dungeon10.png\n\tsrc/res/maps/New folder/LPC_dongeon/dungeonex.png\n\tsrc/res/maps/New folder/LPC_dongeon/fire.gif\n\tsrc/res/maps/New folder/LPC_dongeon/fire.png\n\tsrc/res/maps/New folder/LPC_forest.zip\n\tsrc/res/maps/New folder/LPC_forest/credits.txt\n\tsrc/res/maps/New folder/LPC_forest/forest_tiles.png\n\tsrc/res/maps/New folder/LPC_forest/preview.png\n\tsrc/res/maps/New folder/NessTilesPack.zip\n\tsrc/res/maps/New folder/autre/PathAndObjects.png\n\tsrc/res/maps/New folder/autre/signpost-outsidestuff.png\n\tsrc/res/maps/New folder/dungeon.zip\n\tsrc/res/maps/New folder/housesetx1.zip\n\tsrc/res/maps/New folder/housesetx2.zip\n\tsrc/res/maps/New folder/housesetx3.zip\n\tsrc/res/maps/New folder/lpc_daneeklu.tar\n\tsrc/res/maps/New folder/lpc_daneeklu.tar.gz\n\tsrc/res/maps/New folder/lpc_daneeklu.tar_\n\tsrc/res/maps/New folder/submission_daneeklu/character/grab_sheet.png\n\tsrc/res/maps/New folder/submission_daneeklu/character/sword_sheet_128.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/magic_firelion_big.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/magic_firelion_sheet.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/magic_iceshield_sheet.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/magic_snakebite_sheet.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/magic_torrentacle.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/turtleshell_front.png\n\tsrc/res/maps/New folder/submission_daneeklu/magic/turtleshell_side.png\n\tsrc/res/maps/New folder/submission_daneeklu/magics_preview.gif\n\tsrc/res/maps/New folder/submission_daneeklu/readme.txt\n\tsrc/res/maps/New folder/submission_daneeklu/tileset_preview.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/farming_fishing.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/fence.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/fence_alt.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/plants.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/plowed_soil.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/reed.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/sand.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/sandwater.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/tallgrass.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/wheat.png\n\tsrc/res/maps/New folder/submission_daneeklu/tilesets/youngwheat.png\n\tsrc/res/maps/New folder/submission_daneeklu/ui/scrollsandblocks.png\n\tsrc/res/maps/New folder/submission_daneeklu/ui_preview.png\n\tsrc/res/maps/New folder/tiles/blue_carpet.png\n\tsrc/res/maps/New folder/tiles/blue_stones_on_dirt.png\n\tsrc/res/maps/New folder/tiles/brown_tiles.png\n\tsrc/res/maps/New folder/tiles/chess_tiles.png\n\tsrc/res/maps/New folder/tiles/cliff_dirt.png\n\tsrc/res/maps/New folder/tiles/cliff_grass.png\n\tsrc/res/maps/New folder/tiles/cliff_stones.png\n\tsrc/res/maps/New folder/tiles/dark_tiles.png\n\tsrc/res/maps/New folder/tiles/dirt.png\n\tsrc/res/maps/New folder/tiles/fency_purple_tiles.png\n\tsrc/res/maps/New folder/tiles/forest.png\n\tsrc/res/maps/New folder/tiles/forest_heavy.png\n\tsrc/res/maps/New folder/tiles/forest_light.png\n\tsrc/res/maps/New folder/tiles/grass.png\n\tsrc/res/maps/New folder/tiles/green_carpet.png\n\tsrc/res/maps/New folder/tiles/magic_tiles.png\n\tsrc/res/maps/New folder/tiles/mud.png\n\tsrc/res/maps/New folder/tiles/red_carpet.png\n\tsrc/res/maps/New folder/tiles/rubble.png\n\tsrc/res/maps/New folder/tiles/shallow_water.png\n\tsrc/res/maps/New folder/tiles/shallow_water_anim.png\n\tsrc/res/maps/New folder/tiles/shallow_water_back.png\n\tsrc/res/maps/New folder/tiles/source.txt\n\tsrc/res/maps/New folder/tiles/stones_on_dirt.png\n\tsrc/res/maps/New folder/tiles/temple_floor.png\n\tsrc/res/maps/New folder/tiles/thick_grass.png\n\tsrc/res/maps/New folder/tiles/thin_grass.png\n\tsrc/res/maps/New folder/tiles/tiles_blood.png\n\tsrc/res/maps/New folder/tiles/tiles_broken.png\n\tsrc/res/maps/New folder/tiles/tiles_mildew.png\n\tsrc/res/maps/New folder/tiles/wooden_bridge_horizontal.png\n\tsrc/res/maps/New folder/tiles/wooden_bridge_horizontal_rail.png\n\tsrc/res/maps/New folder/tiles/wooden_bridge_vertical.png\n\tsrc/res/maps/New folder/tiles/wooden_bridge_vertical_rail.png\n\tsrc/res/maps/New folder/tileset.zip\n\tsrc/res/maps/New folder/tileset/example.tmx\n\tsrc/res/maps/New folder/tileset/grass-tiles-2-small.png\n\tsrc/res/maps/New folder/tileset/littleshrooms_0.png\n\tsrc/res/maps/New folder/tileset/qubodup-bush_0.png\n\tsrc/res/maps/New folder/tileset/qubodup-bush_berries_0.png\n\tsrc/res/maps/New folder/tileset/tree2-final.png\n\tsrc/res/maps/map_1-1.tmx\n\tsrc/res/native/OpenAL32.dll\n\tsrc/res/native/OpenAL64.dll\n\tsrc/res/native/jinput-dx8.dll\n\tsrc/res/native/jinput-dx8_64.dll\n\tsrc/res/native/jinput-raw.dll\n\tsrc/res/native/jinput-raw_64.dll\n\tsrc/res/native/libjinput-linux.so\n\tsrc/res/native/libjinput-linux64.so\n\tsrc/res/native/libjinput-osx.dylib\n\tsrc/res/native/liblwjgl.dylib\n\tsrc/res/native/liblwjgl.so\n\tsrc/res/native/liblwjgl64.so\n\tsrc/res/native/libopenal.so\n\tsrc/res/native/libopenal64.so\n\tsrc/res/native/lwjgl.dll\n\tsrc/res/native/lwjgl64.dll\n\tsrc/res/native/openal.dylib\n\tsrc/statesOfGame/MainMenu.java\n\tsrc/statesOfGame/Overworld.java","distinct":true,"url":"https://api.github.com/repos/TeamYOCO/Projet_Int-grateur_TeamYOCO/commits/7909b967c2d49f5f09d29d464623e8830a31e6c9"}]}
{"actor":{"display_login":"skyrunner1909"}}