1345 Commits

Author	SHA1	Message	Date
Joshua Yanovski	f51dfdeb44	Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes	2020-08-12 20:19:04 +02:00
Monty Marz	fcdd875bff	UI fixes, assets update	2020-08-12 18:10:18 +00: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
Imbris	893da3622a	Merge branch 'scott-c/particles' into 'master' ... Particles See merge request veloren/veloren!1156	2020-08-09 17:09:43 +00:00
jshipsey	45971fa403	state corrections	2020-08-08 17:05:48 -04:00
jshipsey	9ff5c23cf0	readd sneak	2020-08-08 13:47:32 -04:00
scott-c	a0107d5cda	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	cc36e9c300	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	bb8ba75287	cleanup redundant function	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	bb2a5c885b	Add fireball and bomb particle effects	2020-08-08 19:25:00 +08:00
scott-c	4bc373a832	remove particle emitter component	2020-08-08 19:25:00 +08:00
scott-c	3139e85dff	allow for col particles	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	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	28a8f847cc	timeout visuals, various small fixes and two new items	2020-08-08 01:15:58 +02:00
Imbris	543d971a19	Projectiles ignore entities in the same group, pets no longer follow group leader	2020-08-08 01:15:58 +02:00
Monty Marz	1eb671e1a6	Update CHANGELOG.md, german locale	2020-08-08 01:15:58 +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	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	c79f512f84	Fix all clippy issues, clean up Rust code.	2020-08-07 11:55:20 +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
nepo	cb65070aba	nepo/dullahan	2020-08-07 03:56:59 +00:00
Sam	3b1163fa50	Removed commented code	2020-08-06 10:15:24 -05:00
Sam	83a6e08c7a	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	1c40218de9	More weapon and hit box tweaks	2020-08-06 09:43:47 -05:00
Silentium2318	1de40154c7	Weapon balancing	2020-08-06 09:39:49 -05:00
Silentium2318	a59438e3e4	Dis some distance and attack arc tweaking	2020-08-06 09:39:09 -05:00
Silentium2318	b0f55b3f79	Weapon balancing	2020-08-06 09:38:22 -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	be37acf287	Merge remote-tracking branch 'origin/master' into sharp/small-fixes	2020-08-03 05:49:27 +02:00
BottledByte	a167ee98ee	De-enumerized armor variants	2020-08-03 03:41:32 +00:00
Joshua Yanovski	d4d4956e92	Merge remote-tracking branch 'origin/master' into sharp/small-fixes	2020-08-02 20:56:54 +02:00