1311 Commits

Author SHA1 Message Date
Joshua Barretto
3ab6c5ff49 Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
9e5978b34b Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Imbris
ee418c19f0 Merge branch 'scott-c/particles' into 'master'
Particles

See merge request veloren/veloren!1156
2020-08-09 17:09:43 +00:00
jshipsey
68b5bf1ca2 state corrections 2020-08-08 17:05:48 -04:00
jshipsey
45c8eb98a0 readd sneak 2020-08-08 13:47:32 -04:00
scott-c
b5982999b5 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
055cbad5b8 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
22ee89344a cleanup redundant function 2020-08-08 19:26:52 +08:00
Joshua Barretto
575319f3aa Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
scott-c
3b9ef1cba8 Add campfire command 2020-08-08 19:25:33 +08:00
scott-c
29a78ceaa3 Add fireball and bomb particle effects 2020-08-08 19:25:00 +08:00
scott-c
4c765eac9b remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
c1d1ef0549 allow for col particles 2020-08-08 19:25:00 +08:00
scott-c
8d742a77cc Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
6e9584e061 Add particle lifespan 2020-08-08 19:25:00 +08:00
scott-c
26a0bbb7f9 Add ParticleMgr 2020-08-08 19:24:55 +08:00
scott-c
295b41abf0 Add ParticleEmitter Component 2020-08-08 19:24:22 +08:00
Monty Marz
fb0984efa1 address comments 2020-08-08 00:13:00 -04:00
Imbris
1d8d8eb79b Fireballs no longer damage group members 2020-08-08 01:16:35 +02:00
Imbris
4876c7395a Remove pets from the group exp division calculation but still give them exp, fix bug with group code when pets are deleted 2020-08-08 01:16:35 +02:00
Imbris
50858245d9 Add timeout's to group invites, and configurable limit to group size
Fix a few group bugs, enable invite timeout and group limits in ui
2020-08-08 01:16:35 +02:00
Monty Marz
a0dd070daf timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Imbris
2bc0e3d22d Projectiles ignore entities in the same group, pets no longer follow group leader 2020-08-08 01:15:58 +02:00
Monty Marz
64acb03083 Update CHANGELOG.md, german locale 2020-08-08 01:15:58 +02:00
Imbris
320cbc9b3c New group UI functions 2020-08-08 01:14:19 +02:00
Imbris
7f641498ff Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
03a1c7cd13 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
c5720c02c9 Basic UI
Basic ui for groups and group window
2020-08-08 01:12:35 +02:00
Imbris
cf0a727eb6 Add basic group functionality (no voxygen wiring yet) 2020-08-08 01:09:01 +02:00
nepo
b8cb8ec68b nepo/dullahan 2020-08-07 03:56:59 +00:00
Sam
2b6f4a1747 Removed commented code 2020-08-06 10:15:24 -05:00
Sam
fd745a4d11 Removed energy refund on M2 attacks. Re-added custom heights on creatures. Tweaked movement on triple strike. 2020-08-06 09:43:50 -05:00
Silentium2318
ab594a97fb More weapon and hit box tweaks 2020-08-06 09:43:47 -05:00
Silentium2318
36e464dbf3 Weapon balancing 2020-08-06 09:39:49 -05:00
Silentium2318
31a54ce99a Dis some distance and attack arc tweaking 2020-08-06 09:39:09 -05:00
Silentium2318
5a73d48e3b Weapon balancing 2020-08-06 09:38:22 -05:00
Imbris
8f813a3773 Revert "Merge branch 'BottledByte/ability_design' into 'master'"
This reverts merge request !1264
2020-08-06 08:04:03 +00:00
Imbris
703da622bb Merge branch 'BottledByte/ability_design' into 'master'
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
2020-08-06 04:44:51 +00:00
BottledByte
8cbb43ac30 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
b8199542e0 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
Also fixed two wrong asset references and did some .ron formatting
2020-08-05 01:21:42 +02:00
BottledByte
4a19f1dacc De-enumerized armor variants 2020-08-03 03:41:32 +00:00
BottledByte
c7a5161b43 Removed fine-grained Item enums and replaced them with Strings
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
2020-08-02 01:21:32 +00:00
Samuel Keiffer
6f73713c79 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Snowram
b37c0962af Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
2645f9e631 cyclops run anim 2020-08-01 02:19:45 -04:00
jshipsey
654088820c maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
1b7cb8cde6 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
9a4415509c catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
8251fcfa55 new models, anim tweaks 2020-08-01 02:19:44 -04:00
Marcel Märtens
0713c1dd54 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00