This branch,CarlosSprint34, is to progress while others are integrating.
Created several files in rifle concept art and created rifle_v1.blend for
issue #181:

 - The new files in concept art are some pictures I found, they are being
   used by me as an inspiration to make the mesh for the rifle.
 - rifle_v1.blend is the prototype "v1" for the rifle. Right now it's only
   the handle and the hammer.
Delete useless file (#186)
rifle_v1.blend edited for issue #181:

 - Now the objects for the trigger has been made, the "body" is not
   finished yet.
rifle_v1.blend edited for issue #181:

 - Worked on "body" of the rifle. Not finished yet.
rifle_v1.blend edited for issue #181:

 - I'm done with the 3D modeling. Next step: UV maps.
rifle_v1.blend edited, Bullets files created for issues #181:

 - I forgot to do the "sword", now I'm done with 3D modeling, for sure.
 - Also unwrapped the "bullet" and made the material and textures for it.
Edited rifle_v1.blend for issue #181:

 - The only element not unwrapped is the blade. Also I texturized the
   "battery".
 - Yes, when I said "bullet" before I meant "battery".
Merge remote-tracking branch 'origin/dev' into Grupo-A
Recuperar Scenes Sprint 3 (Issue #186)

@casals90 te he vuelto a dejar las escenas del sprint3 por si las
quieres re-aprovechar, para el Sprint4, aunque es mejor que vuelvas a
generar desde Nivel1 o Nivel2 para el Sprint4 :)
Edited rifle_v1.blend and a bunch of textures for issue #181:

 - Everything has been Unwrapped.
 - Also I did the texture of the "rotating blade"
Merge branch 'Carlos-Sprints34' into Grupo-A
Merge remote-tracking branch 'origin/dev' into Grupo-A
rifle_v1.blend edited and a bunch of textures created for issue #181:

 - The rifle is not entirely done. It's texture is just temporal, next one
   must feel more real.
Merge branch 'Grupo-A' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-A
Pruebas para solucionar la Issue #231

La idea es generar una camara secundaria y usar Layers para mantener los
objetos por encima del resto del entorno y así crear la ilusión.

http://answers.unity3d.com/questions/41298/fps-gun-clippes-through-walls.html

Parece qué funciona :)
Implementada la solución de la Issue #231

Hay un problema con el HUD, ahora se pinta por debajo del modelo del
player. Hay que verlo en detalle con los del grupo E
Arreglado el pintado del HUD (Issue #231)

El HUD ya se visualiza "ontop" del modelo del player. Era un tema de las
"depths" de las cámaras.
#285 Nueva carpeta con los meshes

Creado un nuevo mesh, con todas las partes posibles del proyecto (dos
brazos, rifle, etc).
Necesito que se fixeen las texturas, me salen los brazos blancos xD
CARLOS! HALP!
Gracias!
Mejorar collider del player (Issue #231)
Edited rifle_v1.blend (also deleted .blend1/2 backup files) for issue
#285:

 - Some textures issues and position of the blades fixed.