Joshua Barretto
728ba8cf41
Added cargo lock, updated sphynx
...
Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 17:39:32 +01:00
Joshua Barretto
85735ef01c
Merge branch 'master' into 'master'
...
Fixed aspect on scene start, added more information to post errors
See merge request veloren/veloren!24
Former-commit-id: d1008de1cccdc3d6748cbc2506e027f626cf6cba
2019-04-14 15:09:39 +00:00
Joshua Barretto
f69ad40bd5
Fixed aspect on scene start, added more information to post errors
...
Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1
2019-04-14 16:05:51 +01:00
Joshua Barretto
07698f46ba
Merge branch 'master' into 'master'
...
Added multi-character rendering, integrated Sphynx, network overhaul
See merge request veloren/veloren!19
Former-commit-id: df34b5df61bea22193b465e883d563a56632174c
2019-04-14 13:39:55 +00:00
Joshua Barretto
7fc923f2a7
Rebased
...
Former-commit-id: 017002bca2078f48998ecb412480492556082491
2019-04-14 14:23:43 +01:00
Joshua Barretto
276d5359cd
Fixed player speed
...
Former-commit-id: becc175a91cd60a8957baa8eaaab35f740f677ed
2019-04-14 14:23:43 +01:00
Joshua Barretto
51f7d85508
Ensured that Client is Send
...
Former-commit-id: abadfc7d1d86110ed442cdb5a2e639c163c96e04
2019-04-14 14:23:43 +01:00
Joshua Barretto
a444826f0b
Fixed zombie network worker threads
...
Former-commit-id: a8e74a9a8e42a0d5e1a79d87a1daf398e6294c73
2019-04-14 14:23:43 +01:00
Joshua Barretto
824fb8a6c0
Fixed 1-frame animation bug
...
Former-commit-id: fc591de5026e35cab1ef72ce250b19cbe2fcec0e
2019-04-14 14:23:43 +01:00
Joshua Barretto
413bdf44e5
Extended timeout on huge transfer test to avoid failure on debug
...
Former-commit-id: 7fa49db2ce310ff83b0c7ba2c4525771f16e7842
2019-04-14 14:23:43 +01:00
Joshua Barretto
9f5aab3564
Prevented postal workers spinning for too long
...
Former-commit-id: e535f5745c817b7fd5f109711aaa65e6c78d6ecc
2019-04-14 14:23:43 +01:00
Joshua Barretto
19e6930e67
Named Voxygen correctly
...
Former-commit-id: a4f4e5703103e3f93da87bd515e80eb430eef52e
2019-04-14 14:23:43 +01:00
Joshua Barretto
f4260706e6
Updated package versions
...
Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0
2019-04-14 14:23:43 +01:00
Joshua Barretto
bbc5aa1b0d
Disabled informing clients of chunks temporarily
...
Former-commit-id: ab964ebfdae55e1fcf1002d7e7622d58e538c83b
2019-04-14 14:23:43 +01:00
Joshua Barretto
3112486005
Added partial chunk loading, package section to workspace Cargo.toml
...
Former-commit-id: 4164daf4ccbe6695f664a44d0fce0ee10df39b8d
2019-04-14 14:23:43 +01:00
Joshua Barretto
507c47e771
Rewrote netcode, added basic chunk synching
...
Former-commit-id: e9f76f7fa9dbe0c81cd4c998bf0f0b3eec9235cb
2019-04-14 14:23:43 +01:00
Joshua Barretto
f27b5fa975
Added server-side chunk generation
...
Former-commit-id: 72e02f8ec711ec4fac3111b591c4b08086dee4e3
2019-04-14 14:23:43 +01:00
Joshua Barretto
3d9f8105e6
Started work on server-side chunks
...
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
2019-04-14 14:23:43 +01:00
Joshua Barretto
11630877e3
Moved figure rendering to a better place
...
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
2019-04-14 14:23:43 +01:00
Joshua Barretto
62b91eb01b
Integrated Sphynx
...
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
2019-04-14 14:23:43 +01:00
Joshua Barretto
bea4a73c2e
Merge branch 'ui' into 'master'
...
Changes to UI
See merge request veloren/veloren!22
Former-commit-id: e69b799fed563ba7208db7818d0c77e2a6f06dc4
2019-04-14 13:23:08 +00:00
Pfauenauge90
8e69464588
Charselection Help Text
...
Former-commit-id: 463a3aad1c8d0b8e98f0b5464103016c401d1d32
2019-04-14 15:19:12 +02:00
Pfauenauge90
6b32d2bcb6
Updated race descriptions
...
Former-commit-id: 2384a6f01a27000d39ba9e399468e1d7897b6b1f
2019-04-14 15:19:12 +02:00
Pfauenauge90
51047236a0
chat changes
...
Former-commit-id: c2a5ae0d34e1e93d8f6feb4a9e5cf69045db7275
2019-04-14 15:19:12 +02:00
Pfauenauge90
bc420e41d6
help window, chat padding, font colours
...
Former-commit-id: 8d42f8e05cd11f669e4e56873e31a8530272b3b2
2019-04-14 15:19:11 +02:00
Pfauenauge90
a45e9e708c
Help window, chat padding, font colours
...
Former-commit-id: 18643504fd8e94ed991c137e9ea91dfa094686c7
2019-04-14 15:17:38 +02:00
Pfauenauge90
822901b08b
Chat padding, Font Colours to white, Help Window
...
Former-commit-id: d36a878971f92fbf16eb44d3102b4328832e6563
2019-04-14 15:15:42 +02:00
Imbris
2e14f7d559
update colors to match gamma scaling
...
Former-commit-id: 461b5cf751d329a219250bc8090b016f54f3ec96
2019-04-14 15:12:29 +02:00
Imbris
07a4cb268e
new bones, update asset repo
...
Former-commit-id: 4dbed55af4a9532051025a797349e77bd937dff2
2019-04-14 15:05:43 +02:00
Imbris
fb83c836a1
make to_server() blocking, post fixes & cleanup, use server address
...
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
2019-04-14 15:04:44 +02:00
Joshua Barretto
c10564d436
Merge branch 'master' into 'master'
...
Use modified version of conrod
See merge request veloren/veloren!21
Former-commit-id: f3f7a2ec1a699b9bbd06b3ea2357c9dcc79552e3
2019-04-13 22:11:39 +00:00
Imbris
5e576f048e
use modified version of conrod
...
Former-commit-id: 6a4697d02e18732dbf9ad679bac761c5a73457fa
2019-04-13 10:52:48 -04:00
Imbris
5404cc548a
remove hidden chat scrollbar
...
Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9
2019-04-13 10:52:48 -04:00
Marcel
aba7f2dfae
Merge branch 'assets' into 'master'
...
Assets
See merge request veloren/veloren!20
Former-commit-id: 238a7cc4cc66214c8a7948c874d8f2e052a20c81
2019-04-13 01:42:04 +00:00
Marcel Märtens
251cccffe5
add simple interface to get assets from various locations
...
Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a
2019-04-13 03:40:59 +02:00
Joshua Barretto
29d6cb5127
Merge branch 'master' into 'master'
...
Updated mouse wheel zooming to use WindowEvent
See merge request veloren/veloren!7
Former-commit-id: 04b7ffd2cabf7a771729c90d1ae07e89783b7417
2019-04-12 11:11:52 +00:00
Yeedo
99a2d9b257
Merge branch 'master' of gitlab.com:Yeedo/fresh
...
Former-commit-id: d50984a6d68b4911d62881792f941b9b167dde3c
2019-04-11 23:39:17 +01:00
Yeedo
b88dc1bbde
Updated mouse wheel zooming to use WindowEvent
...
Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe
2019-04-11 23:12:42 +01:00
Joshua Barretto
5bba91039f
Merge branch 'master' into 'master'
...
SUBMODULE: Update assets submodule
See merge request veloren/veloren!18
Former-commit-id: 11720bf5b96cc41b9e1141db7fa21710905bba0e
2019-04-10 22:13:17 +00:00
RustyBamboo
3c3bf88d05
SUBMODULE: Update assets submodule
...
Former-commit-id: 4a684ce74a65185b7734821a24323d4bc842d650
2019-04-10 18:11:17 -04:00
Joshua Barretto
1dee192e5b
Merge branch 'ui' into 'master'
...
Key commands, bag changes
See merge request veloren/veloren!16
Former-commit-id: fd08a4a51272c82ff5007cbb88c65efe8b959de2
2019-04-09 16:44:32 +00:00
Pfauenauge90
3f2a938735
Key Command Changes, Char Window
...
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
2019-04-09 18:30:13 +02:00
Pfauenauge
4607ad612d
Minor changes to font sizes
...
Former-commit-id: d998532c9b858cea5704b307b8bc6ef0ef3c75d7
2019-04-07 00:05:56 +02:00
Pfauenauge
8ecb849970
Char Window, Mana, Health, Exp-Bar
...
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
2019-04-06 00:36:04 +02:00
Joshua Barretto
a0001d788a
Merge branch 'master' into 'master'
...
Updated asset repo
See merge request veloren/veloren!17
Former-commit-id: dd30b4130d5e3b912140d2aca6390d01f1427b77
2019-04-05 22:34:31 +00:00
Joshua Barretto
9bd97b5176
Updated asset submodule
...
Former-commit-id: 2e14e80ecfee8eb939680c101b45311e96a93cf9
2019-04-05 23:33:23 +01:00
Pfauenauge90
c1af42522d
char window additions
...
Former-commit-id: 63dfbd68594fc7ecb6e9caf610c9c5165c9e88d4
2019-04-04 19:35:33 +02:00
Pfauenauge90
6ebff7ce2c
Merged with UI-Input
...
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
2019-04-04 16:45:57 +02:00
Pfauenauge90
6d6c585808
char window
...
Former-commit-id: e3a6e5aadf20f60e6db237d63382cd55cd8211b9
2019-04-04 15:51:36 +02:00
Pfauenauge90
b29343490f
disabled chat arrows
...
Former-commit-id: 5a5ea8e7101c16ae780af1fb9b3e6e4ba59a98b4
2019-04-02 16:25:14 +02:00
