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
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
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
Joshua Barretto
abaab5787b
Made message output smaller
...
Former-commit-id: 21eee7126baf3f85468dc54c5e31cbb4deda9667
2019-04-25 13:08:46 +01:00
Joshua Barretto
03051248b9
Added user-friendly error output for Voxygen
...
Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 13:08:46 +01:00
Joshua Barretto
d04db4f6dc
Merge branch 'master' into 'master'
...
velocity tilt, run adjustments
See merge request veloren/veloren!69
Former-commit-id: 90a449e76431bb11bf748b887876c0e88db9e566
2019-04-25 12:08:01 +00:00
Joshua Barretto
eff6b19ed0
Merge branch 'networksettings' into 'master'
...
Store username and servers in settings.toml
See merge request veloren/veloren!49
Former-commit-id: 43ad087a201cee29c09ad20ef64fd75b332165b7
2019-04-25 08:52:59 +00:00
timokoesters
0bb35fe232
Update assets
...
Former-commit-id: c3692838320a5da02525d9675de3f55249a39100
2019-04-25 10:50:56 +02:00
Louis Pearson
2a6a0a2a3e
Fix default server loading
...
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
2019-04-25 02:45:01 -06:00
Louis Pearson
feb0610448
Ran rustfmt on ui.rs
...
Former-commit-id: 7ee721023ce69de122993b9c94b0bd3fa739e154
2019-04-25 02:35:08 -06:00
Louis Pearson
d7e9caf5de
Adjust server list UI
...
Former-commit-id: 61587cbd540c71bc9c264a744b89b8d88ec7ac15
2019-04-25 02:35:08 -06:00
Louis Pearson
dadbfb9d85
Add clickable server buttons
...
Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c
2019-04-25 02:35:08 -06:00
Louis Pearson
d7c80d0afc
Add basic UI to view saved servers
...
Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7
2019-04-25 02:35:08 -06:00
Louis Pearson
15c2cdb2ef
Add networksettings and integrate with main menu ui
...
Former-commit-id: f04532e03f8262b9751ae4a68259637f7de0344c
2019-04-25 02:35:08 -06:00
timokoesters
e36ca0bc59
Fix unnecessary if
...
Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d
2019-04-25 10:27:18 +02:00
jshipsey
b9725aa4b1
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
...
Former-commit-id: d0e5a6e3c337cbe0907664a94782959bf588c566
2019-04-24 23:38:50 -04:00
jshipsey
c0a8a677b7
simplified scaling code
...
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
2019-04-24 23:33:36 -04:00
