Commits · a07107383aa76c72d83e2bac6612837771aa9faf · genie_logiciel_2015 / the_dungeon_project

01 Jan, 2016 9 commits
- Merge remote-tracking branch 'origin/master' · a0710738
  Colin Thomas authored Jan 01, 2016
  
  a0710738
- Adding of comments and of animations management in game panel · 6622edef
  Colin Thomas authored Jan 01, 2016
  
  6622edef
- Correct bug from a3303303 · 6dfd7399
  Fardale authored Jan 01, 2016
  
  6dfd7399
- Merge branch 'master' of gitlab.crans.org:genie_logiciel_2015/the_dungeon_project · f3aa8531
  Fardale authored Jan 01, 2016
  
  f3aa8531
- Log system log4j + example in Igniter_Main.java · a3303303
  Fardale authored Jan 01, 2016
  
  a3303303
- Adding of classes necessary to make animations (unused for now) · 66204c4f
  Colin Thomas authored Jan 01, 2016
  
  66204c4f
- Minor documentations adds · d5d379a4
  Colin Thomas authored Jan 01, 2016
  
  d5d379a4
- Added a GameOver panel to the swing gui · 2c6a98dd
  Thomas Dupriez authored Jan 01, 2016
  
  2c6a98dd
- Modified ServerLoop so that it actually does what it is supposed to do when processing Events · b0fc6083
  Thomas Dupriez authored Jan 01, 2016
  
  b0fc6083
31 Dec, 2015 22 commits
- entities spawn is now checked is speciesArray (see issue) · 3d48f0f6
  Lucas Delcros authored Dec 31, 2015
  
  3d48f0f6
- Merge branch 'master' of gitlab.crans.org:genie_logiciel_2015/the_dungeon_project · ed3617c8
  Arnaud Guerquin authored Dec 31, 2015
  
  ed3617c8
- Start split Server/Client event · 7b72c26d
  Arnaud Guerquin authored Dec 31, 2015
  
  7b72c26d
- Trigger end. Test needed · f3c25cb0
  Arnaud Guerquin authored Dec 31, 2015
  
  f3c25cb0
- Removed unreacheable code · 868f22c7
  Arnaud Guerquin authored Dec 31, 2015
  
  868f22c7
- entities spawn on water bug solved · 8414b73e
  Lucas Delcros authored Dec 31, 2015
  
  8414b73e
- added test for water spawning · 6f424fa3
  Lucas Delcros authored Dec 31, 2015
  
  6f424fa3
- start to resolve spawnning on water bug · a0ebf39a
  Lucas Delcros authored Dec 31, 2015
  
  a0ebf39a
- Merge remote-tracking branch 'origin/master' · 39efe8a3
  Thomas Dupriez authored Dec 31, 2015
  
  39efe8a3
- Moved most of the conversions between Core and Graphics coordinate systems... · 8d39557c
  Thomas Dupriez authored Dec 31, 2015
```
Moved most of the conversions between Core and Graphics coordinate systems into GraphicalBridgeConfiguration
```
  8d39557c
- Le parser est relié à l'interface graphique. · b2134fa4
  Enteocline authored Dec 31, 2015
  
  b2134fa4
- Javadoc for the new controler. · 0fb946aa
  Yann Ramusat authored Dec 31, 2015
  
  0fb946aa
- Merge branch 'master' of gitlab.crans.org:genie_logiciel_2015/the_dungeon_project · bcc66c9d
  Yann Ramusat authored Dec 31, 2015
  
  bcc66c9d
- Fusion of the two controlers. · c2bbc8f4
  Yann Ramusat authored Dec 31, 2015
  
  c2bbc8f4
- Reverted TileScale to 32. This should not be equal to a graphic constant.... · 103ab6a1
  Arnaud Guerquin authored Dec 31, 2015
```
Reverted TileScale to 32. This should not be equal to a graphic constant. Those thing should be separated.
```
  103ab6a1
- Work on javadoc. · f3e8f66f
  Yann Ramusat authored Dec 31, 2015
  
  f3e8f66f
- Merge branch 'master' of gitlab.crans.org:genie_logiciel_2015/the_dungeon_project · fa0cf61c
  Yann Ramusat authored Dec 31, 2015
```
Conflicts:
	src/graphics/guiSkeleton/entityDisplayer/EntityDisplayer2.java
```
  fa0cf61c
- Some more unit tests and commented Entity2. · a1f7e083
  Yann Ramusat authored Dec 31, 2015
  
  a1f7e083
- Commented EntityDisplayer2 temporarily so that the project compiles · 3db9e6e4
  Thomas Dupriez authored Dec 31, 2015
  
  3db9e6e4
- serveur d'intégration minimal · 5106d047
  Fardale authored Dec 31, 2015
  
  5106d047
- added comments on the tests for core/zone · 02066099
  Gwendoline authored Dec 31, 2015
  
  02066099
- I created a new version of Entity Display, in order to have a class for every... · 0637e5f2
  Gwendoline authored Dec 31, 2015
```
I created a new version of Entity Display, in order to have a class for every anmation type. I don't think it is correct but I can't compile the project for now so
```
  0637e5f2
30 Dec, 2015 9 commits
- Comments and Javadoc. · 9b23cdca
  Yann Ramusat authored Dec 30, 2015
  
  9b23cdca
- New package for Alpha* and some unit tests for AI_Controler. · 07b89900
  Yann Ramusat authored Dec 30, 2015
  
  07b89900
- Fin de la hiérarchie des entités. L'AIEntity de base est mise abstract. Please use BasicEntity now. · a57d6d38
  Yann Ramusat authored Dec 30, 2015
  
  a57d6d38
- Add Agressive and Defender AIs. · c4d62e54
  Yann Ramusat authored Dec 30, 2015
  
  c4d62e54
- Fix3 · 707bf0b8
  Guillaume Hocquet authored Dec 30, 2015
  
  707bf0b8
- Lava sprite · 04d493b8
  Arnaud Guerquin authored Dec 30, 2015
  
  04d493b8
- Mentali added ? · af4346ec
  Arnaud Guerquin authored Dec 30, 2015
  
  af4346ec
- Broken · 5cbad819
  Arnaud Guerquin authored Dec 30, 2015
  
  5cbad819
- Merge branch 'master' of gitlab.crans.org:genie_logiciel_2015/the_dungeon_project · af11ee11
  Yann Ramusat authored Dec 30, 2015
  
  af11ee11