Merge branch 'tessallation' into Mapping

This commit is contained in:
jbetzend 2014-03-05 15:10:17 +01:00
commit 23f75f7ff1
3 changed files with 2 additions and 4 deletions

View File

@ -1 +0,0 @@
dist/build/Pioneers/Pioneers

BIN
Pioneers Executable file

Binary file not shown.

View File

@ -34,6 +34,5 @@ executable Pioneers
linear >=1.3.1 && <1.4, linear >=1.3.1 && <1.4,
lens >=3.10.1 && <3.11, lens >=3.10.1 && <3.11,
SDL2 >= 0.1.0, SDL2 >= 0.1.0,
time >=1.4.0 && <1.5, time >=1.4.0 && <1.5
fclabels >=2.0.0 && <3

View File

@ -9,7 +9,6 @@ import Data.Time (UTCTime)
import Linear.Matrix (M44) import Linear.Matrix (M44)
import Control.Monad.RWS.Strict (RWST) import Control.Monad.RWS.Strict (RWST)
import Control.Lens import Control.Lens
import Data.Label
--Static Read-Only-State --Static Read-Only-State
@ -115,4 +114,4 @@ $(makeLenses ''Position)
$(makeLenses ''Env) $(makeLenses ''Env)
type Pioneers = RWST Env () State IO type Pioneers = RWST Env () State IO