Sam
63bf8f3ac7
Responded to review comments and fixed tests
2023-04-19 18:34:17 -04:00
Sam
7fdfc0e71b
Addressed review
2023-04-19 18:34:17 -04:00
Sam
d0a902d918
Being attacked now cancels all active trades.
2023-04-19 18:34:16 -04:00
Sam
c1a64e1d69
Recently unequipped items are now tracked and durability loss on death is applied to them
2023-04-19 18:34:16 -04:00
Isse
77785faeec
Merge branch 'isse/shader-fixes' into 'master'
...
Two small shader fixes
See merge request veloren/veloren!3889
2023-04-19 21:37:03 +00:00
Isse
1494d93fc8
fix cloud tearing
2023-04-19 22:46:35 +02:00
Isse
1442dd29f1
fix NaN issue in apply_point_glow_light
2023-04-19 21:14:19 +02:00
Isse
4b831f884e
reduce the offset of clouds on the horizon
2023-04-19 21:01:30 +02:00
Imbris
9ad83a695c
Merge branch 'imbris/update-tracy-0.15.2' into 'master'
...
Update `tracy-client` to `0.15.2`
See merge request veloren/veloren!3871
2023-04-19 02:39:40 +00:00
Imbris
f525be9b3b
Update tracy-client to 0.15.2, also use tracy_client through the
...
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
2023-04-18 21:28:15 -04:00
CxRedix
9a47ef63a6
Ability.ftl translation finished
2023-04-18 15:41:57 +08:00
CxRedix
1768be43d6
added the missing Guillotine ability translation
2023-04-18 14:58:02 +08:00
Christof Petig
025713e2c0
Merge branch 'christof/fix_orichalcum_drop' into 'master'
...
introduce optional model indices for drop items as well (fixing orichalcum armor drops)
See merge request veloren/veloren!3884
2023-04-17 07:07:40 +00:00
Christof Petig
870a0098d6
add changelog
2023-04-16 23:00:36 +02:00
Christof Petig
4c1c84030f
introduce optional model indices for drop items as well (fixing orichalcum armor drops)
2023-04-16 22:56:04 +02:00
Isse
510d72048e
Merge branch 'rtsim-like-enemy-killer' into 'master'
...
rtsim: positive sentiment gain for killing enemies
See merge request veloren/veloren!3882
2023-04-16 17:16:51 +00:00
Isse
e9cbd4487b
Merge branch 'rtsim-cmds' into 'master'
...
Add more info to the /rtsim_{npc,info} commands
See merge request veloren/veloren!3881
2023-04-16 17:16:48 +00:00
Julian Tölle
865b50fff2
rtsim: positive sentiment gain for killing enemies
...
As per the age old saying: "the enemy of my enemy is my friend".
NPCs will start liking the killer of their enemy more.
2023-04-16 18:08:09 +02:00
Julian Tölle
573a2942c9
Add more info to the /rtsim_{npc,info} commands
...
- Add the name of the NPC to /rtsim_npc to help identify this NPC in the world
- Add faction & personality to /rtsim_info command to learn more about the NPC
2023-04-16 12:37:37 +02:00
CxRedix
b24efdbcd7
reviewed and finalized some more translations
2023-04-16 16:49:09 +08:00
CxRedix
fe67ef86b0
made some skills & abilities consistent with the previous translator
2023-04-16 16:04:08 +08:00
CxRedix
7d5f15a5c9
finalized & added some translations in abilities.ftl to make them more easier to read
2023-04-16 15:51:55 +08:00
Isse
b931b350fd
Merge branch 'isse/guaranteed-workshops' into 'master'
...
Try to get at least one workshop in towns
See merge request veloren/veloren!3876
2023-04-16 06:53:23 +00:00
CxRedix
1ad0ec8c70
added some missing translation from 3 files: char_selection.ftl, common.ftl, gameinput.ftl
2023-04-16 14:36:26 +08:00
CxRedix
4d086bbbe6
added most of the new missing translations for buff.ftl
2023-04-16 14:33:29 +08:00
CxRedix
8141100cf6
added all new npc dialogue
2023-04-16 14:24:38 +08:00
CxRedix
c8b99c44c2
added most of the missing hud translations
2023-04-16 13:58:15 +08:00
CxRedix
0b6abe27f6
added abilities.ftl with most of the translation done
2023-04-16 13:57:31 +08:00
Terraaaagd
c1ecd16cba
Terraaaagd/update Spanish Latino translation
2023-04-15 22:08:23 -03:00
Samuel Keiffer
f14d312ac3
Merge branch 'sam/durability-fixes' into 'master'
...
Durability fixes
See merge request veloren/veloren!3873
2023-04-15 18:03:18 +00:00
Isse
e4a6c67fb0
try to get at least one workshop in towns
2023-04-15 19:57:18 +02:00
DaforLynx
d6f49bff27
Merge branch 'Corvella/female_greeting_sound' into 'master'
...
Let women's voices be heard!
See merge request veloren/veloren!3874
2023-04-15 07:24:59 +00:00
Corvella
0fe4bea421
Let women's voices be heard!
2023-04-15 07:24:59 +00:00
Sam
5ba2ebf6d5
Added repair recipes for twig armor sets.
2023-04-14 18:32:33 -04:00
Sam
9d503d1e1f
Debug items no longer have durability
2023-04-14 18:25:24 -04:00
Sam
553aa690b4
Added repair equipment command
2023-04-14 18:09:23 -04:00
Isse
913eda4b7f
Merge branch 'isse/rtsim_fixes' into 'master'
...
Somewhat fix airships
See merge request veloren/veloren!3869
2023-04-14 18:25:43 +00:00
Isse
b987bfccb4
lazily calculate magnitude in goto and add comments
2023-04-14 14:02:47 +02:00
Isse
60b626d3ee
don't load npc by themself if they're riding
2023-04-14 13:21:43 +02:00
Isse
3548b464da
orient airships correctly on load
2023-04-14 11:25:59 +02:00
Isse
2208a3037e
improve flying goto
2023-04-14 11:23:17 +02:00
Isse
2b44d534cb
remove unwraps in npc_ai
2023-04-14 11:22:12 +02:00
Isse
d1f6e6bef6
somewhat fix airships
2023-04-14 11:22:10 +02:00
Isse
9c30d2018d
add bridge tile for better bridge pathfinding
2023-04-14 11:17:08 +02:00
Joshua Yanovski
b40e2b4fe4
Merge branch 'sam/durability-cost-fix' into 'master'
...
Fixed repair recipe for tools
See merge request veloren/veloren!3870
2023-04-14 03:41:36 +00:00
Sam
985661b674
Added repair recipes for pickaxes and craftsman hammer
2023-04-13 21:19:09 -04:00
Joshua Barretto
504ea158d2
Merge branch 'zesterer/towns' into 'master'
...
Improvements to towns and NPCs
See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
af960f811b
Increment rtsim version
2023-04-13 18:36:05 +01:00
Joshua Barretto
a835ce7e26
Better starting site choices
2023-04-13 18:32:21 +01:00
Joshua Barretto
8249675a72
Made airship captains invincible
2023-04-13 18:32:04 +01:00
