Joshua Yanovski
f51dfdeb44
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-12 20:19:04 +02:00
Joshua Yanovski
0ed801d540
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-08-12 16:32:24 +02:00
Monty Marz
6789b7ae27
Add firework hues
2020-08-12 22:29:06 +08:00
scott-c
9aab296264
Add firework item
2020-08-12 22:25:28 +08:00
scott-c
cae84dd4c9
fix rebase
2020-08-08 20:53:07 +08:00
scott-c
a0107d5cda
fix rebase
2020-08-08 19:26:52 +08:00
scott-c
ba301696f4
change campfire cmd to spawn object instead of npc
2020-08-08 19:26:52 +08:00
Joshua Barretto
7c31baef6f
Added outcome system, sound effects
2020-08-08 19:26:48 +08:00
scott-c
1a263834e7
Add campfire command
2020-08-08 19:25:33 +08:00
scott-c
5ba4d26821
Update changelog
2020-08-08 19:25:29 +08:00
scott-c
4bc373a832
remove particle emitter component
2020-08-08 19:25:00 +08:00
scott-c
803677f0fb
Add particle velocity and ability particle emitter
2020-08-08 19:25:00 +08:00
scott-c
da5f4828a5
Add particle lifespan
2020-08-08 19:25:00 +08:00
scott-c
39b676cd8f
Add ParticleMgr
2020-08-08 19:24:55 +08:00
scott-c
42a10a6059
Add ParticleEmitter Component
2020-08-08 19:24:22 +08:00
Monty Marz
142b386628
address comments
2020-08-08 00:13:00 -04:00
Imbris
2608217e83
Make clippy happy, fmt even though it is set to fmt on save in my
...
editor...."
2020-08-08 01:16:35 +02:00
Imbris
a7df000a6f
Fireballs no longer damage group members
2020-08-08 01:16:35 +02:00
Imbris
af8560ea36
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
390d289d35
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
def68302c7
Fixed test world to run again
...
Update test_world.rs
2020-08-08 01:15:58 +02:00
Monty Marz
14b0d9a7fe
group leader colouring, offset fix when debug menu is open,
...
fixed social tab visuals
text width limit
group interaction wording, group window adjustments
2020-08-08 01:15:58 +02:00
Monty Marz
28a8f847cc
timeout visuals, various small fixes and two new items
2020-08-08 01:15:58 +02:00
Imbris
ecf6a84b2f
Don't give exp when killing self or group members
2020-08-08 01:15:58 +02:00
Imbris
03d9992b9f
Distribute exp evenly and make it easier to target entities
2020-08-08 01:14:19 +02:00
Imbris
3a22b3694d
New group UI functions
2020-08-08 01:14:19 +02:00
Imbris
d856c20225
Integrate groups with chat groups
2020-08-08 01:12:35 +02:00
Imbris
ef4b221706
Make entity targeting easier, add EXP sharing
2020-08-08 01:12:35 +02:00
Imbris
0a8f148559
Fixes and tweaks for groups
2020-08-08 01:12:35 +02:00
Monty Marz
d9e3937a82
Basic UI
...
Basic ui for groups and group window
2020-08-08 01:12:35 +02:00
Imbris
10c3d01466
Add basic group functionality (no voxygen wiring yet)
2020-08-08 01:09:01 +02:00
Joshua Yanovski
3dc973e0be
Major speedups with SIMD.
2020-08-07 23:50:27 +02:00
Joshua Yanovski
77a8c7c267
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-07 06:47:10 +02:00
Joshua Yanovski
6d425f125e
Fix various migration issues.
2020-08-07 01:35:51 +02:00
Silentium2318
1c40218de9
More weapon and hit box tweaks
2020-08-06 09:43:47 -05:00
Joshua Yanovski
b44e442325
Miscellaneous performance improvements.
2020-08-06 13:40:35 +02:00
Imbris
c2f3e1b47f
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
...
This reverts merge request !1264
2020-08-06 08:04:03 +00:00
Imbris
a0b1259b7e
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
34c87d7a86
Add ability IDs and use them in GUI
2020-08-05 23:00:43 +02:00
BottledByte
ab1c43be84
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
Joshua Yanovski
d4d4956e92
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-08-02 20:56:54 +02:00
BottledByte
dc91209a7b
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
f930f52df5
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
Imbris
f589564760
Fix glyph to large panic
2020-07-31 01:13:31 -04:00
Marcel Märtens
7f97baca70
switch to auth that doesn't use agent
2020-07-31 01:05:01 +02:00
Marcel Märtens
0d5e61c4b6
update auth to newest version
2020-07-29 19:28:22 +02:00
Joshua Yanovski
56da06f7a3
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-29 18:56:52 +02:00
Marcel Märtens
96cde882ef
update auth to the newest version and remove useless dep
2020-07-29 00:05:23 +02:00
Joshua Yanovski
13b6d4d534
Removing WORLD_SIZE, part 1.
...
Erased almost every instance of WORLD_SIZE and replaced it with a local
power of two, map_size_lg (which respects certain invariants; see
common/src/terrain/map.rs for more details about MapSizeLg). This also
means we can avoid a dependency on the world crate from client, as
desired.
Now that the rest of the code is not expecting a fixed WORLD_SIZE, the
next step is to arrange for maps to store their world size, and to use
that world size as a basis prior to loading the map (as well, probably,
as prior to configuring some of the noise functions).
2020-07-28 10:55:48 +02:00
Joshua Yanovski
7d56ba31b4
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-27 13:16:27 +02:00
