Commits · master · Erocs / veloren

Browse files

Apr 29, 2019
- Merge branch 'force-clean-code' into 'master' · b573567d
  Marcel authored Apr 29, 2019
  b573567d
- Clean code must not fail · 4a87da0b
  Forest Anderson authored Apr 29, 2019 and Marcel committed Apr 29, 2019
  
  4a87da0b
- Merge branch 'clean-all-code' into 'master' · 4be2d5d8
  Forest Anderson authored Apr 29, 2019
  4be2d5d8
- Ran fmt on codebase · 8b710f67
  Forest Anderson authored Apr 29, 2019
  
  8b710f67
- Merge branch 'fix-ci-artifact-upload' into 'master' · bca44a49
  Forest Anderson authored Apr 29, 2019
  bca44a49
- Copy files after tar/zip for CI artifacts · f94d7758
  Forest Anderson authored Apr 29, 2019
  
  f94d7758
- Merge branch 'clean-up-gitignore' into 'master' · 0c76115a
  Forest Anderson authored Apr 29, 2019
  0c76115a
- Merge branch 'fix-ci-artifact-upload' into 'master' · 7fbcb857
  Forest Anderson authored Apr 29, 2019
  7fbcb857
- Removed improper artifact folder · 3f6bb903
  Forest Anderson authored Apr 29, 2019
  
  3f6bb903
- Merge branch 'master' into 'master' · 9fbcec3d
  Dominik Broński authored Apr 29, 2019
  9fbcec3d
- New Settings Window and Map Window · c9907eb9
  Monty Marz authored Apr 29, 2019 and Dominik Broński committed Apr 29, 2019
  
  c9907eb9
- Fix gitignore and delete gitignores in subdirs · b4f7b69f
  Timo Kösters authored Apr 29, 2019
  
  b4f7b69f
- Merge branch 'ao-artifact-fix' into 'master' · 782e7594
  Forest Anderson authored Apr 29, 2019
  782e7594
- Merge branch 'log' into 'master' · 21f0fbdd
  Forest Anderson authored Apr 29, 2019
  21f0fbdd
- Add VOXYGEN_LOG env variable to allow detailed terminal logging. · 036854ff
  Erocs authored Apr 29, 2019 and Forest Anderson committed Apr 29, 2019
  
  036854ff
- Line endings are hard · 1d7ca2b5
  robojumper authored Apr 29, 2019
  
  1d7ca2b5
- Fix occlusion artifact · 0bfcdb38
  robojumper authored Apr 29, 2019
  
  0bfcdb38
- Merge branch 'gitlab-ci-hotfixes' into 'master' · 1c72542a
  Forest Anderson authored Apr 29, 2019
  1c72542a
- fix my CodeReview, · 0a5df6c2
  Forest Anderson authored Apr 29, 2019
  0a5df6c2
- Merge branch '12-terrain-ao' into 'master' · 12a3f1a9
  Forest Anderson authored Apr 29, 2019
  12a3f1a9
- Merge branch 'fix-get-submodule-on-build' into 'master' · a9466e21
  Forest Anderson authored Apr 29, 2019
  a9466e21
- Fix get submodule on build · f775af2f
  Forest Anderson authored Apr 29, 2019
  
  f775af2f
Apr 28, 2019
- Rename mod ao to vol · aba8b3c0
  robojumper authored Apr 28, 2019
  
  aba8b3c0
- Generalize meshing and AO code over terrain, figure · 9264a072
  robojumper authored Apr 28, 2019
  
  9264a072
- Merge branch 'master' into 'master' · 58ab6d7d
  Dominik Broński authored Apr 28, 2019
  58ab6d7d
- Add terrain ambient occlusion · 3d8b5fcd
  robojumper authored Apr 28, 2019
  
  3d8b5fcd
- Closable minimap · b235a10c
  Monty Marz authored Apr 28, 2019
  
  b235a10c
- Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren · 825c996e
  Monty Marz authored Apr 28, 2019
  
  825c996e
- FPS display moved, changes to windows · 1b658a6a
  Pfauenauge90 authored Apr 26, 2019 and Monty Marz committed Apr 28, 2019
  
  1b658a6a
- removed test_assets in voxygen · 007b9e99
  Pfauenauge90 authored Apr 26, 2019 and Monty Marz committed Apr 28, 2019
  
  007b9e99
Apr 27, 2019
- Merge branch 'fix-singleplayer' into 'master' · b6a4b166
  Forest Anderson authored Apr 27, 2019
  b6a4b166
- Implement StartSingleplayerState · ba875a45
  Timo Kösters authored Apr 27, 2019
  
  ba875a45
- Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren · a84931dc
  Pfauenauge90 authored Apr 27, 2019
  
  a84931dc
- FPS display moved, changes to windows · b18a566d
  Pfauenauge90 authored Apr 26, 2019
  
  b18a566d
- removed test_assets in voxygen · 800d769d
  Pfauenauge90 authored Apr 26, 2019
  
  800d769d
- Merge branch 'add-docker-gitlab-ci' into 'master' · c03f737c
  Forest Anderson authored Apr 27, 2019
  c03f737c
- Revert "Can't find artifact debug" · 1c21f53d
  Forest Anderson authored Apr 27, 2019
  1c21f53d
Apr 26, 2019
- FPS display moved, changes to windows · aee2c625
  Pfauenauge90 authored Apr 26, 2019
  
  aee2c625
- removed test_assets in voxygen · cb9dc40c
  Pfauenauge90 authored Apr 26, 2019
  
  cb9dc40c
Apr 25, 2019
- Merge branch 'master' into 'master' · b9361e05
  Joshua Barretto authored Apr 25, 2019
  b9361e05