Commit Graph

13566 Commits

Author SHA1 Message Date
RunRobDog
17cd291613 make Spawn Entities tab in admin commands 2023-04-16 01:29:14 +02: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
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
Joshua Barretto
c5a39837c3 Updated changelog 2023-04-13 16:03:34 +01:00
Joshua Barretto
6d06e9e1a9 Avoid NPC huddling in site centres 2023-04-13 15:13:51 +01:00
Joshua Barretto
daacadaedb Made NPCs give directions to nearby towns, fixed player death propagation 2023-04-13 14:34:31 +01:00
Joshua Barretto
d26a711469 Update site populations when NPCs move home 2023-04-13 12:22:28 +01:00
Joshua Barretto
d8702f128b Variable town sizes 2023-04-13 12:05:16 +01:00
Joshua Barretto
2a1ea63910 Allow NPCs to migrate away from towns with a high population density 2023-04-13 12:00:59 +01:00
Imbris
bbe7ca57a8 Merge branch 'imbris/fix-ui-edge-case' into 'master'
Ensure in-world UI elements are snapped to pixel borders.

See merge request veloren/veloren!3866
2023-04-13 04:42:47 +00:00
Imbris
b58a8a9ec3 Ensure in-world UI elements are snapped to pixel borders. 2023-04-13 00:10:12 -04:00
Samuel Keiffer
7aa43e9e8a Merge branch 'taoist/better-dullahan' into 'master'
taoist&floppy/cyclops&dullahan

See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee taoist&floppy/cyclops&dullahan 2023-04-12 22:53:38 +00:00
Joshua Barretto
9e17042bf6 Merge branch 'rtsim2' into 'master'
Initial implementation of rtsim2

Closes #1476

See merge request veloren/veloren!3517
2023-04-12 16:17:52 +00:00
Joshua Barretto
69424ea5bf Use nested broken key as fallback if not using english fallback 2023-04-12 16:18:31 +01:00
Isse
f13ae63985 make reposition_on_load join immutable 2023-04-12 17:08:16 +02:00
Isse
fc3f7590c7 clamp chase_tgt to ground if we can't fly 2023-04-12 17:04:25 +02:00
Joshua Barretto
cb5d0f5a95 Don't perform partial localisation of content, prefer all-or-nothing 2023-04-12 12:11:53 +01:00
Joshua Barretto
16e3227f78 Correct localisation of numeric values, use coordinate conversions in rtsim 2023-04-12 10:36:11 +01:00
Isse
0c688a9b50 remove comment 2023-04-12 10:19:19 +02:00
Isse
2d83a8a1e4 fix npcs without a faction not respawning 2023-04-12 10:18:09 +02:00
Isse
0bb6fa7946 add flag to clamp to ground for RepositionOnChunkLoad 2023-04-12 10:17:49 +02:00
Isse
6be4a2b33f only add RepositionOnChunkLoad to rtsim npcs and don't add Waypoint if it doesn't exist 2023-04-12 09:24:07 +02:00
Joshua Barretto
3582d86c70 Simplified localisation logic 2023-04-11 23:51:07 +01:00
Joshua Barretto
3484e156d1 Allowed localisation content to be recursive 2023-04-11 23:18:34 +01:00
Joshua Barretto
c69307557d Fall back to single message if variations don't exist for localisation 2023-04-11 19:06:40 +01:00
Joshua Barretto
85a3d0bec4 Fixed tests 2023-04-11 18:17:52 +01:00
Joshua Barretto
cf701fb604 Localised rtsim NPC speech 2023-04-11 17:00:08 +01:00
Joshua Barretto
edcc2f1870 Overhauled chat message representation to allow for more exhaustive localisation 2023-04-11 15:46:36 +01:00
Joshua Barretto
bc4d1a71f6 Fix rtsim NPC respawning 2023-04-11 13:25:45 +01:00
Joshua Barretto
08afe26112 Directly compare rtism resources to avoid unnecessary hooks 2023-04-11 11:49:10 +01:00
Joshua Barretto
81b52298f0 Addressed review feedback 2023-04-11 10:34:06 +01:00