Merge branch 'develop' of git://github.com/MovingBlocks/Terasology in…

…to audio_development Conflicts: src/org/terasology/game/modes/ModeMainMenu.java src/org/terasology/logic/characters/Player.java src/org/terasology/logic/entities/MovableEntity.java src/org/terasology/logic/manager/AudioManager.java
ayeijun · Mar 2, 2012 · bff800d · bff800d
2 parents b631576 + 5fd22fd
commit bff800d
Show file tree

Hide file tree

Showing 131 changed files with 2,767 additions and 3,085 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,12 @@ SAVED_WORLDS
 logs
 out
 .DS_Store
-.idea/workspace.xml
+Terasology.iml
+Terasology.ipr
+Terasology.iws
+.idea
 .classpath
 .project
 .settings
+.gradle
 bin
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/ant.xml b/.idea/ant.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/dictionaries/Immortius.xml b/.idea/dictionaries/Immortius.xml
diff --git a/.idea/dictionaries/bg.xml b/.idea/dictionaries/bg.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gant_config.xml b/.idea/gant_config.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/libraries/Libs.xml b/.idea/libraries/Libs.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml