Commits · b0d2692f7bce08307e5c69a7d8b96bddf6835144 · Hacksaar / Haxotel

01 Aug, 2014 33 commits
- remove prompts and other annoying stuff from eliza · b0d2692f
  Ralf authored Aug 01, 2014
  
  b0d2692f
- add perl eliza · cf773a2c
  Ralf authored Aug 01, 2014
  
  cf773a2c
- euclid grammar and blocks move · 80d2bd44
  Constantin authored Aug 01, 2014
  
  80d2bd44
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · 19d129d2
  Constantin authored Aug 01, 2014
  
  19d129d2
- euclid: grammar fixes · 70db79db
  Constantin authored Aug 01, 2014
  
  70db79db
- Fix log spacing · 61fa76d2
  Ralf authored Aug 01, 2014
  
  61fa76d2
- Merge branch 'npctest' · a047cdf4
  Constantin authored Aug 01, 2014
  
  a047cdf4
- more questions for euclid · cca602b1
  Constantin authored Aug 01, 2014
  
  cca602b1
- Euclid works · 0cb7567f
  Constantin authored Aug 01, 2014
  
  0cb7567f
- much npc stuff · 86e8da4b
  Constantin authored Aug 01, 2014
  
  86e8da4b
- split lines when logging · 9406eed0
  Ralf authored Aug 01, 2014
  
  9406eed0
- time in log · 5269f460
  Ralf authored Aug 01, 2014
  
  5269f460
- Merge branch 'master' of https://git.hacksaar.de/hacksaar/haxotel · 9cc99edf
  Ralf authored Aug 01, 2014
  
  9cc99edf
- more consistent logging · 1d1086b4
  Ralf authored Aug 01, 2014
  
  1d1086b4
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · bd114a25
  Constantin authored Aug 01, 2014
  
  bd114a25
- better ui · 0450200b
  Constantin authored Aug 01, 2014
  
  0450200b
- Merge branch 'master' of https://git.hacksaar.de/hacksaar/haxotel · 3c0b6901
  Ralf authored Aug 01, 2014
  
  3c0b6901
- filter out \r · 8120c09f
  Ralf authored Aug 01, 2014
  
  8120c09f
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · b0501296
  Constantin authored Aug 01, 2014
  
  b0501296
- stuff · d8075d34
  Constantin authored Aug 01, 2014
  
  d8075d34
- typos · bdb27958
  Ralf authored Aug 01, 2014
  
  bdb27958
- some small fixes · 079661b2
  Ralf authored Aug 01, 2014
  
  079661b2
- stoooopid buuuaags · 67a1ab54
  Constantin authored Aug 01, 2014
  
  67a1ab54
- ignore SIGINT · a1b4bea1
  Ralf authored Aug 01, 2014
  
  a1b4bea1
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · 576e15ac
  Constantin authored Aug 01, 2014
  
  576e15ac
- treasure handling · 66e4ec86
  Ralf authored Aug 01, 2014
  
  66e4ec86
- initial treasure placement · 26b196bc
  Constantin authored Aug 01, 2014
  
  26b196bc
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · 0e9065c0
  Constantin authored Aug 01, 2014
```
Conflicts:
	player.py
```
  0e9065c0
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · 7e65c144
  Constantin authored Aug 01, 2014
  
  7e65c144
- obstinacy · 62f391ea
  Constantin authored Aug 01, 2014
  
  62f391ea
- people can actually look around! · a3564202
  Ralf authored Aug 01, 2014
  
  a3564202
- Tell people they're alone when they are · 590f6419
  Ralf authored Aug 01, 2014
  
  590f6419
- make walls a thing · b483dfcd
  Ralf authored Aug 01, 2014
  
  b483dfcd
31 Jul, 2014 7 commits
- treasure · 9d20f69f
  Constantin authored Aug 01, 2014
  
  9d20f69f
- Merge branch 'master' of https://git.hacksaar.de/hacksaar/haxotel · 92f53029
  Ralf authored Aug 01, 2014
```
Conflicts:
	player.py
```
  92f53029
- some more synonymes · d39f790c
  Ralf authored Aug 01, 2014
  
  d39f790c
- fix conny's brackets · f514be2f
  Ralf authored Aug 01, 2014
  
  f514be2f
- fix conny's brackets · c908f621
  Ralf authored Aug 01, 2014
  
  c908f621
- Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel · 438bcf07
  Constantin authored Aug 01, 2014
  
  438bcf07
- functional horror code to fix stuff somehow · 325c3f7d
  Constantin authored Aug 01, 2014
  
  325c3f7d