Forest
4fab07a6a2
Fix schedules
...
Former-commit-id: def6e6eb26ad5dbdd2287177a2a85770621105a9
2019-04-27 05:53:28 -04:00
Forest
b500609fbd
Change only location
...
Former-commit-id: 15e7f5b7f92787aca999ebc6f17713b6555143e1
2019-04-27 05:50:27 -04:00
Forest
931715eeff
Test changes on this branch
...
Former-commit-id: deb30cf3e726d36d17a36f44592897d31428c901
2019-04-27 05:44:14 -04:00
Forest
5d75562942
Fixed some nightly issues
...
Former-commit-id: b1c3ce1e376aceb4a34fa98b9ce6ec99b708881e
2019-04-27 05:25:19 -04:00
Forest
6538104714
Fixed gitlab ci merge conflict
...
Former-commit-id: a0aca5ac6beebb38393a62421a792ed78fd2b6c8
2019-04-25 23:44:33 -04:00
Forest Anderson
6afc385019
Changed directory
...
Former-commit-id: c44614852afe13acf613d756dccd31d8d1cfead4
2019-04-25 23:41:13 -04:00
Forest Anderson
3d9c8b5faf
Removed current folder parameter
...
Former-commit-id: 514009caeef9e4d513b4f759f1272bea1919aee8
2019-04-25 23:41:13 -04:00
Forest Anderson
007a7c7fe5
Cleaned, other work
...
Former-commit-id: e78e9d44965f86857ca99cac1e26d5406b403c14
2019-04-25 23:41:13 -04:00
Forest Anderson
b6fec08fb9
Uncommented lots of the tasks
...
Former-commit-id: b7cf54de5691cec7f9f902ceb8eefda9afaf7038
2019-04-25 23:41:13 -04:00
Forest Anderson
9b0b52b136
Remove alternate git pull script
...
Former-commit-id: f7e8efe677072185fc2b03360a2a08f0e9de3b6a
2019-04-25 23:41:13 -04:00
Forest Anderson
f2c60b4454
Changed submodule update
...
Former-commit-id: 67757821ea1223665996c7dc467f33b84989d76d
2019-04-25 23:41:13 -04:00
Forest Anderson
5d571aea97
Sync for checkout
...
Former-commit-id: 43088929864901cc08b7b1c43a783ca17b56e6a8
2019-04-25 23:41:13 -04:00
Forest Anderson
77492a80ea
Added image to clean code
...
Former-commit-id: 4462eb41eec61be775b468617dc91a04b23c0367
2019-04-25 23:41:13 -04:00
Forest Anderson
b9bdddf944
First try with new image
...
Former-commit-id: 0796795e4f6c5e07101a1b5f2dbae01ce69c0038
2019-04-25 23:41:13 -04:00
Forest Anderson
bd01716342
Change target location
...
Former-commit-id: 3e46e7c4dc9a66283ac5077c2db43d5eb98ae9f3
2019-04-25 23:41:13 -04:00
Forest Anderson
6b7d4e1008
Save target to cache
...
Former-commit-id: 7ca298269eba48a39087b47323a2268e0be88639
2019-04-25 23:41:13 -04:00
Forest Anderson
5efefd9724
Fixed before_script
...
Former-commit-id: 3e5ae64c61ca2e85594c6834677906565d17ad94
2019-04-25 23:41:13 -04:00
Forest Anderson
cfa99f2163
Added before script submodule
...
Former-commit-id: b15b2da96fbc9f23cb2e38e21cd9f4966b154cbb
2019-04-25 23:41:13 -04:00
Forest Anderson
c527b6f7e2
Added submodule properly
...
Former-commit-id: 3bce2148ae458a276f97a679f1ba38e1797f2b35
2019-04-25 23:41:13 -04:00
Forest Anderson
211900db7f
Added gcc
...
Former-commit-id: f4255ca2b97a8c96bd83bbdbc43c9d2e7c1d188f
2019-04-25 23:41:13 -04:00
Forest Anderson
5da6531b7a
Fixed source
...
Former-commit-id: 5a415465fdfa187911ce6fec9b7e5d6412db09ce
2019-04-25 23:41:13 -04:00
Forest Anderson
c3742f9360
Added curl
...
Former-commit-id: e1807ff3b3424ca47979e11407478524ad34f686
2019-04-25 23:41:13 -04:00
Forest Anderson
1e6cb8f6ee
Basic Rust env
...
Former-commit-id: 250a426c09589640ce255e5369038624ca037bb6
2019-04-25 23:41:13 -04:00
Forest Anderson
db27d42e64
Added basic build
...
Former-commit-id: 55609fbfbe391cd63e6b6cf949c4ed972bae6fe9
2019-04-25 23:41:13 -04:00
Forest Anderson
f87d2a8a4f
Added reqs
...
Former-commit-id: ecd461c2f96311c1c2f3a89694367e9216214739
2019-04-25 20:21:35 -04: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
Forest Anderson
cabb06717b
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
f136a63f69
Adjusted terrain loading and meshing performance
...
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
2019-04-25 17:52:11 +01:00
Joshua Barretto
0b0c71592c
Fixed orientation issue
...
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
2019-04-25 17:52:11 +01:00
Joshua Barretto
a66cc98a03
Mildly better worldgen
...
Former-commit-id: e8d77b75b164611ccfd144b1d6e6d6c5e396e515
2019-04-25 17:52:11 +01:00
Joshua Barretto
fc8b7e9750
Worked on improving networking and terrain
...
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
2019-04-25 17:52:11 +01:00
timokoesters
927f3a12ba
Fix ray issue after max_iteration
...
Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
2019-04-25 17:52:11 +01:00
timokoesters
c37db43580
Fix ray position
...
Former-commit-id: 772d5652d44c9467d22c9c93547ac154ce3110b3
2019-04-25 17:52:11 +01:00
Joshua Barretto
9105bf0811
Added better terrain collisions
...
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df
Added raycasting (needs testing) and basic character terrain collision
...
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
2019-04-25 17:52:11 +01:00
Joshua Barretto
61afb98869
Foobar
...
Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22
2019-04-25 17:52:11 +01:00
Joshua Barretto
f9f434a1c2
Started work on worldgen
...
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
2019-04-25 17:52:11 +01:00
Joshua Barretto
837ba99d2a
Merge branch 'confdir' into 'master'
...
Use the directory defined by the OS to store configuration files
See merge request veloren/veloren!72
Former-commit-id: 57968e44d31294b32095c97d351ecabcaf63e2fd
2019-04-25 16:51:28 +00:00
Louis Pearson
b0ebbd5631
Use the directory defined by the OS to store configuration files
...
Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
2019-04-25 10:24:00 -06:00
Forest Anderson
96114e07de
Added nightly stuff
...
Former-commit-id: aaadaf472219d061d9c43503bf8fea1a0a6207e9
2019-04-25 09:06:37 -04:00
Joshua Barretto
7e1ef46e4d
Merge branch 'pfauenauge-fix' into 'master'
...
Update UI (Pfauenauge)
See merge request veloren/veloren!68
Former-commit-id: 43d549dbb8882937df929f618325163d22c919a4
2019-04-25 12:25:30 +00:00
Joshua Barretto
b718358aa1
Merge branch 'swish_errors' into 'master'
...
Swish errors
Closes #27
See merge request veloren/veloren!70
Former-commit-id: e4a90d4c68350bc86ac2cea4f066e9a5ef4ca8bc
2019-04-25 12:09:23 +00:00
Joshua Barretto
dc86b4d14e
Removed old commented logging code
...
Former-commit-id: 9b20f7b7a979de3377f1da84d46e23ddd0ef6c11
2019-04-25 13:08:47 +01:00
