jshipsey
68b5bf1ca2
state corrections
2020-08-08 17:05:48 -04:00
jshipsey
c9138602a5
clippy, consdensed climb, corrected some swim bugs
2020-08-08 17:04:50 -04:00
jshipsey
c9f7a48cd6
swim alterations to condense the body on strong turns
2020-08-08 13:47:32 -04:00
jshipsey
72d56742c6
minor anim tweak
2020-08-08 13:47:32 -04:00
jshipsey
dc08f5655f
changelog
2020-08-08 13:47:32 -04:00
jshipsey
e4444b36e3
bandaid fix for swim wield
2020-08-08 13:47:32 -04:00
jshipsey
45c8eb98a0
readd sneak
2020-08-08 13:47:32 -04:00
jshipsey
f1426b7bac
swimming changes
2020-08-08 13:47:32 -04:00
Monty Marz
33807ccf90
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
fb0984efa1
address comments
2020-08-08 00:13:00 -04:00
Monty Marz
4a1ee6edd3
Change to social window selection visuals
2020-08-08 01:16:35 +02:00
Imbris
10ad130712
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
37b464ce3c
Add info message in chat about group chat when joining a group
2020-08-08 01:16:35 +02: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
2232ca78b7
Fixed test world to run again
...
Update test_world.rs
2020-08-08 01:15:58 +02:00
Monty Marz
9869b2a8d7
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
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
53fa9e451a
overhead info improvements
...
overhead improvements
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
301205c369
Don't give exp when killing self or group members
2020-08-08 01:15:58 +02:00
Imbris
8d1715f7dd
Don't show own char in group menu, handle accept/decline key events
2020-08-08 01:15:58 +02:00
Monty Marz
fb40666831
Social window assets
2020-08-08 01:14:19 +02:00
Imbris
3c66e786dd
Distribute exp evenly and make it easier to target entities
2020-08-08 01:14:19 +02:00
Monty Marz
b7e7cdbf94
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
320cbc9b3c
New group UI functions
2020-08-08 01:14:19 +02:00
Monty Marz
658d2acca1
colors
2020-08-08 01:12:35 +02:00
Imbris
7f641498ff
Integrate groups with chat groups
2020-08-08 01:12:35 +02:00
Imbris
71917f9964
Make entity targeting easier, add EXP sharing
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
ef43cc0030
Add key to select entities
2020-08-08 01:09:02 +02:00
Imbris
cf0a727eb6
Add basic group functionality (no voxygen wiring yet)
2020-08-08 01:09:01 +02:00
Imbris
fe8eeb1dd9
Add entity targeting
2020-08-08 01:09:01 +02:00
Marcel
eb6855ff96
Merge branch 'french_translation' into 'master'
...
French translation improvements
See merge request veloren/veloren!1263
2020-08-07 21:05:47 +00:00
Varpie
9d8db2c846
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
c219b31a6e
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
5c764cd933
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
a00592a0f3
Merge branch 'imbris/small-fixes' into 'master'
...
Some improvements
See merge request veloren/veloren!1273
2020-08-07 08:52:50 +00:00
Imbris
c996626181
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
f656bfaddf
Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions
2020-08-07 01:25:51 -04:00
Justin Shipsey
251d108db9
Merge branch 'nepo/dullahan' into 'master'
...
nepo/dullahan
See merge request veloren/veloren!1266
2020-08-07 03:57:00 +00:00
nepo
b8cb8ec68b
nepo/dullahan
2020-08-07 03:56:59 +00:00
Joshua Yanovski
3a80b63e6a
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
3e3da609f4
Fix various migration issues.
2020-08-07 01:35:51 +02:00
Marcel
0d0845c32e
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
80dc1892e3
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
2b6f4a1747
Removed commented code
2020-08-06 10:15:24 -05:00
