Pfauenauge
f0d06855f7
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: 0aac57237cda92ccab7d6147a98f1b269b3a88f9
2019-04-29 20:09:05 +02:00
Forest Anderson
3c45d3c996
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
8ddce15957
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
c68f33babe
Add VOXYGEN_LOG env variable to allow detailed terminal logging.
...
Former-commit-id: 01c29a65311dbd6a4739be5aca9865d4ac0872d9
2019-04-29 16:56:38 +00:00
robojumper
cf88e9a5b1
Line endings are hard
...
Former-commit-id: 3a0e48b7571ff706feeff4e089fb9c5d63f6ac7a
2019-04-29 17:41:12 +02:00
robojumper
0bd84b58ec
Fix occlusion artifact
...
Former-commit-id: 23be3f1173706076802809576e3455833e64b4e4
2019-04-29 17:39:35 +02:00
Forest Anderson
65ee408aaa
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
1ed043d70e
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
c95bee9838
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
Pfauenauge
dc1c4327e8
Map Window, Settings Window
...
Former-commit-id: c6878d353c8e3b92509d6e95fa75a0f874b5abf9
2019-04-29 09:23:34 +02:00
Forest Anderson
36360e9391
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
7f881421d8
Fix get submodule on build
...
Former-commit-id: 6f39cadd9ec71c570e1515a34dfeb8b670c1e52a
2019-04-29 02:23:33 +00:00
Pfauenauge
85fbf8cbaa
Map Window, Settings Window
...
Former-commit-id: 1522b1fb8567516ab92ebb7d22974a59e3695556
2019-04-29 00:01:57 +02:00
robojumper
7091557b82
Rename mod ao to vol
...
Former-commit-id: ef126e03761b18151594780777fa27e94efe24d7
2019-04-28 23:35:47 +02:00
robojumper
021c6eeda1
Generalize meshing and AO code over terrain, figure
...
Former-commit-id: f0a91173ec5a0a9c683e6d1c222cb74e858625b7
2019-04-28 19:12:45 +02:00
Dominik Broński
b930043041
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
32509d2fb1
Add terrain ambient occlusion
...
Former-commit-id: de73dcb09f68bcad5dc7431c30849e16f68c5ab7
2019-04-28 17:10:09 +02:00
Pfauenauge
3773653072
Closable minimap
...
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
2019-04-28 15:56:40 +02:00
Yeedo
0dbdb185d4
Redo settings -> help text, add supplement_events to Window.
...
Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329
2019-04-28 14:19:08 +01:00
Yeedo
c032e60d12
Tiny fix to prevent settings from permanently being marked as changed
...
Former-commit-id: c12d760a22926eebc2661be1db4609546286c89a
2019-04-28 14:19:08 +01:00
Yeedo
dc5ec137e9
Update help window to use player's keybindings ( fix #42 )
...
Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6
2019-04-28 14:19:08 +01:00
Yeedo
ad1fc20cfe
Redo settings -> help text, add supplement_events to Window.
...
Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691
2019-04-28 14:19:08 +01:00
Yeedo
00e92e5ea2
Tiny fix to prevent settings from permanently being marked as changed
...
Former-commit-id: 99927ee1ca6c1cabb5268353690ec88425b7ae3d
2019-04-28 14:19:08 +01:00
Yeedo
e1fc901b5f
Update help window to use player's keybindings ( fix #42 )
...
Former-commit-id: c79b4184b279b2e6fbaac8e0b7c641741d8eb51e
2019-04-28 14:19:08 +01:00
Yeedo
44f8e834fc
Redo settings -> help text, add supplement_events to Window.
...
Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6
2019-04-28 14:19:08 +01:00
Yeedo
48747dd9a9
Tiny fix to prevent settings from permanently being marked as changed
...
Former-commit-id: ce120495a91ce0306bcb010923cd340fc70b87db
2019-04-28 14:19:08 +01:00
Yeedo
488132f63b
Update help window to use player's keybindings ( fix #42 )
...
Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602
2019-04-28 14:19:08 +01:00
Yeedo
be9a399269
Redo settings -> help text, add supplement_events to Window.
...
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
2019-04-28 14:19:08 +01:00
Yeedo
7593d4e821
Tiny fix to prevent settings from permanently being marked as changed
...
Former-commit-id: 665a8851526c1386e497064e2b0f3f8689db60d8
2019-04-28 14:19:08 +01:00
Yeedo
50c6518d89
Update help window to use player's keybindings ( fix #42 )
...
Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc
2019-04-28 14:19:08 +01:00
Pfauenauge
9efa17c653
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: f24d97d7636784bf36bdd2d2f8b8767ac9b8e2d8
2019-04-28 14:36:51 +02:00
Pfauenauge90
0afbba3303
FPS display moved, changes to windows
...
Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435
2019-04-28 13:18:00 +02:00
Pfauenauge90
33515bd04c
removed test_assets in voxygen
...
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
2019-04-28 13:18:00 +02:00
Forest Anderson
60017a4f99
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
a4d7d0d488
Implement StartSingleplayerState
...
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
2019-04-27 22:57:55 +02:00
Pfauenauge90
ca2fa760d3
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: 9b2cac3909cc35aca3e024d7d15fc32f644aa958
2019-04-27 20:31:37 +02:00
Pfauenauge90
de37e494f3
FPS display moved, changes to windows
...
Former-commit-id: 94543cc211584b9f560c5c7145f1775f8689d267
2019-04-27 20:31:12 +02:00
Pfauenauge90
9ea4cd917f
removed test_assets in voxygen
...
Former-commit-id: f9cac7ebf57a4997fd64e1cb65c4582940c30f42
2019-04-27 20:31:12 +02:00
Forest Anderson
d83dc6daf4
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
78cfb4ccf5
Revert "Can't find artifact debug"
...
This reverts commit 605514a688
2019-04-27 15:38:28 +00:00
Pfauenauge90
ed4336f408
FPS display moved, changes to windows
...
Former-commit-id: a044a52e3194ff7091964b3e7dcc83f368e32770
2019-04-26 18:13:30 +02:00
Pfauenauge90
b83ab824b9
removed test_assets in voxygen
...
Former-commit-id: e9a0ab15ea5c1d11a98db7875846d4afd33453dc
2019-04-26 15:13:30 +02:00
Joshua Barretto
b72c6b7185
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
d7be49def1
Minimap changes, grass colour adjusted
...
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
2019-04-25 23:43:32 +02:00
Forest Anderson
0934522e0a
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
fb0b0f682a
Fix duplicated code
...
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
2019-04-25 22:59:11 +02:00
Pfauenauge
bf8bb9180b
bag visuals fix
...
Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e
2019-04-25 22:33:14 +02:00
Joshua Barretto
f1b63732af
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
e4d6d96afc
Remove post debugging
...
Former-commit-id: 4a82bf8b6178fb88d5a6ea93706fb4e97ac2256d
2019-04-25 20:25:22 +01:00
Joshua Barretto
5e38eee8d4
Added chunk deletion
...
Former-commit-id: 63c29e43c4dc28097aaf4e0ff72977c7db5cc28f
2019-04-25 20:08:26 +01:00
