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
6,620 Commits 151 Branches 18 Tags 2.1 GiB
df955c158a
Commit Graph

6620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
df955c158a Made shaders compile by adding locations and bindings and splitting textures and samplers out into two things and adding guards for double including shaders 2021-02-22 22:25:37 -05:00
Imbris
c2418fa3ed Improve shader errors by showing shader file name, reduce repetitive shader construction code 2021-02-22 22:25:37 -05:00
Imbris
7252e2b793 migrate cloud pipeline, migrate iced renderer, rebase fixes 2021-02-22 22:25:37 -05:00
Imbris
ad54831c97 Make compile through various changes, update wgpu to latest git 2021-02-22 22:25:35 -05:00
Capucho
45c6638737 More fixes 2021-02-22 22:23:09 -05:00
Capucho
cd2901a3c7 Switched from zerocopy to bytemuck 
Fixing errors
 2021-02-22 22:20:19 -05:00
Capucho
91454ab0f7 Made the layouts more compact 2021-02-22 22:18:22 -05:00
Capucho
4fd9567da5 Finished porting all pipelines 2021-02-22 22:18:22 -05:00
Capucho
32a78c3988 Began porting pipeline creation 2021-02-22 22:18:22 -05:00
Capucho
d21709190c ported all pipelines 2021-02-22 22:18:22 -05:00
Capucho
fc800a7d53 Ported most of the textures and models related methods 2021-02-22 22:18:22 -05:00
Capucho
a43c7c7496 Started the report of wgpu 2021-02-22 22:18:20 -05:00
Marcel
2fbd382c91 Merge branch 'xMAC94x/physics_followup' into 'master' 
physics followup, fix arrow problems

See merge request veloren/veloren!1811
 2021-02-23 02:00:40 +00:00
Imbris
f33d3873b4 Merge branch 'aweinstock/modular-weapon-rigging' into 'master' 
Support modular weapon voxel meshes being made by assembling their components.

See merge request veloren/veloren!1806
 2021-02-23 00:45:26 +00:00
Avi Weinstock
c3ac8a1b51 Support modular weapon voxel meshes being made by assembling their components. 2021-02-23 00:45:26 +00:00
Marcel
6081ebbe15 Merge branch 'sam/ecs-sys-struct' into 'master' 
Sam/ecs sys struct

See merge request veloren/veloren!1813
 2021-02-23 00:08:09 +00:00
Marcel Märtens
6008109413 physics followup, fix arrow problems by adding the vel_dt to the collision boundry 2021-02-22 23:51:01 +01:00
Marcel
72bd0f42fc Merge branch 'xMAC94x/prot_improvements' into 'master' 
xMAC94x/prot_improvements

See merge request veloren/veloren!1796
 2021-02-22 22:47:43 +00:00
Justin Shipsey
56f8e66d5d Merge branch 'steanne-master-patch-91284' into 'master' 
Update _manifest.ron for minor typos in villager statements

See merge request veloren/veloren!1807
 2021-02-22 22:10:38 +00:00
Sam
3f467a32e6 Changed naming from 'immutable data' to 'read data' 2021-02-22 16:02:37 -05:00
Justin Shipsey
fb9b7ce986 Merge branch 'snowram/look-dir-anims' into 'master' 
Adds look_dir to anims, humanoid heads pivot fixes

See merge request veloren/veloren!1812
 2021-02-22 20:55:18 +00:00
Sam
2b5120319d Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Marcel Märtens
e3ef4422b6 cleanup ClientConnArgs 2021-02-22 21:07:20 +01:00
Sam
fae1db90d5 Controller system now uses immutable data struct 2021-02-22 14:33:54 -05:00
Sam
dcacd82293 Stats system now uses immutable data struct 2021-02-22 14:27:34 -05:00
Sam
27fe1c20ac Aura system now uses immutable data struct 2021-02-22 14:14:10 -05:00
Sam
4c0c06ea4c Buff system now uses immutable data struct 2021-02-22 14:03:18 -05:00
Snowram
684961b15c Adds look_dir to anims, humanoid heads pivot fixes 2021-02-22 20:00:06 +01:00
Sam
605513ea56 Beam system now uses immutable data struct 2021-02-22 13:57:56 -05:00
Sam
11a0d67b35 Shockwave system now uses immutable data struct 2021-02-22 13:49:56 -05:00
Sam
b278cad807 Projectile system now uses immutable data struct 2021-02-22 13:37:42 -05:00
Sam
91e982b3ee Melee system now uses immutable data struct 2021-02-22 13:25:21 -05:00
Marcel Märtens
3f5c64bec0 Client::new can now resolve DNS requests, better networking error messages 2021-02-22 17:35:19 +01:00
Marcel Märtens
1a7c179bbb share tokio Runtime between Client and Server, name rayon Threadpool 2021-02-22 17:35:06 +01:00
Marcel Märtens
514d5db038 Update Network Protocol 
- now last digit version is compatible 0.6.0 will connect to 0.6.1
 - the TCP DATA Frames no longer contain START field, as it's not needed
 - the TCP OPENSTREAM Frames will now contain the BANDWIDTH field
 - MID is not Protocol internal

Update network
 - update API with Bandwidth

Update veloren
 - introduce better runtime and `async` things that are IO bound.
 - Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking`
 - remove futures_execute from client and server use tokio::runtime::Runtime instead
 - give threads a Name
 2021-02-22 17:34:55 +01:00
Marcel
cee08c7012 Merge branch 'Dumbeldor/opti_phys_entities' into 'master' 
Physics improvements

See merge request veloren/veloren!1809
 2021-02-22 14:17:23 +00:00
Vincent Glize
4f37c626ea Optimize Entity <> Entity collision check by calculating a entity via sphere. 2021-02-22 12:36:42 +01:00
Imbris
dfe4a3be40 Merge branch 'slipped/savetheuniverse' into 'master' 
fix glider crash

See merge request veloren/veloren!1808
 2021-02-22 06:31:12 +00:00
Justin Shipsey
1f88b87ca4 fix glider crash 2021-02-22 06:31:12 +00:00
Joshua Barretto
e2290783fc Merge branch 'humanoid_ai_glide_when_falling' into 'master' 
FIX #956: Humanoid ai glide when falling

See merge request veloren/veloren!1772
 2021-02-22 00:57:25 +00:00
Overblob
370259fe54 CI - Fix clippy errors 
Fix trailing whitspace
 2021-02-22 00:57:25 +00:00
steanne
838a0d8928 Update _manifest.ron for minor typos in villager statements 2021-02-22 00:04:02 +00:00
Samuel Keiffer
3cb6a5592d Merge branch 'aweinstock/speed-floor-quickfix' into 'master' 
Change the speed floor to `0.1` (avoiding a division by zero in modular...

See merge request veloren/veloren!1804
 2021-02-21 02:49:57 +00:00
Samuel Keiffer
836d34066a Merge branch 'sam/food-queue' into 'master' 
Food buff queues

See merge request veloren/veloren!1803
 2021-02-21 01:06:50 +00:00
Avi Weinstock
3606490308 Change the speed floor to 0.1 (avoiding a division by zero in modular weapons accidentally buffed the Twitching Root). 2021-02-20 19:19:26 -05:00
Sam
f24490dc80 Added functionality for buffs queueing. Saturation now queues. 2021-02-20 17:13:17 -05:00
Sam
f5a74b4f33 Removed duplicate possess stick 2021-02-20 17:12:27 -05:00
Ben Wallis
6001934e8f Merge branch 'aweinstock/modular-weapons' into 'master' 
Aweinstock/modular weapons

See merge request veloren/veloren!1795
 2021-02-20 22:06:11 +00:00
Avi Weinstock
c489d095df Implement persistence for modular weapons. 
This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search.

Squahed fixes:

- Fix some constraint violations that occurred when swapping inventory items.
- Comment out recipes for modular weapons.
- Make update_item_at_slot_using_persistence_key and is_modular more idiomatic.
- Add changelog entry.
- Document `defer_foreign_keys` usage.
 2021-02-20 14:31:46 -05:00
Avi Weinstock
8bdbf4f7c9 Implement modular weapons. 
- Add ItemKind::ModularComponent, Item::components.
- Add tool::StatKind::{Direct,Modular} for the modular weapons themselves.
- Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account.
- Crafting stores into the components field.
- Components/recipes/placeholders are created dynamically.
- Show which components a modular weapon contains in the tooltip in voxygen.

Squashed fixes:
- `Item::duplicate` components in `Item::new_from_item_def`.
- Speed of 1.0 for now.
 2021-02-20 14:30:39 -05:00