Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,345 Commits 151 Branches 18 Tags 2.1 GiB
13324700ba
Commit Graph

11345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
juliancoffee
13324700ba Post-cleaning 2022-04-07 18:44:16 +03:00
juliancoffee
faeac0eef3 Fully implement tests for new EntityConfig 2022-04-07 18:44:15 +03:00
juliancoffee
dd02e8ae6a Add loadout spec examples 2022-04-07 18:44:15 +03:00
juliancoffee
cfba7bfc65 Add validation functions to LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
7cd5a694b2 Dummy implementation of LoadoutSpec tests 2022-04-07 18:44:15 +03:00
juliancoffee
09d395f528 Remove temporary test files from git repo 2022-04-07 18:44:15 +03:00
juliancoffee
a4908cf5ae Implement migration for EntityConfig 2022-04-07 18:44:15 +03:00
juliancoffee
15431e7f7a Dummy implementation for EntityConfig migration 2022-04-07 18:44:15 +03:00
juliancoffee
357b953e3b Implement new InventorySpec for EntityConfig 
* Add new InventorySpec which uses Inline loadout spec
* Disable all tests!
 2022-04-07 18:44:15 +03:00
juliancoffee
77f8d6da6f Remove old loadout_builder::LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
f791dace7f Avoid writing None fields in LoadoutSpecNew 
* use serde(skip_serializing_if = "Option::is_none")
 2022-04-07 18:44:15 +03:00
juliancoffee
48c7e29db2 Add comment migrations to asset_migrate 2022-04-07 18:44:15 +03:00
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