juliancoffee
b81904efd1
Implement migration script for LoadoutSpec
2022-04-07 18:44:15 +03:00
juliancoffee
3f7bfff8d7
Implement all needed features
...
+ Multiple/Random inheritance for loadout configs
+ Using ItemSpecNew in Hands
+ Rename Hands::Specific to Hands::InHands to represent non-random
combination
2022-04-07 18:44:14 +03:00
juliancoffee
5e07875be9
Add LoadoutSpecNew with new loadout config
...
Changes from old config:
* Structure instead of HashMap which allows us have multiple types for
fields.
* Using error propagating instead of panic, which opens possibility for
better error messages.
* Implemented inheritance.
* New Hands type for more practical way of declaring weapons/tools.
2022-04-07 18:44:14 +03:00
Marcel
d9825d1d38
Merge branch 'translatede' into 'master'
...
Add German translation to .desktop and metainfo
See merge request veloren/veloren!3320
2022-04-05 22:14:00 +00:00
JakobDev
fbabbbb959
Add German translation to .desktop and metainfo
2022-04-05 08:11:09 +00:00
Samuel Keiffer
fc0ecdbc22
Merge branch 'james/fix-agent-idle' into 'master'
...
Fix #1516 Add else branch to allow for agent idling when no sound events
Closes #1516
See merge request veloren/veloren!3319
2022-04-05 03:40:26 +00:00
James Melkonian
b590bc50d7
Fix #1516 Add else branch to allow for agent idling when no sound events
2022-04-05 03:40:26 +00:00
Marcel
50fd55daef
Merge branch 'tormod-personalities' into 'master'
...
Give NPCs random Big Five personalities.
See merge request veloren/veloren!3280
2022-04-04 19:03:05 +00:00
Marcel
2495e07646
Merge branch 'xMAC94x/update_deps2' into 'master'
...
update further dependencies, including strum and get rid of old strum_macro
See merge request veloren/veloren!3318
2022-04-04 19:03:03 +00:00
Tormod G. Hellen
cb88648cca
Give NPCs random Big Five personalities.
2022-04-04 20:17:50 +02:00
Marcel Märtens
64b9602760
update further dependencies, including strum and get rid of old strum_macro
2022-04-04 16:06:47 +02:00
Marcel
73d6d96499
Merge branch 'xMAC94x/update_deps' into 'master'
...
xMAC94x/update deps
See merge request veloren/veloren!3311
2022-04-04 10:37:41 +00:00
Marcel Märtens
affdf3131f
update a bunch of dependencies, including clap3
2022-04-04 11:43:29 +02:00
Marcel Märtens
a0a0e36246
update network dependencies
2022-04-02 15:44:07 +02:00
Isse
5ef75552d0
Merge branch 'floppy-CliffTown' into 'master'
...
CliffTowns
See merge request veloren/veloren!3285
2022-03-29 12:52:24 +00:00
flo
3d24b1d635
CliffTowns
2022-03-29 12:52:08 +00:00
Samuel Keiffer
a7e8b22d1d
Merge branch 'james/fix-harvester-hole' into 'master'
...
Adjust harvester boss arena offset
See merge request veloren/veloren!3289
2022-03-28 04:52:03 +00:00
James Melkonian
5b801dc44d
Adjust harvester boss arena offset
2022-03-27 20:41:03 -07:00
Marcel
8571c6c760
Merge branch 'holychowders/fix_deadwood_attack' into 'master'
...
Fix deadwood not attacking if target is at a different elevation than deadwood.
See merge request veloren/veloren!3301
2022-03-27 20:02:38 +00:00
holychowders
39d5a73c10
Fix deadwood not attacking if target is at a different elevation than deadwood.
2022-03-27 20:02:38 +00:00
Marcel
f96b803f63
Merge branch 'jh0l/trading_amount_input' into 'master'
...
feat: ✨ an input box in the trade window so that users can set an exact amount
See merge request veloren/veloren!3261
2022-03-27 18:49:13 +00:00
jh0l
585bcda729
fix: 🐛 resolve issue where client spams TradeAction updates based on out of sync PendingTrade values
2022-03-27 20:25:22 +02:00
jh0l
32d4ddd4fd
style: 🎨 remove newline
2022-03-27 20:25:20 +02:00
Jack hollis-london
aeae94d31b
small refactor per code review
2022-03-27 20:25:19 +02:00
Jack hollis-london
8194c19647
Update CHANGELOG.md
2022-03-27 20:25:16 +02:00
jh0l
403a523ec7
refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade
2022-03-27 20:24:23 +02:00
jh0l
de70ce61d8
feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing
2022-03-27 20:24:21 +02:00
jh0l
991cfcaa47
feat: 🌐 add i18n for trade amount input placeholder
2022-03-27 20:24:20 +02:00
jh0l
6f22f31376
feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing
2022-03-27 20:24:18 +02:00
Samuel Keiffer
4aaefdf6be
Merge branch 'ubruntu/site2-guards-raiders' into 'master'
...
Bring raiders and guards to site2 towns
See merge request veloren/veloren!3300
2022-03-26 00:29:53 +00:00
ubruntu
6d30f7f748
Bring raiders and guards to site2 towns
2022-03-26 00:29:52 +00:00
Justin Shipsey
aee1aa7c1d
Merge branch 'holychowders/prevent_undesired_movement_on_agent_interaction' into 'master'
...
Agent Perception: Improve Awareness System
See merge request veloren/veloren!3263
2022-03-26 00:28:18 +00:00
Marcel
a8a8ee181d
Merge branch 'christof/parallel_economy' into 'master'
...
Parallel economic simulation, based on shredded_economy2
See merge request veloren/veloren!3288
2022-03-25 19:59:57 +00:00
Samuel Keiffer
3964ac466a
Merge branch 'ubruntu/house-decorations' into 'master'
...
Site2 house decorations
See merge request veloren/veloren!3273
2022-03-24 15:13:56 +00:00
ubruntu
c71354e192
Site2 house decorations
2022-03-24 15:13:56 +00:00
Samuel Keiffer
a81baee7ac
Merge branch 'infrandomness/worldgen/giant_trees_modifications' into 'master'
...
Add new primitive to draw giant trees
See merge request veloren/veloren!3267
2022-03-24 15:13:54 +00:00
InfRandomness
8359d5754a
Add new primitive to draw giant trees
2022-03-24 15:13:53 +00:00
Christof Petig
aeac483bac
parallel simulation of economies
2022-03-21 23:35:08 +01:00
Christof Petig
96c5d17460
Address xmac's comments and prepare for parallelization
2022-03-21 23:35:08 +01:00
Marcel
c23e96f979
Merge branch 'christof/shredded_economy2' into 'master'
...
move the economy tick into Economy
See merge request veloren/veloren!3283
2022-03-21 22:30:25 +00:00
Marcel
d7c80bca38
Merge branch 'drabard/fix_covered_tutorial_button' into 'master'
...
Fixed Tutorial HUD being covered up by other HUD elements. (Issue #1505 )
See merge request veloren/veloren!3291
2022-03-20 22:19:19 +00:00
Andrzej Drabarek
fa5555a348
Fixed Tutorial HUD being covered up by other HUD elements.
2022-03-20 19:05:10 +01:00
Ben Wallis
a8601bc76e
Merge branch 'blood_particle_fix' into 'master'
...
Fixed blood particles showing on projectile hit for bodies not supposed to bleed from gameplay perspective
See merge request veloren/veloren!3290
2022-03-20 15:45:50 +00:00
Mehmet-dev
903e216d32
fixing blood particles on bodies not supposed to bleed from gameplay perspective
2022-03-20 15:45:50 +00:00
holychowders
a88d8ada0f
Comment out unused awareness increment/decrement calls and un-nest conditional for early return.
2022-03-19 12:02:29 -05:00
holychowders
30af95942a
.gitignore: Ignore .vim, not just .vi files.
2022-03-19 11:46:42 -05:00
Ben Wallis
554bd9eb47
Merge branch 'james/reload-chunks-command' into 'master'
...
Add chunk reload command (admin only)
See merge request veloren/veloren!3284
2022-03-19 08:43:38 +00:00
James Melkonian
8c06dc9a5c
Add chunk reload command (admin only)
2022-03-19 08:43:38 +00:00
Christof Petig
ef6cee891f
move the economy tick into Economy
...
This prepares for a parallel processing as it centralizes access to the surrounding index
2022-03-19 09:39:56 +01:00
Marcel
aa244b23c4
Merge branch 'Melonai/apply_mount_offset_to_weapon_trails' into 'master'
...
Apply mount transform position to weapon trails
Closes #1489
See merge request veloren/veloren!3279
2022-03-15 21:24:49 +00:00
