/ld27

To get this branch, use:
bzr branch /bzr/ld27

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-08-25 21:05:20 UTC
  • Revision ID: josh@9ix.org-20130825210520-2of9iq2uemncp336
overhaul collision and physics to fix an annoying collision resolution 
bug

Show diffs side-by-side

added added

removed removed

main.lua
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
 
6
--inspect = require 'inspect'
 
7
 
 
8
require 'sprite'
 
9
require 'util'
6
10
 
7
11
require 'version'
8
12
require 'player'
58
62
                 end
59
63
 
60
64
                 if not (DEBUG and the.console.visible) then
61
 
                    the.activeMaze:collide(the.player.collider)
 
65
                    --the.player.collider:collide(the.activeMaze)
62
66
                    the.player.collider:collide(the.activeGoal)
63
67
                 end
64
68
 
132
136
 
133
137
              if DEBUG then
134
138
                 self.console:watch('VERSION', 'VERSION')
 
139
                 self.console:watch('player.x', 'the.player.x')
 
140
                 self.console:watch('player.y', 'the.player.y')
135
141
 
136
142
                 -- back off that dark overlay a bit
137
143
                 self.console.fill.fill[4] = 75