Commit Graph

2582 Commits

Author SHA1 Message Date
Sebastian Venter
031e4b36d6 add chat commands, rustfmt
Former-commit-id: 64941127598b53c64fe2e0e7c167f0ce3f358060
2019-04-16 18:08:47 +01:00
Louis Pearson
515039c62d Add auto generation of settings.toml if it does not already exist
Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5
2019-04-16 10:06:23 -06:00
Louis Pearson
9592eb67c5 Add default keybindings
Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:57:31 -06:00
Louis Pearson
55f3f0857f Add support for keybinding
Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1
2019-04-16 08:57:31 -06:00
Joshua Barretto
19d6b7b38a Merge branch 'anim' into 'master'
Animation States

See merge request veloren/veloren!31

Former-commit-id: 4f59aa8df9dbbcb9e89696a3b76b17a77a0f706a
2019-04-16 14:29:45 +00:00
Piotr
ddb32eec30 Animation States
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
2019-04-16 14:29:44 +00:00
Joshua Barretto
0a2b0e98e8 Merge branch 'master' into 'master'
Add proper README

See merge request veloren/veloren!32

Former-commit-id: 4880c96a57f0a06706421d4818bac8a677b599ae
2019-04-16 09:25:57 +00:00
timokoesters
53aea6c4c0 Add proper README
Former-commit-id: f615e2eff7ff3522d11758e9a607d30beb6eb707
2019-04-16 11:12:46 +02:00
Pfauenauge90
858055b8c4 Error Window
Former-commit-id: e58ba8be94bb6f6b39c713f44dec20089c20b348
2019-04-15 22:51:32 +02:00
Joshua Barretto
42686f5758 Merge branch 'master' into 'master'
Remove unnecessary == true

See merge request veloren/veloren!29

Former-commit-id: 89739c0788f389e8d9c7f4a8c2df2e177d274633
2019-04-15 17:52:11 +00:00
timokoesters
7ca6be2d5b Remove unnecessary == true
Former-commit-id: bb9df3870e2549b8e66b0cc8d2ece29e336f22e9
2019-04-15 19:39:01 +02:00
Joshua Barretto
a41b642570 Merge branch 'master' into 'master'
Solve physics fighting problem

See merge request veloren/veloren!27

Former-commit-id: 010af4fb0f31b854dd1f8c42f6a65711cc9d84cd
2019-04-15 16:43:41 +00:00
Joshua Barretto
f32852054d Merge branch 'master' into 'master'
Disable zooming when mouse is over UI elements

See merge request veloren/veloren!28

Former-commit-id: cd6f02ac06777c0ed065024f31d3960a2af4898a
2019-04-15 01:19:46 +00:00
Imbris
571e319a62 make zooming always work if cursor is grabbed
Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7
2019-04-14 20:53:42 -04:00
Imbris
e755afce91 simplify chat keybaord capture
Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe
2019-04-14 20:45:54 -04:00
Imbris
b7439b9107 ignore tx.send() result
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
2019-04-14 20:23:26 -04:00
Imbris
3812e0b58f stop zooming when scrolling chat
Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7
2019-04-14 20:15:12 -04:00
Joshua Barretto
520706debf Updated gitignore
Former-commit-id: aa8f178f7004c61af2f0463bc1b190ae25909372
2019-04-15 00:29:28 +01:00
Joshua Barretto
c98d841890 Fixed physics sync
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
2019-04-15 00:29:28 +01:00
Joshua Barretto
1e90cf68d5 Merge branch 'async_login' into 'master'
Add asynchronus client creation to Voxygen

See merge request veloren/veloren!26

Former-commit-id: 51278bbde64ac9dd48bc34a6e7b7922958883f73
2019-04-14 23:28:29 +00:00
Imbris
e377e8ff09 Add asynchronus client creation to Voxygen
Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e
2019-04-14 23:28:29 +00:00
Joshua Barretto
490d255d48 Merge branch 'master' into 'master'
Added cargo lock, updated sphynx

See merge request veloren/veloren!25

Former-commit-id: 8df34e0fc051fe09363735f344f3d774ea3823cd
2019-04-14 16:53:11 +00:00
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