Permalink
Browse files

Solving Merge issues

  • Loading branch information...
1 parent a725109 commit d6646ded3d1a8dd66fa3378ab9f9bd33aa980cc4 @tpastor tpastor committed May 5, 2012
Showing with 215 additions and 177 deletions.
  1. +210 −177 ArtemisXBOX_PHONE7/Entity.cs
  2. +5 −0 Artemis_XNA_INDEPENDENT/Entity.cs
  3. BIN artemis.suo
Oops, something went wrong.

3 comments on commit d6646de

@tpastor
Collaborator
tpastor commented on d6646de May 5, 2012

Tem que pegar este ultimo commit e verificar se a versao MonoTouch quebra.
Testei no wp7/xbox e pc

->Overview de tudo q foi alterado nos ultimos commits
More c# Like
Adicionei VARIOS asserts no codigo (so rodam em modo debug, em release eles "somem")
deixei internal todos os metodos redundandes e todos aqueles que o usuario NAO deve chamar
botei inumerable na bag

@tpastor
Collaborator
tpastor commented on d6646de May 5, 2012

tenta botar essa versao no starwarrior e ver oq acontece =P

@thelinuxlich
Owner

podeixar

Please sign in to comment.