Commit Graph

347 Commits

Author SHA1 Message Date
Joshua Yanovski
c02f2a7f9e Fixes to worldgen and adding a debug command.
Humidity and temperature are now indexed to uniform altitude *over land
chunks* (and water chunks adjacent to land) rather than over the whole
range of altitude.  This is necessary in order to satisfy the uniformity
conditions of the formula for weighted sum CDF.

Additionally, fixes the computation of whether a tree should be
generated or not.  Previously, it was using a source of randomness
scaled to use much less than the full 0-1 range; this has been resolved.
This makes for much nicer and more gradual transitions between densities
and reduces the amount of completely barren landscapes, while also
making forests larger.

Finally, this commit adds a server command, debug_column, which returns
some useful debug information about a column given an x and y
coordinate.  This is useful for debugging worldgen.
2019-08-26 11:52:25 +02:00
Acrimon
a41cf1a83d Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Acrimon
b4a46f3e6e Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
22f318833c Migrate client to hashbrown. 2019-08-11 21:54:20 +02:00
telastrus
07d3384b01 fixed the silent kick, made it actually proper 2019-08-08 17:58:36 -04:00
telastrus
66e254db7f actually removed printlns 2019-08-08 12:09:14 -04:00
telastrus
35a3f67e19 ran cargo fmt 2019-08-08 12:05:38 -04:00
telastrus
de2082469d auth done, no popup yet 2019-08-08 12:01:15 -04:00
telastrus
f2ed2870c6 90% there 2019-08-08 11:23:58 -04:00
telastrus
6d94d43021 still compiles 2019-08-07 23:56:02 -04:00
telastrus
157c4816b3 laying the groundwork 2019-08-07 15:42:44 -04:00
Piotr Korgól
d3f2ca69a4 Change the version number to 0.3 2019-08-04 13:53:59 +02:00
Dominik Broński
f644b6ab89 Revert "Merge branch 'imbris/upgrade_specs' into 'master'"
This reverts merge request !375
2019-08-01 23:32:33 +00:00
Imbris
5f56657f6c Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
Joshua Barretto
39fc1d6b71 Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00
Joshua Barretto
b3cae2f3dd Added better item manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
31f8794c39 Started work on inventory manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
123a78552a Fixed block-hopping on edges, added correct inventory slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
5bb7998d5a Added inventory sync messages and InventoryUpdate component 2019-08-01 09:09:26 +01:00
timokoesters
b695a63e98 Send different physics components individually 2019-07-30 13:35:16 +02:00
Acrimon
ee49ebe807 Update rand, log and scan_fmt 2019-07-29 13:42:26 +00:00
timokoesters
5aa864ee58
Update most dependencies 2019-07-28 22:47:23 +02:00
tommy
95b5f4acfb Added private, broadcast, and game_state messages 2019-07-26 07:29:37 -04:00
tommy
cc6aa6f33d Adds colour to tells in chat box #194 2019-07-26 07:29:37 -04:00
Nero
53086cb3b2 Nero/light offsets 2019-07-25 20:51:20 +00:00
Joshua Barretto
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Songtronix
de2dbcef45 add global git hash constant 2019-07-21 17:45:31 +00:00
Joshua Barretto
ce327445a7 Send block diffs instead of entire chunks on block change 2019-07-20 16:41:03 +01:00
Songtronix
ed0d842e57 Mark InvalidAlias Message as to be done 2019-07-17 18:32:01 +02:00
Songtronix
b41508f025 generalise errors based on zests suggestion 2019-07-17 18:32:01 +02:00
Songtronix
b6c8bdc223 add configurable max player count 2019-07-17 18:32:01 +02:00
Acrimon
a36c049b06 Resolve Forests discussion. 2019-07-12 20:13:35 +02:00
Acrimon
b4f2cd1547 Resolve discussion from Timo. 2019-07-12 19:56:40 +02:00
Acrimon
a72722e5d1 Resolved discussion from imbris. 2019-07-12 19:35:11 +02:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
Piotr Korgól
bf748ae742 Add CanBuild component, Block placing client messages and build mode command 2019-07-03 21:28:07 +02:00
timokoesters
46670e2689
Fix clippy suggestions 2019-07-02 21:00:57 +02:00
timokoesters
fe0c7028e2
Remove warnings from client 2019-07-02 20:56:29 +02:00
timokoesters
d235374d8e
Fix npc and death bug 2019-06-29 22:43:44 +02:00
timokoesters
c80351f6ca
Fix double roll bug 2019-06-29 19:49:51 +02:00
timokoesters
b0ea959f67
Remove animation syncing (does not fix any known bug) 2019-06-29 17:09:38 +02:00
Imbris
16e5b6bafd circular view distance 2019-06-23 15:49:15 -04:00
timokoesters
9701a666d9
Don't try to compensate bad states 2019-06-17 20:10:47 +02:00
timokoesters
57894a0368
Fix join problems 2019-06-17 19:52:06 +02:00
timokoesters
f0e6e76423
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +02:00
timokoesters
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
a9d30bbfb6 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
Joshua Barretto
9fed2c1534 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
4ada144164 Changed debug flag in client 2019-06-05 20:52:51 +01:00
Joshua Barretto
732ba9ac02 Reduced tree density, shortened chunk load timeout 2019-06-05 20:52:51 +01:00
Joshua Barretto
76dca0b0cf Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816 Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Joshua Barretto
06201c7353 fmt 2019-06-05 20:52:51 +01:00
Joshua Barretto
92f2d36b0c Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Cody
692b216651 Fixes a bug where animals continually jumped after their target was any height above them, even once the target was no longer above them. 2019-06-03 20:09:18 +00:00
Timo Koesters
930bc91174 Merge branch 'fix-server-info' into 'master'
Add server info and player list to client

See merge request veloren/veloren!197
2019-06-02 14:45:41 +00:00
timokoesters
a69b5022c2
Add TODO 2019-06-02 16:35:21 +02:00
Monty Marz
112f0515bd Button added
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
2019-06-02 02:17:36 +00:00
Cody
75ca605f5d
Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names. 2019-05-31 16:36:24 -04:00
Imbris
e3e8afd99b Stop drawing entities outside the vd
Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf
2019-05-28 20:47:01 -04:00
Imbris
045f41dae7 Use vd setting when creating client
Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410
2019-05-28 19:16:06 -04:00
timokoesters
c10a43f541 Add server info
Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710
2019-05-28 22:25:46 +02:00
timokoesters
3d21cd7402 Get player count and calculate ping time
Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a
2019-05-28 21:55:05 +02:00
timokoesters
a6439984be Add connect, disconnect and kill messages
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
2019-05-27 19:45:43 +02:00
timokoesters
79a0edad85 Fix glider
Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad
2019-05-26 00:04:40 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
2019-05-25 23:46:56 +02:00
timokoesters
f4434013db Fix clear_terrain not changing Changes
Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa
2019-05-25 23:21:40 +02:00
timokoesters
3697c47e33 Change client_state_pending to ClientState::Pending
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8 Implement hit time delay
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
2019-05-25 23:21:39 +02:00
timokoesters
e34a47d0d7 Fix chunk loading delay
Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb
2019-05-25 23:21:39 +02:00
timokoesters
ad5dcb4158 Make use of states in char-selection
Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04
2019-05-25 23:21:38 +02:00
timokoesters
449b717777 Go back to char selection on death
Former-commit-id: a8b5ee42f432ff2da8385225b17be654420f17d1
2019-05-25 23:21:37 +02:00
timokoesters
b3e4ca0a5d Implement killing
Change animation history to animation
Add attack input event
Implement killing with ecs systems for damage and death
Sync attack properly
Sync deaths


Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e
2019-05-25 23:21:37 +02:00
Algorhythm
6456198b38 Add ping indicator to debug HUD
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
2019-05-23 08:18:25 +00:00
Joshua Barretto
3508e4afcb Added view distance configuration
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
2019-05-19 01:45:02 +01:00
Cody
6b09fd7c53 Pedantic comment and language fixes.
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Joshua Barretto
91184356e7 Added chonks
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
2019-05-17 18:44:30 +01:00
Joshua Barretto
04f83732e1 fmt
Former-commit-id: ba065e557c6309cfd7a743db5b52544ee57c3469
2019-05-16 22:04:16 +01:00
Joshua Barretto
7e8d8f4471 Fixed occasional chunk load failures
Former-commit-id: cf425a925cbcea4800f5e2ab82f8fb455cf96824
2019-05-16 21:18:48 +01:00
Joshua Barretto
7b09070fc8 fmt
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
2019-05-16 20:23:45 +01:00
Joshua Barretto
5092df0e7f Improved quadruped origin
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
2019-05-15 17:06:58 +01:00
Joshua Barretto
8ef8c178d7 Added test gliding
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
2019-05-15 13:26:14 +01:00
Joshua Barretto
e8b6e120dc Fixed pet spawning bug
Former-commit-id: 78dcd034940a4de1ce7d66a79d9134be6ee281f2
2019-05-15 13:26:14 +01:00
Joshua Barretto
67241fec31 Massively increased efficiency of terrain meshing, chunks generate from centre
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
2019-05-13 13:08:17 +01:00
Joshua Barretto
faf53ad5c9 Temporary networking issue fix
Former-commit-id: e6b47f7d8478c28d837e55b85f2f2d028e988737
2019-05-09 19:38:37 +01:00
Joshua Barretto
54cc9e137a fmt
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
2019-05-09 18:58:16 +01:00
Joshua Barretto
2e3288cc29 Adjusted view distance and worldgen
Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
2019-05-09 18:57:47 +01:00
Joshua Barretto
e6a40bbda2 Added jumping and Jump animation state
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
2019-05-09 18:57:47 +01:00
Joshua Barretto
342ea6aa65 Significantly upped view distances
Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f
2019-05-09 18:57:47 +01:00
Joshua Barretto
3cd48ba468 Added lz4 compression to networking
Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-09 18:57:47 +01:00
Joshua Barretto
b8418c116f Smaller worldgen range
Former-commit-id: 4c156376b5a835dadd5709b91a38ec8e00ab72fd
2019-05-09 18:57:47 +01:00
Joshua Barretto
bdf0e92e45 HAAAAAAAANDS
Former-commit-id: 88927242c21471888a00799110b6bc542e9e18a2
2019-05-09 18:57:47 +01:00
Joshua Barretto
33e93ef25f Added basic byte XOR checksum
Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
2019-05-09 18:57:47 +01:00
Forest Anderson
993388e56a Ran fmt on codebase
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
2019-04-29 20:37:19 +00:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
2019-04-29 20:43:04 +02: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
Joshua Barretto
fc8b7e9750 Worked on improving networking and terrain
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
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
f9f434a1c2 Started work on worldgen
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
2019-04-25 17:52:11 +01:00
timokoesters
701755a8e2 Add disconnect handling
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
2019-04-23 14:01:16 +02:00
timokoesters
df7a145bbc Better formatting
Former-commit-id: 4316514f4f58dca8ed21dae00fad7a6df36b9ff1
2019-04-23 12:12:22 +02:00
timokoesters
06693136b6 Fixed names, debug and notify
Former-commit-id: f58dedf7c4eb9b284982588fc6b19bbe3edb0391
2019-04-22 23:00:24 +02:00
timokoesters
e9027c6433 Split connecting from registering
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
2019-04-22 23:00:24 +02:00
timokoesters
9a48e2fd42 Rename ClientState Connected -> Registered, Visitor -> Connected
Former-commit-id: 34f6726203b7d20b42937a02f48d8920ca3f1d7a
2019-04-22 23:00:23 +02:00
timokoesters
07a2aab8a3 Rename Disconnected to Visitor
Former-commit-id: aeb729a933cda380c03efe346347fc4dc0648dfb
2019-04-22 23:00:23 +02:00
timokoesters
fc2e6c3624 Clean up client state code
Former-commit-id: 2469a49abd23038838f6176b7f5cf0b303e8bee5
2019-04-22 23:00:22 +02:00
timokoesters
794b9cafad Implement ClientStates
Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2
2019-04-22 23:00:22 +02:00
timokoesters
802c484a38 Make character model more variable
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
2019-04-22 23:00:21 +02:00
timokoesters
ec16153164 Rename animationHistory to animation_history
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
2019-04-17 22:32:36 +02:00
timokoesters
5044fe8cb5 Simplify code
Former-commit-id: c8bdf4199c913ab43ba08fdb19384bf7fcc6653d
2019-04-17 20:06:06 +02:00
timokoesters
abf32d6229 Add comments
Former-commit-id: 950c811256b8c20f58e4bb3c998acc746c4b929d
2019-04-17 19:41:20 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
2019-04-17 19:39:12 +02:00
timokoesters
1ae18fecf8 Change timeout to 20s
Former-commit-id: dca0d08a06c27259cdaaf0138024f53c6c93d94e
2019-04-17 16:46:04 +02:00
Joshua Barretto
8029edde0b Moved animation determination to Control ECS system
Former-commit-id: 6650bc4d882d3f6779f99afea2e05155ad008282
2019-04-17 09:59:38 +01:00
Joshua Barretto
edcabfa68f Fix creation update
Former-commit-id: 3ad0f4cd3ee8f319229f85f1c0c289be9d4b5bfb
2019-04-17 01:39:39 +01:00
Joshua Barretto
2c650f9cff Added basic agent AI
Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05
2019-04-17 01:39:39 +01:00
Joshua Barretto
2ea1de2659 Added smooth acceleration
Former-commit-id: 4dfc695e5d1485b77ef98b1f5895d3eee69c46e1
2019-04-16 20:21:49 +01:00
Piotr
ddb32eec30 Animation States
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
2019-04-16 14:29:44 +00:00
timokoesters
7ca6be2d5b Remove unnecessary == true
Former-commit-id: bb9df3870e2549b8e66b0cc8d2ece29e336f22e9
2019-04-15 19:39:01 +02:00
Joshua Barretto
c98d841890 Fixed physics sync
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
2019-04-15 00:29:28 +01:00
Joshua Barretto
276d5359cd Fixed player speed
Former-commit-id: becc175a91cd60a8957baa8eaaab35f740f677ed
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
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
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
Imbris
03b20fa1bd connect chat box to network
Former-commit-id: 581c724ee31564c7473120d5431ceb2182afb207
2019-03-20 01:26:22 -04:00
Joshua Barretto
26906d8674 Minor changes
Former-commit-id: 39beb7858926cb62a1f2d0db5c74e71c804c5962
2019-03-19 19:53:35 +00:00
Joshua Barretto
8a0adab381 Fixed ping timeout logic
Former-commit-id: 080ca9d4149ec0ecddd92c475d77e4fc92f6edaa
2019-03-19 11:35:38 +00:00
Joshua Barretto
ffc4e6ebd4 Improved State API design
Former-commit-id: a32ab93409b1044fe2838f684d30ca2b963d4eb2
2019-03-19 11:35:38 +00:00
Joshua Barretto
99bd0630b7 Added post refactor unit tests
Former-commit-id: 66ea368de32dc6dfe22fc752476b71856e0588a0
2019-03-19 11:35:38 +00:00
Joshua Barretto
664f28a972 Patched in netcode refactor
Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386
2019-03-19 11:35:38 +00:00
Joshua Barretto
a8b0039898 Added networked entity updates, player entity allocation
Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c
2019-03-19 11:35:38 +00:00
Joshua Barretto
bb93f29522 Fixed client/server comms bug
Former-commit-id: fffc9cbf59784e7e2c9c2d9a60b8f2520b6f41fb
2019-03-19 11:35:38 +00:00
Joshua Barretto
2e613178a0 Component sync + UID system
Former-commit-id: 5ecddc0e1f9c1a15f99dd167b825178c972da062
2019-03-04 19:58:58 +00:00
Joshua Barretto
dbbcc1e80e Added basic networked communications, chat communication
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
2019-03-04 19:58:58 +00:00
Imbris
33b8922aa4 move/name velocity constant, rename move_vec, simplify cam rotate_by()
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
2019-03-02 14:43:51 -05:00
Imberflur
6f5f80f749 add player movement with basic physics ecs system
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
2019-03-01 22:48:30 -05:00
Joshua Barretto
248577bdef Added test terrain loading and meshing 2019-01-23 20:01:58 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +00:00
Joshua Barretto
b37a6b67f9 Added time of day, tick time, basic skybox shader and client to voxygen 2019-01-12 15:57:19 +00:00
Joshua Barretto
523db9f054 Started work on adding terrain 2019-01-02 19:22:01 +00:00
Joshua Barretto
819af1594f Initial structure 2019-01-02 17:23:31 +00:00