Pfauenauge
77397788e7
rebase
...
Former-commit-id: d40850ca70c5c833f17cba6a9f16de8c63bb5717
2019-05-02 14:44:51 +02:00
Yeedo
b7ba7f0795
Use shorter help text format, compact stuff into one format!()
...
Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e
2019-05-01 23:15:43 +01:00
Pfauenauge
5362ac7289
rebase
...
Former-commit-id: 047a4ffcad326721eaff6f77eb9c8b57cfa0b2b4
2019-05-01 23:47:09 +02:00
Pfauenauge
a3cb1c26d7
Asset Update
...
Former-commit-id: 3ef4a1d4cf4d4e29f6d8d20a30d981864e4278eb
2019-05-01 23:35:08 +02:00
Pfauenauge
bb1267b86d
controls window
...
Former-commit-id: 2bf1970e5e11117d8192030c1846ec76310f64ca
2019-05-01 23:21:21 +02:00
Pfauenauge
8c35f06ed7
Controls Window Contents
...
Former-commit-id: f11a9b4da250ba9bd095220efc9e8fc97d32c983
2019-05-01 23:20:31 +02:00
Yeedo
95f689c875
Merge branch 'master' of gitlab.com:veloren/veloren
...
Former-commit-id: 83dc38d485fbe06bcef86849e14f0b6755b05219
2019-05-01 20:49:06 +01:00
Forest Anderson
042d5bb571
Merge branch 'dispatcher' into 'master'
...
Store a thread pool in State for the Dispatcher
Closes #63
See merge request veloren/veloren!98
Former-commit-id: 948c18e3c902901505d8f7136f151971d47a7072
2019-05-01 19:28:10 +00:00
Imbris
7a192a9466
add nightly feature back for specs -> shred
...
Former-commit-id: b483f75c10cc47faa66ab8063f7747e654068634
2019-05-01 14:46:06 -04:00
Imbris
f0b0b83cc8
Store thread pool in State, Remove unnecessary dep
...
Former-commit-id: cbce09915267f264801c174817b97ed3528715fd
2019-05-01 14:10:43 -04:00
Joshua Barretto
fddd7863bd
Merge branch 'fix_submodule' into 'master'
...
Submodule Fix
See merge request veloren/veloren!97
Former-commit-id: 8a59f38324b959a159180e3bcfa90135a0b1ac0a
2019-05-01 15:50:51 +00:00
Pfauenauge
1ba1eb20c7
Controls Window Text
...
Former-commit-id: 2e479f29af73fd36b5cb8e6f34b8d2d4265dd100
2019-05-01 15:50:41 +02:00
Imbris
93dcf434b1
point to latest asset commit
...
Former-commit-id: 844f4c00d09b19ae3870565bb88fe184c6e8cccf
2019-05-01 08:59:23 -04:00
Pfauenauge
777f4066d4
changed char head and offset
...
Former-commit-id: 6e9ca7249a33504bc0b7cf8f5b5591ead0399151
2019-05-01 14:11:55 +02:00
Pfauenauge
25932ad02b
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: 88e89d15e791aefc013e7500fe692d5cb3601fb1
2019-04-30 13:49:32 +02:00
Pfauenauge
532a570923
rebase
...
Former-commit-id: b3eef84c3a76629e399827e12327556b4c8c7ffa
2019-04-30 13:49:29 +02:00
Pfauenauge
85bdff364d
settings window
...
Former-commit-id: b85c0f656c331195bd9c35f57a2609cd4f34f3fa
2019-04-30 12:59:55 +02:00
Pfauenauge
1a12bc91a1
settings window
...
Former-commit-id: 1fc6e52bb860c2f114114bd75ef0b260d9f43871
2019-04-30 12:59:10 +02:00
Pfauenauge
e12a1a623a
Map Window, Settings Window
...
Former-commit-id: 72ac20ecdcaccf39c1691be1fbdcb5305d900e78
2019-04-30 12:58:30 +02:00
Pfauenauge
052c5ecbda
settings window
...
Former-commit-id: 0dd430bdff017ab95f8df35403c5f4b6d8f10198
2019-04-30 12:57:34 +02:00
Pfauenauge
bbbcfd15ba
Map Window, Settings Window
...
Former-commit-id: 74560f37005ec0dc1b5fda6dc18e2b56d74f598d
2019-04-30 12:54:46 +02:00
Yeedo
ccfdef0563
Merge branch 'master' of gitlab.com:veloren/veloren
...
Former-commit-id: 80aff10654c5182ffae030fc18c3665d797abb75
2019-04-29 22:38:38 +01:00
Yeedo
f1e268986b
cargo fmt, also remove a stray <<<<HEAD thing
...
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
2019-04-29 22:23:31 +01:00
Marcel
9e608a9874
Merge branch 'force-clean-code' into 'master'
...
Clean code must not fail
See merge request veloren/veloren!96
Former-commit-id: 49a890861f094a5727615483cabfa9c9e841576e
2019-04-29 21:19:17 +00:00
Forest Anderson
eb6d8a1378
Clean code must not fail
...
Former-commit-id: 05ca3143c59fe11e2a84448a8377a549edaffec5
2019-04-29 21:19:17 +00:00
Yeedo
164feaa616
fix merge conflicts
...
Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06
2019-04-29 22:13:14 +01:00
Forest Anderson
a0a628ee97
Merge branch 'clean-all-code' into 'master'
...
Ran fmt on codebase
See merge request veloren/veloren!95
Former-commit-id: 9a847a63c0b69dd3a969c3829986032972f00325
2019-04-29 20:37:19 +00:00
Forest Anderson
993388e56a
Ran fmt on codebase
...
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
2019-04-29 20:37:19 +00:00
Forest Anderson
2bcd6b6295
Merge branch 'fix-ci-artifact-upload' into 'master'
...
Copy files after tar/zip for CI artifacts
See merge request veloren/veloren!94
Former-commit-id: d10a399c0b12955817365a33af999c9afc45589b
2019-04-29 20:21:52 +00:00
Forest Anderson
97bd11f391
Copy files after tar/zip for CI artifacts
...
Former-commit-id: 60d77ad59cb374a224b8e4d857ef71ec2a6c0a35
2019-04-29 20:21:51 +00:00
Forest Anderson
0ca4b55322
Merge branch 'clean-up-gitignore' into 'master'
...
Fix gitignore and delete gitignores in subdirs
See merge request veloren/veloren!91
Former-commit-id: 689231e73e7a97a49fb3d20d76ccc43af3f2681a
2019-04-29 20:14:52 +00:00
Forest Anderson
8b042b11a3
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
a25f7b6efa
Removed improper artifact folder
...
Former-commit-id: d9ed5b19b73411541bfbd6a1cdbd276c6a9ec6b3
2019-04-29 15:36:41 -04:00
Dominik Broński
62430746af
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
c7b61d5626
New Settings Window and Map Window
...
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
2019-04-29 19:04:52 +00:00
Pfauenauge
817520303d
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: 821c54c967d0da72beb1ea102cf6d62c49849989
2019-04-29 20:54:26 +02:00
Pfauenauge
9b3f866f00
settings window
...
Former-commit-id: b647fa56d26cf9f8e4a2a14ebbad43384d87e50c
2019-04-29 20:51:26 +02:00
timokoesters
f35e8d7b98
Fix gitignore and delete gitignores in subdirs
...
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
2019-04-29 20:43:04 +02:00
Pfauenauge
30f86a303f
settings window
...
Former-commit-id: da0b82d0219fd2cfc105d5abb6e4d99caf87c379
2019-04-29 20:13:42 +02:00
Pfauenauge
30aa5f7291
Map Window, Settings Window
...
Former-commit-id: 66f1b1d3e9e2dbb757bdbc82ed417b23cb201831
2019-04-29 20:13:41 +02:00
Pfauenauge
b87958eeb2
settings window
...
Former-commit-id: a63a117d9595db501b135677b720dbbfbdfad2ad
2019-04-29 20:13:22 +02:00
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
