Merge server with github repository

Browse Source

Pas mal de changement n’ont pas été pushé sur le github du serveur,
voici l’occasion de faire une bonne synchronisation :)

...

This commit is contained in:

Ombridride 2014-11-16 22:23:16 +01:00

parent 87b1cd745f

commit 2e895a7790

4474 changed files with 1121 additions and 1097 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

minetestforfun_game/mods

boats

README.txtdepends.txtinit.lua

models

boat.x

textures

boat_inventory.pngboat_wield.png

creative

README.txtdepends.txtinit.lua

default

README.txtaliases.luacommands.luacraftitems.lua

models

character.blendcharacter.pngcharacter.x

player.lua

sounds

default_break_glass.1.oggdefault_break_glass.2.oggdefault_break_glass.3.oggdefault_cool_lava.1.oggdefault_cool_lava.2.oggdefault_cool_lava.3.oggdefault_dig_choppy.oggdefault_dig_cracky.oggdefault_dig_crumbly.oggdefault_dig_dig_immediate.oggdefault_dig_oddly_breakable_by_hand.oggdefault_dirt_footstep.1.oggdefault_dirt_footstep.2.oggdefault_dirt_footstep.3.oggdefault_dirt_footstep.4.oggdefault_dug_node.1.oggdefault_dug_node.2.oggdefault_glass_footstep.oggdefault_grass_footstep.1.oggdefault_grass_footstep.2.oggdefault_grass_footstep.3.oggdefault_grass_footstep.4.oggdefault_gravel_footstep.1.oggdefault_gravel_footstep.2.oggdefault_gravel_footstep.3.oggdefault_gravel_footstep.4.oggdefault_hard_footstep.1.oggdefault_hard_footstep.2.oggdefault_hard_footstep.3.oggdefault_hard_footstep.4.oggdefault_metal_footstep.1.oggdefault_metal_footstep.2.oggdefault_metal_footstep.3.oggdefault_metal_footstep.4.oggdefault_place_node.1.oggdefault_place_node.2.oggdefault_place_node.3.oggdefault_place_node_hard.1.oggdefault_place_node_hard.2.oggdefault_sand_footstep.1.oggdefault_sand_footstep.2.oggdefault_sand_footstep.3.oggdefault_sand_footstep.4.oggdefault_snow_footstep.1.oggdefault_snow_footstep.2.oggdefault_snow_footstep.3.oggdefault_snow_footstep.4.oggdefault_wood_footstep.1.oggdefault_wood_footstep.2.oggdefault_wood_footstep.3.oggdefault_wood_footstep.4.ogghealth_gain.ogghit.ogghit_death.ogglava.oggplayer_damage.1.oggplayer_damage.2.oggplayer_death.oggplayer_falling_damage.oggplayer_join.oggplayer_leave.oggwaterfall.ogg

tools.lua

doors

README.txtdepends.txt

sounds

door_close.oggdoor_open.ogg

textures

door_brown.pngdoor_glass.pngdoor_glass_a.pngdoor_glass_b.pngdoor_glass_side.pngdoor_grey.pngdoor_obsidian_glass.pngdoor_obsidian_glass_a.pngdoor_obsidian_glass_b.pngdoor_obsidian_glass_side.pngdoor_steel.pngdoor_steel_a.pngdoor_steel_b.pngdoor_trapdoor.pngdoor_trapdoor_side.pngdoor_wood.png

Show More

0

minetestforfun_game/mods/boats/README.txt Executable file → Normal file

0

minetestforfun_game/mods/boats/depends.txt Executable file → Normal file

0

minetestforfun_game/mods/boats/init.lua Executable file → Normal file

0

minetestforfun_game/mods/boats/models/boat.x Executable file → Normal file

0

minetestforfun_game/mods/boats/textures/boat_inventory.png Executable file → Normal file

Side by Side Swipe Overlay Before (image error) Size: 1.4 KiB After (image error) Size: 1.4 KiB

0

minetestforfun_game/mods/boats/textures/boat_wield.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 847 B After (image error) Size: 847 B

0

minetestforfun_game/mods/creative/README.txt Executable file → Normal file

0

minetestforfun_game/mods/creative/depends.txt Executable file → Normal file

0

minetestforfun_game/mods/creative/init.lua Executable file → Normal file

0

minetestforfun_game/mods/default/README.txt Executable file → Normal file

0

minetestforfun_game/mods/default/aliases.lua Executable file → Normal file

0

minetestforfun_game/mods/default/commands.lua Executable file → Normal file

0

minetestforfun_game/mods/default/craftitems.lua Executable file → Normal file

0

minetestforfun_game/mods/default/models/character.blend Executable file → Normal file

0

minetestforfun_game/mods/default/models/character.png Executable file → Normal file

Side by Side Swipe Overlay Before (image error) Size: 1.8 KiB After (image error) Size: 1.8 KiB

0

minetestforfun_game/mods/default/models/character.x Executable file → Normal file

0

minetestforfun_game/mods/default/player.lua Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_break_glass.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_break_glass.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_break_glass.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_cool_lava.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_cool_lava.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_cool_lava.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dig_choppy.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dig_cracky.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dig_crumbly.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dig_dig_immediate.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dirt_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dirt_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dirt_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dirt_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dug_node.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_dug_node.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_glass_footstep.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_grass_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_grass_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_grass_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_grass_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_gravel_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_gravel_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_gravel_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_gravel_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_hard_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_hard_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_hard_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_hard_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_metal_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_metal_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_metal_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_metal_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_place_node.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_place_node.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_place_node.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_place_node_hard.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_place_node_hard.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_sand_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_sand_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_sand_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_sand_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_snow_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_snow_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_snow_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_snow_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_wood_footstep.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_wood_footstep.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_wood_footstep.3.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/default_wood_footstep.4.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/health_gain.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/hit.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/hit_death.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/lava.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/player_damage.1.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/player_damage.2.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/player_death.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/player_falling_damage.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/player_join.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/player_leave.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/sounds/waterfall.ogg Executable file → Normal file

0

minetestforfun_game/mods/default/tools.lua Executable file → Normal file

0

minetestforfun_game/mods/doors/README.txt Executable file → Normal file

0

minetestforfun_game/mods/doors/depends.txt Executable file → Normal file

0

minetestforfun_game/mods/doors/sounds/door_close.ogg Executable file → Normal file

0

minetestforfun_game/mods/doors/sounds/door_open.ogg Executable file → Normal file

0

minetestforfun_game/mods/doors/textures/door_brown.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 82 B After (image error) Size: 82 B

0

minetestforfun_game/mods/doors/textures/door_glass.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 128 B After (image error) Size: 128 B

0

minetestforfun_game/mods/doors/textures/door_glass_a.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 204 B After (image error) Size: 204 B

0

minetestforfun_game/mods/doors/textures/door_glass_b.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 204 B After (image error) Size: 204 B

0

minetestforfun_game/mods/doors/textures/door_glass_side.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 82 B After (image error) Size: 82 B

0

minetestforfun_game/mods/doors/textures/door_grey.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 107 B After (image error) Size: 107 B

0

minetestforfun_game/mods/doors/textures/door_obsidian_glass.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 130 B After (image error) Size: 130 B

0

minetestforfun_game/mods/doors/textures/door_obsidian_glass_a.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 217 B After (image error) Size: 217 B

0

minetestforfun_game/mods/doors/textures/door_obsidian_glass_b.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 217 B After (image error) Size: 217 B

0

minetestforfun_game/mods/doors/textures/door_obsidian_glass_side.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 88 B After (image error) Size: 88 B

0

minetestforfun_game/mods/doors/textures/door_steel.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 132 B After (image error) Size: 132 B

0

minetestforfun_game/mods/doors/textures/door_steel_a.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 139 B After (image error) Size: 139 B

0

minetestforfun_game/mods/doors/textures/door_steel_b.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 121 B After (image error) Size: 121 B

0

minetestforfun_game/mods/doors/textures/door_trapdoor.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 350 B After (image error) Size: 350 B

0

minetestforfun_game/mods/doors/textures/door_trapdoor_side.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 173 B After (image error) Size: 173 B

0

minetestforfun_game/mods/doors/textures/door_wood.png Executable file → Normal file

Side by Side Swipe Before (image error) Size: 130 B After (image error) Size: 130 B

Some files were not shown because too many files have changed in this diff Show More