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
9,429 Commits 151 Branches 18 Tags
Commit Graph

1048 Commits

Author SHA1 Message Date
Avi Weinstock
eac1d9c760 Avoid duplicate work across chunks when blitting site2 primitives. 2021-07-27 19:12:51 -04:00
Imbris
316845d7c3 Merge branch 'james/map-ui' into 'master' 
Reduce number of map layers and remove unneeded alpha channel

See merge request veloren/veloren!2676
 2021-07-25 17:24:50 +00:00
Avi Weinstock
a274d61677 Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions" 
This reverts commit 0247ae2bf60dbc3713cba5dc9845f6a06e165c91.
 2021-07-25 12:29:21 -04:00
Avi Weinstock
b0f76da08d Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" 
This reverts commit 63eff216f050e83404629dfd84ae3c8e38e8fe54.
 2021-07-25 12:28:25 -04:00
Jonathan Berglin
ffeab0c391 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
James Melkonian
1ec5d7b5d0 Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07:00
Dr. Dystopia
fed78f7def Resolve unused '#[allow(clippy::eval_order_dependence)]' error supressions 2021-07-24 20:24:57 +02:00
Jonathan Berglin
214e6c1d42 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Samuel Keiffer
42d6e4b118 Merge branch 'juliancoffee/overworld_assetization' into 'master' 
Wildlife assetization

See merge request veloren/veloren!2591
 2021-07-18 13:43:32 +00:00
Imbris
c60b02223b Merge branch 'revert-eb08b6a1' into 'master' 
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant

See merge request veloren/veloren!2639
 2021-07-18 08:00:43 +00:00
Marcel
6c73216f35 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--logic_bug)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::logic_bug)]' error supressions

See merge request veloren/veloren!2624
 2021-07-17 23:46:28 +00:00
Imbris
7c60b9577c Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
Marcel
ef1b175b17 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--print_literal)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::print_literal)]' error supressions

See merge request veloren/veloren!2627
 2021-07-17 20:29:35 +00:00
Imbris
7efe2559cf Merge branch 'tygyh/Resolve-all-'#-allow(clippy--clone_on_copy)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions

See merge request veloren/veloren!2623
 2021-07-17 20:00:29 +00:00
Dr. Dystopia
b9927fe30f Resolve all '#[allow(clippy::print_literal)]' error supressions 2021-07-17 17:32:00 +02:00
Dr. Dystopia
134857c42c Resolve all '#[allow(clippy::logic_bug)]' error supressions 2021-07-17 17:27:44 +02:00
Dr. Dystopia
c806c1e766 Resolve all '#[allow(clippy::clone_on_copy)]' error supressions 2021-07-17 17:26:23 +02:00
Dr. Dystopia
5b591c4d95 Resolve all '#[allow(clippy::useless_conversion)]' error supressions 2021-07-17 16:55:11 +02:00
juliancoffee
e5de076d7a Better naming & comments 2021-07-17 15:37:31 +03:00
juliancoffee
e7e3f60e84 adress review 2021-07-17 15:37:31 +03:00
juliancoffee
84b7addfc3 clippy 2021-07-17 15:37:31 +03:00
juliancoffee
b58211a2f5 Move spawn_manifest to Index 2021-07-17 15:37:31 +03:00
juliancoffee
4a83cb13c5 Add Automatic NameKind to EntityConfig 
+ add animal entities for wildlife spawns
 2021-07-17 15:37:31 +03:00
juliancoffee
b74dd21d3b Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
juliancoffee
19c7355c4e Add wildlife assetization support 
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
 2021-07-17 15:37:30 +03:00
juliancoffee
f7b7f1ca4d Add Exact body field for EntityConfig 
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
 2021-07-17 15:37:30 +03:00
Imbris
d776cafa4a Merge branch 'aweinstock/fix-waypoint' into 'master' 
Spawn players aboveground when using `/site` or when their waypoint is underground.

See merge request veloren/veloren!2612
 2021-07-16 23:18:33 +00:00
Avi Weinstock
a463b8b171 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00
Marcel
f10f583a92 Merge branch 'xMAC94x/experiment_ci' into 'master' 
fix/cleanup ci

See merge request veloren/veloren!2595
 2021-07-16 00:33:35 +00:00
Avi Weinstock
47d185d094 Spawn players aboveground when using /site or when their waypoint is underground. 2021-07-15 17:54:29 -04:00
Jonathan Berglin
e165d52d03 Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Jonathan Berglin
51aa54ba8d Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Marcel
b60bdab6d0 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--int_plus_one)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::int_plus_one)]' error supressions

See merge request veloren/veloren!2606
 2021-07-15 13:35:28 +00:00
Dr. Dystopia
66fd06f53c Resolve all '#[allow(clippy::or_fun_call))]' error supressions 2021-07-15 13:49:59 +02:00
Dr. Dystopia
3c2f65e0b8 Resolve all '#[allow(clippy::int_plus_one)]' error supressions 2021-07-15 12:47:57 +02:00
Marcel Märtens
6cb502c229 extract relevant code in a script in order to remove duplicate coding with docker-ci repo 
export VELOREN_ASSETS without pwd to keep caching working
 2021-07-14 20:57:08 +02:00
Marcel Märtens
a53f34ff02 alternative to packaged_simd, as coverage does not compile withit, and it was left out in the simd feature 2021-07-14 14:53:27 +02:00
Marcel Märtens
2cb27be0c6 clippy fixes in tests 2021-07-12 13:35:26 +02:00
Marcel Märtens
7153e8879d fix clippy warnings 2021-07-12 12:09:09 +02:00
Marcel Märtens
e2e1f15cff update depednencies 2021-07-08 12:21:02 +02:00
Snowram
6d122c6ade Spawn dungeon entrances depending on the Site origin biome 2021-07-07 00:35:50 +02:00
juliancoffee
a33900437f (fix) spawn HaniwaSentry in T3 2021-07-05 18:49:25 +03:00
juliancoffee
1f800f2b9b (fix) Use backpack item for merchant's ingredients 2021-07-05 18:49:25 +03:00
juliancoffee
4a10800de8 Improve Merchant inventory from UX perspective 
Changes:
- Make it use red bags with 18 slots (2 rows * 9)
- Sort items by quality
- Stack ingredients, food, potions
- Move coins to ingedients bag and put it first
- Filter unconsumed good (case when you saw 16 rugged shirts)

Refactoring:
- Split bag creation to separate functions
 2021-07-03 22:16:06 +03:00
Marcel
426ed0a8cc Merge branch 'aweinstock/blockstats' into 'master' 
Add block statistics generator to world/examples.

See merge request veloren/veloren!2526
 2021-07-02 17:10:26 +00:00
Avi Weinstock
058a832d37 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
juliancoffee
def73d4425 Split room enemy generation to separate functions 2021-06-30 03:52:51 +03:00
juliancoffee
8a8a3f9318 Add RoomKind enum, address comments 
- enum RoomKind {Peaceful, Fight, Boss, Miniboss} to specify type of
generated room.
 2021-06-30 03:52:51 +03:00
juliancoffee
d339fc4343 More deterministic dungeon fights 
- Spawn fixed number of enemies (2-4) in a room with any size. 1-3 enemies for T5 dungeon.
 2021-06-30 03:52:50 +03:00
Avi Weinstock
7b0dcad68f Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00