Justin Shipsey
|
66bc7a194b
|
Merge branch 'slipped/swim' into 'master'
swim
See merge request veloren/veloren!1272
|
2020-08-09 16:25:11 +00:00 |
|
Justin Shipsey
|
f050aeb273
|
Merge branch 'master' into 'slipped/swim'
# Conflicts:
# voxygen/src/anim/src/character/swim.rs
|
2020-08-09 15:13:56 +00:00 |
|
Justin Shipsey
|
890dcc902e
|
Merge branch 'nepo/new-bones' into 'master'
nepo/new bones
See merge request veloren/veloren!1274
|
2020-08-08 22:37:50 +00:00 |
|
nepo
|
bc1fabc41b
|
nepo/new bones
|
2020-08-08 22:37:50 +00:00 |
|
jshipsey
|
45971fa403
|
state corrections
|
2020-08-08 17:05:48 -04:00 |
|
jshipsey
|
37c733a067
|
clippy, consdensed climb, corrected some swim bugs
|
2020-08-08 17:04:50 -04:00 |
|
jshipsey
|
d7b3e84153
|
swim alterations to condense the body on strong turns
|
2020-08-08 13:47:32 -04:00 |
|
jshipsey
|
be3ed4b238
|
minor anim tweak
|
2020-08-08 13:47:32 -04:00 |
|
jshipsey
|
854361cdaa
|
changelog
|
2020-08-08 13:47:32 -04:00 |
|
jshipsey
|
316546af22
|
bandaid fix for swim wield
|
2020-08-08 13:47:32 -04:00 |
|
jshipsey
|
9ff5c23cf0
|
readd sneak
|
2020-08-08 13:47:32 -04:00 |
|
jshipsey
|
691607f398
|
swimming changes
|
2020-08-08 13:47:32 -04:00 |
|
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 |
|