Forest Anderson
59196b152d
Merge branch 'fix-ci-artifact-upload' into 'master'
...
Removed improper artifact folder
See merge request veloren/veloren!93
Former-commit-id: 4293e281fd5deb3ce7b9c5a22e1e9befe1221535
2019-04-29 19:39:34 +00:00
Forest Anderson
4010743611
Removed improper artifact folder
...
Former-commit-id: d9ed5b19b73411541bfbd6a1cdbd276c6a9ec6b3
2019-04-29 15:36:41 -04:00
Dominik Broński
4865f68e14
Merge branch 'master' into 'master'
...
New Settings Window and Map Window
See merge request veloren/veloren!92
Former-commit-id: 2a7f4b79d99499081a111640342207ce54eea0a8
2019-04-29 19:04:52 +00:00
Monty Marz
bc8c8b7a81
New Settings Window and Map Window
...
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
2019-04-29 19:04:52 +00:00
Forest Anderson
163b8cd9f7
Merge branch 'ao-artifact-fix' into 'master'
...
Fix ambient occlusion artifact
See merge request veloren/veloren!89
Former-commit-id: b529f9df722d8b174b0c8e5ce9ef2d32965d7294
2019-04-29 17:00:56 +00:00
Forest Anderson
cc393588f0
Merge branch 'log' into 'master'
...
Add VOXYGEN_LOG env variable to allow detailed terminal logging.
See merge request veloren/veloren!79
Former-commit-id: d11105bc1d0cdf2d249f106510c418b6a85b27bf
2019-04-29 16:56:38 +00:00
Erocs
435da5e97e
Add VOXYGEN_LOG env variable to allow detailed terminal logging.
...
Former-commit-id: 01c29a65311dbd6a4739be5aca9865d4ac0872d9
2019-04-29 16:56:38 +00:00
robojumper
adedbb800a
Line endings are hard
...
Former-commit-id: 3a0e48b7571ff706feeff4e089fb9c5d63f6ac7a
2019-04-29 17:41:12 +02:00
robojumper
f543f9b4de
Fix occlusion artifact
...
Former-commit-id: 23be3f1173706076802809576e3455833e64b4e4
2019-04-29 17:39:35 +02:00
Forest Anderson
192b17605e
Merge branch 'gitlab-ci-hotfixes' into 'master'
...
Gitlab ci hotfixes
See merge request veloren/veloren!88
Former-commit-id: da96b244d626208a6afc23f79e4f0b38e5e109a8
2019-04-29 14:05:53 +00:00
Forest Anderson
f6a4da47b2
fix my CodeReview,
...
no need to remove old zip because we remove the whole bin folder now
no need to copy archive at the end, just upload the archive in `bin/`
Former-commit-id: 05c6faf144e67169336a2cdcb5817ac9998e170c
2019-04-29 14:05:53 +00:00
Forest Anderson
4c7a9e0ad7
Merge branch '12-terrain-ao' into 'master'
...
Add terrain and figure ambient occlusion
Closes #12
See merge request veloren/veloren!84
Former-commit-id: 943648d9ca3399e07a275946487d3431ba3832de
2019-04-29 13:14:36 +00:00
Forest Anderson
a3553d660e
Merge branch 'fix-get-submodule-on-build' into 'master'
...
Fix get submodule on build
See merge request veloren/veloren!86
Former-commit-id: b7f6b4ffb3470e7c82f36b506723b3541018d1cd
2019-04-29 02:23:33 +00:00
Forest Anderson
e78f5f00ae
Fix get submodule on build
...
Former-commit-id: 6f39cadd9ec71c570e1515a34dfeb8b670c1e52a
2019-04-29 02:23:33 +00:00
robojumper
95a242493a
Rename mod ao to vol
...
Former-commit-id: ef126e03761b18151594780777fa27e94efe24d7
2019-04-28 23:35:47 +02:00
robojumper
5d9e9823f7
Generalize meshing and AO code over terrain, figure
...
Former-commit-id: f0a91173ec5a0a9c683e6d1c222cb74e858625b7
2019-04-28 19:12:45 +02:00
Dominik Broński
0c07378477
Merge branch 'master' into 'master'
...
Closable Minimap
See merge request veloren/veloren!83
Former-commit-id: fa681ef8a4fcbb7fc4d8a520bf154c7abb819654
2019-04-28 15:36:24 +00:00
robojumper
322f5c7511
Add terrain ambient occlusion
...
Former-commit-id: de73dcb09f68bcad5dc7431c30849e16f68c5ab7
2019-04-28 17:10:09 +02:00
Pfauenauge
4b95730d11
Closable minimap
...
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
2019-04-28 15:56:40 +02:00
Pfauenauge
fff7941c1e
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: f24d97d7636784bf36bdd2d2f8b8767ac9b8e2d8
2019-04-28 14:36:51 +02:00
Pfauenauge90
e8f5ea71e8
FPS display moved, changes to windows
...
Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435
2019-04-28 13:18:00 +02:00
Pfauenauge90
e36aeb9c86
removed test_assets in voxygen
...
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
2019-04-28 13:18:00 +02:00
Forest Anderson
b10b0f0e63
Merge branch 'fix-singleplayer' into 'master'
...
Implement StartSingleplayerState
See merge request veloren/veloren!81
Former-commit-id: 64bf5ff7e4db2640dedfccdcff5c0e1e34a2f6b3
2019-04-27 21:20:57 +00:00
timokoesters
8065bba2b4
Implement StartSingleplayerState
...
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
2019-04-27 22:57:55 +02:00
Pfauenauge90
c358313ac6
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: 9b2cac3909cc35aca3e024d7d15fc32f644aa958
2019-04-27 20:31:37 +02:00
Pfauenauge90
3ef65389b4
FPS display moved, changes to windows
...
Former-commit-id: 94543cc211584b9f560c5c7145f1775f8689d267
2019-04-27 20:31:12 +02:00
Pfauenauge90
170798dbe7
removed test_assets in voxygen
...
Former-commit-id: f9cac7ebf57a4997fd64e1cb65c4582940c30f42
2019-04-27 20:31:12 +02:00
Forest Anderson
600f11e44b
Merge branch 'add-docker-gitlab-ci' into 'master'
...
Add docker gitlab ci
Closes #15
See merge request veloren/veloren!65
Former-commit-id: 00d0e6a9214ced950b54e72d0d79bdc22a0fa1ea
2019-04-27 15:38:28 +00:00
Forest Anderson
b5f9d74f82
Revert "Can't find artifact debug"
...
This reverts commit 605514a688e60a180d8b94cdfaacb29a99e20833 [formerly 34df4943aea59339aef49ac37b3bd89d385ae976].
Former-commit-id: a11b4b01450d9a279923db308dbf6578f1403820
2019-04-27 15:38:28 +00:00
Pfauenauge90
e48806d78a
FPS display moved, changes to windows
...
Former-commit-id: a044a52e3194ff7091964b3e7dcc83f368e32770
2019-04-26 18:13:30 +02:00
Pfauenauge90
b43f9af3d0
removed test_assets in voxygen
...
Former-commit-id: e9a0ab15ea5c1d11a98db7875846d4afd33453dc
2019-04-26 15:13:30 +02:00
Joshua Barretto
6d2c98d40f
Merge branch 'master' into 'master'
...
bag visuals fix
See merge request veloren/veloren!75
Former-commit-id: 30b26e73c0d43ef4f0c3d55154547e5d010a33a7
2019-04-25 21:59:55 +00:00
Pfauenauge
444383df30
Minimap changes, grass colour adjusted
...
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
2019-04-25 23:43:32 +02:00
Forest Anderson
2125aebc43
Merge branch 'master' into 'master'
...
Fix duplicated code
See merge request veloren/veloren!76
Former-commit-id: b58575ac5f3ecd41ac4798fe98f25034891478a9
2019-04-25 21:06:45 +00:00
timokoesters
ed2006a071
Fix duplicated code
...
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
2019-04-25 22:59:11 +02:00
Pfauenauge
a0f416577b
bag visuals fix
...
Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e
2019-04-25 22:33:14 +02:00
Joshua Barretto
7cfeaa6b54
Merge branch 'master' into 'master'
...
Terrain
Closes #5
See merge request veloren/veloren!66
Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e
2019-04-25 19:35:35 +00:00
Joshua Barretto
d84677106b
Remove post debugging
...
Former-commit-id: 4a82bf8b6178fb88d5a6ea93706fb4e97ac2256d
2019-04-25 20:25:22 +01:00
Joshua Barretto
f9b2e32c68
Added chunk deletion
...
Former-commit-id: 63c29e43c4dc28097aaf4e0ff72977c7db5cc28f
2019-04-25 20:08:26 +01:00
Forest Anderson
085581145c
Merge branch 'show-mouse-esc' into 'master'
...
Show mouse on Esc, hide when pressing again
Closes #28
See merge request veloren/veloren!61
Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
2019-04-25 18:27:08 +00:00
Joshua Barretto
159e18341d
Adjusted terrain loading and meshing performance
...
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
2019-04-25 17:52:11 +01:00
Joshua Barretto
ac3385b1a3
Fixed orientation issue
...
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
2019-04-25 17:52:11 +01:00
Joshua Barretto
bddf070b54
Mildly better worldgen
...
Former-commit-id: e8d77b75b164611ccfd144b1d6e6d6c5e396e515
2019-04-25 17:52:11 +01:00
Joshua Barretto
abdaca6182
Worked on improving networking and terrain
...
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
2019-04-25 17:52:11 +01:00
timokoesters
618b29b93b
Fix ray issue after max_iteration
...
Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
2019-04-25 17:52:11 +01:00
timokoesters
1c29c13973
Fix ray position
...
Former-commit-id: 772d5652d44c9467d22c9c93547ac154ce3110b3
2019-04-25 17:52:11 +01:00
Joshua Barretto
6ccd9ac64f
Added better terrain collisions
...
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
2019-04-25 17:52:11 +01:00
Joshua Barretto
51fc2e2623
Added raycasting (needs testing) and basic character terrain collision
...
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
2019-04-25 17:52:11 +01:00
Joshua Barretto
5b9f3623eb
Foobar
...
Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22
2019-04-25 17:52:11 +01:00
Joshua Barretto
6d389cd4e7
Started work on worldgen
...
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
2019-04-25 17:52:11 +01:00
