Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,532 Commits 151 Branches 18 Tags 2.1 GiB
5d18fc26f5
Commit Graph

221 Commits

Author SHA1 Message Date
timokoesters
20248a4818
feat: store items as RON files 
When a new item is created, a ron file will be used as a template
 2019-10-24 23:47:26 +02:00
Imbris
2fad65c749 Merge branch 'imbris/graphic-cache' into 'master' 
Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures.

See merge request veloren/veloren!609
 2019-10-24 05:27:09 +00:00
Imbris
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
Imbris
b09bddda79 Make clients subscribed to nearby regions and only send physics updates from those regions. 2019-10-23 22:43:02 -04:00
Imbris
24d1f6d970 Add initial region system implementation 2019-10-23 22:39:42 -04:00
Imbris
8bb54976eb Rework GraphicCache to use multiple texture atlases and put large images in their own textures. 2019-10-19 21:28:30 -04:00
Shane Handley
eb65e4411f WIP (testing) Update conrod_core 
This is a `cargo update -p conrod_core` to bring in updates to
`veloren/conrod/conrod_core` to add support for copy and paste.

Ref: veloren/conrod!2

Fixes #171
 2019-10-19 15:12:37 +09:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
Marcel Märtens
30c9fcc911 Fix bug that metrics took a random port always introduced in !584 
also removed the duplicate port from the server creation process, using the server settings struct now
 2019-10-11 14:19:55 +02:00
Wu Yu Wei
4b80f88085 Bind random port for ServerMetrics 2019-10-11 09:06:34 +00:00
KyoZM
1998ed2fdd load structures from ron files / transfer static structure lists to ron files 2019-10-10 20:53:13 -03:00
Marcel Märtens
20c520a044 Change the version number to 0.4 2019-10-10 15:48:01 +02:00
Wu Yu Wei
75df4600bd Switch portpicker dependemcy to git 
A pull request to fix has been created on original repository. But
since 0.4 is coming out pretty soon, let's swithc to this fork
temporary.
 2019-10-07 15:35:20 +00:00
Brian Lewis
86619d4192 Fix crashing due to error in Alsa. 
This uses a more recent version of cpal (a dependency of rodio hence the
rodio change) which seems to have fixed a crash due to
'device not available: "Invalid argument"' coming from Alsa.

The change in cpal also made some functions now return `Result` instead
of a bare type which I dealt with by using `expect` to minimize how far
these changes fan out into the code but maybe this isn't ideal.

Fixing https://gitlab.com/veloren/veloren/issues/280 - Crash with ALSA
 2019-10-06 11:24:42 +02:00
Forest Anderson
b13f9f37f7 Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" 
This reverts merge request !547
 2019-10-06 01:31:47 +00:00
Forest Anderson
e1bab6afe0 Added jemalloc for Linux systems 2019-10-05 17:57:29 -04:00
Forest Anderson
9ef98ce1a5 Remove heaptrack 2019-10-05 17:57:29 -04:00
Songtronix
43cae5ea64 Fix discord rich presence 2019-10-05 15:35:59 +00:00
Wu Yu Wei
193ff105e2 Update client-side password hashing to argon2 2019-10-05 13:12:20 +00:00
Mckol
9aba318df2 Hash the passwords client-side 2019-10-04 16:44:31 +00:00
Forest
12bdefd146 Updated cargo.lock 2019-10-03 17:20:16 -04:00
Acrimon
03bf74f414 Updated toolchain version and a bunch of deps. 2019-10-03 17:19:22 -04:00
Songtronix
bced3cb638 feat(voxygen): add logo for windows executable 2019-10-02 16:57:08 +02:00
Imbris
f182733074 Small cache experiments 2019-09-22 22:19:07 -04:00
Acrimon
5487c8b7bc Update lockfile. 2019-09-17 16:12:26 +02:00
Acrimon
1dfbe40731 Made the worldgen noise generators seed from the RNG and got rid of zerocopy. 2019-09-17 16:05:08 +02:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping 
With an additional approximation to allow for the same size jumps given different framerates.
 2019-09-09 19:11:40 +00:00
Marcel Märtens
49b08b55c7 switch from hyper http to rouille for http server 2019-09-09 10:07:25 +02:00
Marcel Märtens
b05e51152f update version, revert from static prometheus back to normal because static doesnt supprot registries, and implement most of the metrics except for entity count 2019-09-09 09:54:30 +02:00
Marcel Märtens
8d3fb40419 first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count 2019-09-09 09:48:44 +02:00
Forest
000efebfd1 Updated cargo lock 2019-09-08 11:28:56 -04:00
haslersn
d322384bec common: Add benchmark for Chonk 2019-09-06 15:44:36 +02:00
Louis Pearson
0fe5b66dce Use latest version of Rodio instead of custom branch 2019-09-05 03:04:53 -06:00
Monty Marz
f53904b534 More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
timokoesters
269d179243
Remove vek patch, it's on crates.io now 2019-08-26 17:26:16 +02:00
timokoesters
c4879307af
Update to github vek repo 2019-08-26 13:12:45 +02:00
timokoesters
a715a84ea7
Implement unstoppable rolling 2019-08-26 13:12:42 +02:00
Acrimon
cb4374160c Removed unsafe. 2019-08-19 00:55:04 +02:00
Imbris
5054f1e87d remove palette dependency 2019-08-16 00:01:20 -04:00
Imbris
be0e0e52a8 Improve colors 2019-08-15 23:59:09 -04:00
Imbris
cb25c45dec Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Acrimon
42e065d425 [Common] Switch mutexes and channels. 2019-08-16 00:19:54 +02:00
Acrimon
593deb828b [Server] Switched mpsc for crossbeam::channel. 2019-08-16 00:10:46 +02:00
Acrimon
fda47fc322 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Acrimon
b4a46f3e6e Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
ed4909670d Use hashbrown instead of fxhashmap in world. 2019-08-11 22:10:36 +02:00
Acrimon
22f318833c Migrate client to hashbrown. 2019-08-11 21:54:20 +02:00
Acrimon
0bbef0d851 Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Acrimon
4f2d99f809 Switch to hashbrown in server. 2019-08-11 21:48:02 +02:00
Piotr Korgól
d3f2ca69a4 Change the version number to 0.3 2019-08-04 13:53:59 +02:00
Marcel Märtens
e4a9721588 fixed #211 - host specs-idvs on gitlab.com 2019-08-02 10:16:55 +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
Acrimon
3f85f35084 Fix lockfile. 2019-07-31 11:45:23 +02:00
Acrimon
9fbf710cc9 Swapped some rarely use storages. 2019-07-31 11:41:29 +02:00
Acrimon
c2f8dbc2d7 Updated specs-idvs. 2019-07-31 11:41:29 +02:00
Acrimon
005a1b6640 Update specs-idvs 2019-07-31 11:41:29 +02:00
Acrimon
c75925c5a3 Updated specs-idvs 2019-07-31 11:41:29 +02:00
Acrimon
579651c862 Update lockfile. 2019-07-31 11:41:29 +02:00
Acrimon
a5b19935a2 Use named generator in worldgen. 2019-07-30 16:10:59 +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
Piotr Korgól
5c84508015 Get EXP for killing NPCs and Players, properly show EXP bar 2019-07-26 20:51:40 +02:00
Acrimon
deb6c6adef Some other stuff I missed to commit. (Hooked into server-cli) 2019-07-24 02:20:35 +02:00
Jessie Mancer
4893ab5c2a fix spawn command placement to be random to improve AI responsivity and not spawn directly on player 2019-07-21 18:22:13 +00:00
Songtronix
bfa6a2e2a2 add configurable TimeOfDay 2019-07-17 18:32:02 +02:00
Songtronix
1213d9844b add customizable port and worldseed 2019-07-17 18:32:00 +02:00
Acrimon
b11bc46e09 Update uvth in lockfile. 2019-07-15 22:11:18 +02:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
Acrimon
69537f7dd9 Switched threadpool impl for veloren/server. 2019-07-12 18:30:15 +02:00
Songtronix
07754b0a79 fmt 2019-07-07 16:16:07 +02:00
Songtronix
8220564fa6 Fix rebasing issues 2019-07-07 16:16:07 +02:00
Songtronix
2338084af0 Add Linux support 2019-07-07 16:16:06 +02:00
Joshua Barretto
51ad1f1995 Improved remeshing performance 2019-07-06 20:00:17 +01:00
timokoesters
215693137b
Implement chat command key 2019-07-05 18:21:11 +02:00
Sheldon Knuth
6d624e96a6 fix the missing set_playing(true) in AudioPlayer::load() to prevent infinity thread loop & adopt std::sync::{Mutex, Condvar} for accurate thread blocking. 2019-07-03 17:23:24 +00:00
Sheldon Knuth
c3671590e9 Loading no-audio mode from the game start without rodio crate initialisation completely 2019-07-02 18:35:40 +00:00
Sheldon Knuth
c699801d78 Revamping the audio system for Voxygen from #163 2019-07-02 04:10:55 +00:00
Songtronix
80f7a22182 upgrade dependencies 2019-06-29 17:25:58 +02: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
8da46b48ac Added frustum culling for chunks 2019-06-06 10:04:37 +01:00
Joshua Barretto
9da2d82197 Added proper VD fog 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
Louis Pearson
3723649d39 Update cpal 2019-06-05 13:17:19 -04:00
Ahmed Ihsan Tawfeeq
eb80459872 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -04:00
Louis Pearson
70b503868e Add fix for headphone and invalid device params 2019-05-31 14:24:33 -06:00
Louis Pearson
64d38e687b Move to latest version of cpal 2019-05-31 13:19:32 -06:00
Louis Pearson
e647be3e57 Update cpal again 
Former-commit-id: b5810766a8f37095401f05d5fb787b9e478f0bd2
 2019-05-28 15:01:10 -06:00
Louis Pearson
10b21ff380 Recreate Cargo.lock from master Cargo.lock 
Former-commit-id: e26cfbede0634e1a771257ecd22e05afbce7a85e
 2019-05-28 15:01:10 -06:00
Louis Pearson
4502def070 Fix game crashing when trying to start audio 
Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27
 2019-05-28 15:01:10 -06:00
timokoesters
cda253c3cf Make Failed to tick go back to the main screen and move to ron 
Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
 2019-05-26 12:58:43 +02:00
Joshua Barretto
c8ba5d9f89 Basic pine tree spawning 
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
 2019-05-25 05:51:45 +01:00
Joshua Barretto
4d73f38e6d Refactored worldgen sampling, added cache layer 
Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5
 2019-05-25 05:51:45 +01:00
Joshua Barretto
857315a27d Added basic structure generation 
Former-commit-id: 88a6bf2e18ac4f8f9b560797c8aac82ca318afb0
 2019-05-25 05:51:45 +01:00
jshipsey
e84d19b5c8 fmt 
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
 2019-05-24 19:01:10 -04:00
Joshua Barretto
feece604be Restarted worldgen 
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
 2019-05-21 22:51:41 +01:00
Louis Pearson
b0f26633d3 Remove lewton, fix filename issue 
Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983
 2019-05-18 14:26:16 -06:00
Louis Pearson
22286c24e6 Play random music whenever a track ends 
To support this, a global_state.maintain() method was added that calls
audio.maintain().


Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
 2019-05-18 13:53:57 -06:00
Joshua Barretto
db4be8e492 Updated sphynx 
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
 2019-05-17 00:05:46 +01:00
Imbris
3b5fec6630 add backtrace to panic hook 
Former-commit-id: 3f66b4b72347a734779c1611814be88df4f8397b
 2019-05-14 03:41:27 -04:00
Imbris
ca60b86f53 add ImageSlider widget 
Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2
 2019-05-13 13:09:38 -04:00
robojumper
ee9f54bacd Move u_globals to shared included file 
Former-commit-id: b6122177ce98cd52bc032e2d8414671d3bcb9b5c
 2019-05-12 11:23:21 +02:00
Joshua Barretto
871767ada0 Made single-player server start on random unused port 
Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
 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
33e93ef25f Added basic byte XOR checksum 
Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
 2019-05-09 18:57:47 +01:00
Imbris
81c5a070c5 move conrod font out of common 
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
 2019-05-07 02:25:26 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style 
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
 2019-05-07 01:08:27 -04:00
Imbris
1d5020634d revamp asset system with a global singleton cache 
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
 2019-05-07 00:44:44 -04:00
Imbris
f0b0b83cc8 Store thread pool in State, Remove unnecessary dep 
Former-commit-id: cbce09915267f264801c174817b97ed3528715fd
 2019-05-01 14:10:43 -04: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
03051248b9 Added user-friendly error output for Voxygen 
Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
 2019-04-25 13:08:46 +01:00
timokoesters
799046f5f0 Update Cargo.lock 
Former-commit-id: 1d8a788d67c6e55056f58bc55bf9de6d993b68e8
 2019-04-22 17:25:34 +02:00
Imbris
1143c58e37 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -04:00
Imbris
2e69526069 initial setup for .vox rendering 
Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
 2019-04-19 15:00:13 -04:00
Louis Pearson
7ec6e09332 Add basic singleplayer support 
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
 2019-04-17 07:41:34 -06:00
Joshua Barretto
2c650f9cff Added basic agent AI 
Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05
 2019-04-17 01:39:39 +01:00
Joshua Barretto
d4368e2891 Merge branch 'master' into 'master' 
add chat commands

See merge request veloren/veloren!33

Former-commit-id: dbef1677b800ae3eaecdeba4fda12973654c9149
 2019-04-16 21:16:07 +00:00
Sebastian Venter
031e4b36d6 add chat commands, rustfmt 
Former-commit-id: 64941127598b53c64fe2e0e7c167f0ce3f358060
 2019-04-16 18:08:47 +01:00
Louis Pearson
9592eb67c5 Add default keybindings 
Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
 2019-04-16 08:57:31 -06:00
Joshua Barretto
728ba8cf41 Added cargo lock, updated sphynx 
Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
 2019-04-14 17:39:32 +01:00