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,784 Commits 151 Branches 18 Tags
Commit Graph

2839 Commits

Author SHA1 Message Date
juliancoffee
9bffa6f9e1 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
Joshua Barretto
0d3cd7897f Merge branch 'aweinstock/tighten_e2t' into 'master' 
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.

See merge request veloren/veloren!2460
 2021-06-18 16:27:20 +00:00
Joshua Barretto
493e0c9b2e Merge branch 'zesterer/meta' into 'master' 
Optimising for size

See merge request veloren/veloren!2468
 2021-06-18 12:35:16 +00:00
Joshua Barretto
6f6a7e3617 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
38907a8bf2 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
Joshua Barretto
d4dd756eea Merge branch 'zesterer/no-cmd-santisation' into 'master' 
Made dealing with chat vs commands safer for clients, made /alias require moderator permissions

See merge request veloren/veloren!2472
 2021-06-18 10:55:57 +00:00
Joshua Barretto
c3c8fcc54a Renamed command event 2021-06-18 11:31:06 +01:00
DaforLynx
ae84557cca More npc sfx 2021-06-18 06:24:57 +00:00
Joshua Barretto
92c6128ac8 Made /alias moderator-only 2021-06-17 19:55:46 +01:00
Joshua Barretto
e2f558dacd Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
DaforLynx
fd2094ca3d Added npc hurt sfx 2021-06-17 05:49:09 +00:00
jshipsey
85fdf467fd basilisk tweaks 2021-06-16 23:28:25 -04:00
jshipsey
a98734d609 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Joshua Barretto
19dd62a887 More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
0d39e4047e Emit sound from head 2021-06-16 17:23:22 +01:00
Joshua Barretto
0a8d4af404 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
64e79b5659 Chasing sounds 2021-06-16 17:23:22 +01:00
Avi Weinstock
28cbaad146 Address MR 2460 comments. 
- Switch from point query to AABB query to take into account block thickness.
 2021-06-15 22:52:02 -04:00
Avi Weinstock
e8ff267f90 Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04:00
Snowram
e2b26dc0ef Addresses comments about roc AI 2021-06-15 09:50:23 +02:00
Snowram
e32c103e9a Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
a5ff4be601 Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
aa62ad8bc0 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
3df69ba11d Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Imbris
4188b23cc8 Merge branch 'imbris/userdata-tweak' into 'master' 
Fallback to executable strategy for the userdata rather than panicking when...

See merge request veloren/veloren!2445
 2021-06-15 03:22:51 +00:00
Samuel Keiffer
2218018177 Merge branch 'juliancoffee/swing_fix' into 'master' 
Introduce hit_timing for combo_melee

See merge request veloren/veloren!2426
 2021-06-15 02:38:23 +00:00
Imbris
1be7a62d63 Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder 2021-06-14 21:42:50 -04:00
Avi Weinstock
3267765e85 Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller. 2021-06-14 13:39:50 -04:00
Marcel
6225666050 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' 
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
 2021-06-14 14:42:01 +00:00
Marcel
27e0b17651 Merge branch 'aweinstock/mining-skill-tree' into 'master' 
Mining skill tree.

See merge request veloren/veloren!2406
 2021-06-14 14:19:06 +00:00
Marcel
f41bedc02c Merge branch 'juliancoffee/asset_entity' into 'master' 
EntityInfo assetization.

See merge request veloren/veloren!2382
 2021-06-14 12:56:28 +00:00
juliancoffee
ec6bcea8f1 Responding to review 
- make `skillset_builder::Preset` void enum and left comment about how to
extend it
- add `.with_default_equipment()` in case if preset is missing to `basic_summon`
loadout creation to match old `build_loadout()` behaviour
 2021-06-14 15:40:02 +03:00
Avi Weinstock
37730a0993 Move force-movement e2e check so that it doesn't confer immunity to arrows. 2021-06-13 20:38:03 -04:00
Monty Marz
0d8db1b417 Merge branch 'pfau/cactus_drink' into 'master' 
Cactus Colada

See merge request veloren/veloren!2431
 2021-06-13 20:03:58 +00:00
Avi Weinstock
4bd989e2a5 Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
Monty Marz
c34fa59a08 icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
667e5eb510 Mining skill tree. 2021-06-13 14:34:42 -04:00
Marcel Märtens
e7b587eaa2 implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling 2021-06-13 17:42:28 +02:00
Marcel Märtens
c8262f5bec redo slowjobs in order to have a try_run fn 2021-06-13 17:42:21 +02:00
Marcel Märtens
9506aacdbc make test less flanky, try to avoid absolute comparisions and compare jobs relative. 2021-06-13 17:31:34 +02:00
Monty
fe86ef1e96 Cactus Colada 
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
 2021-06-13 13:52:56 +02:00
Ben Wallis
d54e7435df Improved inventory swap 2021-06-12 19:06:39 +01:00
Avi Weinstock
c97797a87c Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
juliancoffee
b5e1911930 Introduce hit_timing for combo_melee 
bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing
poise damage of hammer from 25 to 20
 2021-06-12 14:10:19 +03:00
Marcel Märtens
d291a71f79 Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Joshua Barretto
2d58650f51 Repaired common such that it works for plugin targets 2021-06-11 08:33:32 +01:00
Scott Williams
3ac5f9a027 Fixed biped_small and humanoid hitboxes 2021-06-09 15:23:10 +01:00
juliancoffee
72bc681570 Move loot tables to entityconfigs 
* Moved all entities in dungeons to assets
 2021-06-09 15:37:04 +03:00
juliancoffee
14a99cd0e1 Move body to EntityConfig assets 
* currently works only for random and random_with, uses FromStr for
NpcKind
 2021-06-09 15:37:04 +03:00
juliancoffee
f9575d7df0 Load skillsets from assets 
Done:
    support loading from assets in skillset_builder.rs
    entity_config field with skillset asset field
    move every SkillSet config to assets
    tests for skillset assets
    tests for assets in entity configs
 2021-06-09 15:37:04 +03:00