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
8,336 Commits 151 Branches 18 Tags 2.1 GiB
f62718044d
Commit Graph

8336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
9f399f9076 Color! 2021-05-30 11:49:40 -04:00
Imbris
2d418f3d69 fixed validation errors when creating pipelines 2021-05-30 11:49:40 -04:00
Imbris
f67fce54fe No crash on startup 2021-05-30 11:49:40 -04:00
Imbris
3b9e89c085 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-05-30 11:49:40 -04:00
Imbris
c8be3d20f9 Improve shader errors by showing shader file name, reduce repetitive shader construction code 2021-05-30 11:49:40 -04:00
Imbris
fd0a9f67c9 migrate cloud pipeline, migrate iced renderer, rebase fixes 2021-05-30 11:49:40 -04:00
Imbris
08b787e049 Make compile through various changes, update wgpu to latest git 2021-05-30 11:49:40 -04:00
Capucho
3502699732 More fixes 2021-05-30 11:49:40 -04:00
Capucho
05d97e2f2f Switched from zerocopy to bytemuck 
Fixing errors
 2021-05-30 11:49:40 -04:00
Capucho
7e3971949d Made the layouts more compact 2021-05-30 11:49:40 -04:00
Capucho
8045b98867 Finished porting all pipelines 2021-05-30 11:49:40 -04:00
Capucho
5336fb9255 Began porting pipeline creation 2021-05-30 11:49:39 -04:00
Capucho
63e4579d70 ported all pipelines 2021-05-30 11:49:39 -04:00
Capucho
a8981aef67 Ported most of the textures and models related methods 2021-05-30 11:49:39 -04:00
Capucho
0a5ef49d05 Started the report of wgpu 2021-05-30 11:49:39 -04:00
Marcel
f8b642ce86 Merge branch 'aweinstock/economy-20210528' into 'master' 
Fix economy data not properly being used to price trades, resulting in default...

See merge request veloren/veloren!2353
 2021-05-28 22:05:24 +00:00
Avi Weinstock
5380fc4eac Clear the economy database when creating it. 2021-05-28 16:14:31 -04:00
Avi Weinstock
3684cf0454 Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. 
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
 2021-05-28 15:09:29 -04:00
Marcel
2771c29d54 Merge branch 'sam/torvus-fix' into 'master' 
Fixed torvus

See merge request veloren/veloren!2351
 2021-05-28 12:01:45 +00:00
Sam
9db8406e4c Fixed torvus 2021-05-27 19:56:16 -05:00
Samuel Keiffer
a0fc75ad18 Merge branch 'sam/small-fixes' into 'master' 
Fixed bow AI and inactive weapon exp gain

See merge request veloren/veloren!2349
 2021-05-28 00:45:45 +00:00
Sam
01f82314dc Fixed a few oddities with the AI 2021-05-26 21:34:21 -05:00
Sam
b826d5cb2b Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Sam
42c8c08145 Fixed bow AI 2021-05-26 20:53:29 -05:00
Monty Marz
99cf533a8a Merge branch 'aweinstock/bow-zoom-charge-master' into 'master' 
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.

See merge request veloren/veloren!2339
 2021-05-26 17:34:47 +00:00
Avi Weinstock
d6442dbd3b Change the ChargedRanged zoom distance from 0.0 to 2.0, and add a delay after the mouse click before the zoom starts (i.e. hold to zoom, spam click will not zoom). 2021-05-26 11:51:29 -04:00
Avi Weinstock
7a97fbb5cf Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards. 2021-05-26 09:34:08 -04:00
Avi Weinstock
4d7828ec94 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00
Justin Shipsey
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
jshipsey
ae43102a5b anim 2021-05-26 00:04:15 -04:00
Samuel Keiffer
827c6c874d Merge branch 'juliancoffee/dungeon_refactoring' into 'master' 
Refactor enemy creation in dungeons

See merge request veloren/veloren!2344
 2021-05-25 23:22:26 +00:00
juliancoffee
6f0f3d1b62 Refactor enemy creation in dungeons 2021-05-26 01:39:48 +03:00
Marcel
2baa6f63bd Merge branch 'Extract-invite-handling' into 'master' 
Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and...

See merge request veloren/veloren!2328
 2021-05-25 20:34:47 +00:00
Jonathan Berglin
f5ed77184b Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
Justin Shipsey
1074352ca4 Merge branch 'juliancoffee/dungeon_chests' into 'master' 
dungeon chests

See merge request veloren/veloren!2342
 2021-05-24 23:05:20 +00:00
juliancoffee
c618ec7222 fmt 2021-05-25 01:23:32 +03:00
juliancoffee
2da8d96ec9 add CHANGELOG 2021-05-25 01:08:11 +03:00
juliancoffee
2d56b5dcde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
juliancoffee
3700cc8a67 Overhaul loot tables 2021-05-25 00:20:18 +03:00
juliancoffee
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
Marcel
80b8561317 Merge branch 'lboklin/wing-clip' into 'master' 
Fix higher than intended drag for winged entities

See merge request veloren/veloren!2336
 2021-05-24 11:42:12 +00:00
Samuel Keiffer
17e684f2a2 Merge branch 'juliancoffee/asset_loadout' into 'master' 
Move loadout creation to .ron files

See merge request veloren/veloren!2337
 2021-05-23 21:57:41 +00:00
juliancoffee
e248e795a1 fixing tests 2021-05-24 00:06:03 +03:00
juliancoffee
d80a45a066 Fix species tests for random body_type and fmt 2021-05-23 22:59:48 +03:00
juliancoffee
457e5b14d8 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9 Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
22b1880ae5 LoadoutBuilder efactoring 2021-05-23 20:29:19 +03:00
Sam
0961f00c7c Updated comments in states code. 2021-05-23 11:41:09 -05:00
juliancoffee
00b182c183 Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010 Add directory hierarchy 2021-05-23 19:19:20 +03:00