summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-11-26 20:52:38 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-11-26 20:53:39 -0300
commit2c59f4307245cfa2298145910dff5428c2af9fbe (patch)
tree22fcdfb713f3a27280ad62f41188d2b5680cf3fc
parented4e1c0a7049941599430cffbbaccd3dea6a5129 (diff)
Move {gravity,motion}.lua from scripts/bola/motion to scripts/bola
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua4
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/gravity.lua (renamed from src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion/gravity.lua)0
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua (renamed from src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion/motion.lua)0
3 files changed, 2 insertions, 2 deletions
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
index 31818af..c54f601 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
@@ -17,8 +17,8 @@ function love.load()
}
bolaAnimation = require 'scripts.bola.animation'
- bolaMotion = require 'scripts.bola.motion.motion'
- bolaGravity = require 'scripts.bola.motion.gravity'
+ bolaMotion = require 'scripts.bola.motion'
+ bolaGravity = require 'scripts.bola.gravity'
end
function love.keypressed(key)
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion/gravity.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/gravity.lua
index 98ba985..98ba985 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion/gravity.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/gravity.lua
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion/motion.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
index 89d3832..89d3832 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion/motion.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua