Monty Marz
7aebff26e0
Merge branch 'imbris/figraycast' into 'master'
...
Add detection of entities under the cursor in Voxygen and Group functions
Closes #511 and #534
See merge request veloren/veloren!942
2020-08-08 10:59:08 +00:00
Monty Marz
142b386628
address comments
2020-08-08 00:13:00 -04:00
Monty Marz
74ace74d5a
Change to social window selection visuals
2020-08-08 01:16:35 +02: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
2faa1cd6c1
Add info message in chat about group chat when joining a group
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
543d971a19
Projectiles ignore entities in the same group, pets no longer follow group leader
2020-08-08 01:15:58 +02:00
Monty Marz
3da7e27a7c
overhead info improvements
...
overhead improvements
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
ecf6a84b2f
Don't give exp when killing self or group members
2020-08-08 01:15:58 +02:00
Imbris
1d69e85a50
Don't show own char in group menu, handle accept/decline key events
2020-08-08 01:15:58 +02:00
Monty Marz
58df00d80c
Social window assets
2020-08-08 01:14:19 +02:00
Imbris
03d9992b9f
Distribute exp evenly and make it easier to target entities
2020-08-08 01:14:19 +02:00
Monty Marz
f2ed7efced
group button and menu logic changes
...
group member panels
health bar text
text shadows and scaling
cleanup, don't show the player panel
social window assets
2020-08-08 01:14:19 +02:00
Imbris
3a22b3694d
New group UI functions
2020-08-08 01:14:19 +02:00
Monty Marz
9cffb61429
colors
2020-08-08 01:12:35 +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
6aba810517
Add key to select entities
2020-08-08 01:09:02 +02:00
Imbris
10c3d01466
Add basic group functionality (no voxygen wiring yet)
2020-08-08 01:09:01 +02:00
Imbris
1741384d00
Add entity targeting
2020-08-08 01:09:01 +02:00
Marcel
eaa5bac8d6
Merge branch 'french_translation' into 'master'
...
French translation improvements
See merge request veloren/veloren!1263
2020-08-07 21:05:47 +00:00
Varpie
54c08babac
Fixing various obsolete texts and a few typos, uniform pronoun (tu->vous) and French style punctuation
2020-08-07 21:05:47 +00:00
Marcel
150b5b48c5
Merge branch 'xMAC94x/translation_tests' into 'master'
...
add a translation test that verifys that all language RON files are parseable...
See merge request veloren/veloren!1271
2020-08-07 20:13:30 +00:00
Marcel Märtens
599a9a76fc
add a translation test that verifys that all language RON files are parseable (without any git involved)
2020-08-07 21:31:34 +02:00
Imbris
d1e10b1787
Merge branch 'imbris/small-fixes' into 'master'
...
Some improvements
See merge request veloren/veloren!1273
2020-08-07 08:52:50 +00:00
Imbris
bdd255beb6
Tooltips now disappear when hovered and no longer appear on top of the mouse position (e.g. in the bottom of the inventory)
2020-08-07 03:30:17 -04:00
Imbris
d74a1d371e
Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions
2020-08-07 01:25:51 -04:00
Justin Shipsey
44febaabdf
Merge branch 'nepo/dullahan' into 'master'
...
nepo/dullahan
See merge request veloren/veloren!1266
2020-08-07 03:57:00 +00:00
nepo
cb65070aba
nepo/dullahan
2020-08-07 03:56:59 +00:00
Joshua Yanovski
e3e72a3de0
Merge branch 'sharp/fix-migration-issues' into 'master'
...
Fix various migration issues.
See merge request veloren/veloren!1268
2020-08-07 00:37:26 +00:00
Joshua Yanovski
6d425f125e
Fix various migration issues.
2020-08-07 01:35:51 +02:00
Marcel
433c857573
Merge branch 'patch-2' into 'master'
...
I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. I hope it's the last fix and that it finally appears in the next update.
See merge request veloren/veloren!1262
2020-08-06 23:05:41 +00:00
Forest Anderson
fbac12d28f
Merge branch 'silentium/combat-tweeks' into 'master'
...
Silentium/combat tweaks
See merge request veloren/veloren!1261
2020-08-06 16:27:11 +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
Songtronix
11807c836b
Merge branch 'revert-a0b1259b' into 'master'
...
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
See merge request veloren/veloren!1265
2020-08-06 12:53:43 +00: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
