juliancoffee
|
0682bfbe14
|
Add weapons to Husk loadout
|
2022-02-03 18:02:51 +02:00 |
|
Marcel
|
afda04e1eb
|
Merge branch 'command_access' into 'master'
Removal of /home
See merge request veloren/veloren!3171
|
2022-02-02 08:50:23 +00:00 |
|
Youssef Fahmy
|
fdfd2c99ff
|
Removal of /home
|
2022-02-02 08:50:23 +00:00 |
|
Justin Shipsey
|
f6510dfab0
|
Merge branch 'infrandomness/site2/add_giant_trees' into 'master'
Implement giant trees in site2
See merge request veloren/veloren!3136
|
2022-02-02 02:33:37 +00:00 |
|
InfRandomness
|
54b69e37a5
|
Implement giant trees in site2
|
2022-02-02 02:33:37 +00:00 |
|
Imbris
|
18f6077321
|
Merge branch 'imbris/srgb-dither' into 'master'
Dither in nonlinear srgb space and dithering related experimental shader options
See merge request veloren/veloren!3160
|
2022-02-01 21:24:50 +00:00 |
|
Joshua Barretto
|
0ceef00b40
|
Merge branch 'james/site2-util' into 'master'
More CSG primitives
See merge request veloren/veloren!3154
|
2022-02-01 09:16:38 +00:00 |
|
James Melkonian
|
2aab277d0b
|
Add doc comments to PrimitiveRef methods
|
2022-01-31 18:39:03 -08:00 |
|
Joshua Barretto
|
fb7433a5cf
|
Merge branch 'determanistic-naming' into 'master'
Fix biome naming
See merge request veloren/veloren!3173
|
2022-02-01 00:51:26 +00:00 |
|
IsseW
|
0f7f0ace93
|
Use DHashMap
|
2022-02-01 01:20:00 +01:00 |
|
James Melkonian
|
b445bd494e
|
Bezier curve prisms
|
2022-01-31 16:13:45 -08:00 |
|
James Melkonian
|
04bdcf2924
|
Add cubic bezier curve function
|
2022-01-31 16:13:45 -08:00 |
|
James Melkonian
|
b41f86ab99
|
More CSG primitives
|
2022-01-31 16:13:45 -08:00 |
|
IsseW
|
0ba4a3a409
|
Use DHashSet
|
2022-02-01 01:07:36 +01:00 |
|
Justin Shipsey
|
612f084831
|
Merge branch 'slipped/bipeds' into 'master'
Slipped/bipeds
See merge request veloren/veloren!3163
|
2022-01-31 17:08:01 +00:00 |
|
Imbris
|
201a7485c2
|
Merge branch 'imbris/fix-shoot-ori' into 'master'
Use ori as fallback for look_dir so that other entities will turn properly
See merge request veloren/veloren!3170
|
2022-01-31 05:07:01 +00:00 |
|
Imbris
|
2325ac3d78
|
Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced)
|
2022-01-30 23:30:34 -05:00 |
|
Samuel Keiffer
|
a37d221f6b
|
Merge branch 'sam/particle-fix' into 'master'
Fixed lifesteal particles
See merge request veloren/veloren!3169
|
2022-01-31 00:24:07 +00:00 |
|
Sam
|
097d6cf07c
|
Extend green
|
2022-01-30 18:50:18 -05:00 |
|
Sam
|
0c44a7d1ab
|
More tweaking
|
2022-01-30 18:37:11 -05:00 |
|
Joshua Barretto
|
1b9488186e
|
Merge branch 'treeco/realign-workshop' into 'master'
Realign workshops
See merge request veloren/veloren!3168
|
2022-01-30 23:27:50 +00:00 |
|
Sam
|
bfa9c1ce3a
|
Fixed lifesteal particles
|
2022-01-30 18:11:41 -05:00 |
|
Marcel
|
72e270368d
|
Merge branch 'aweinstock/resolve-clippy-lints' into 'master'
Globally allow more clippy lints and reconfigure complexity to be less verbose
See merge request veloren/veloren!3052
|
2022-01-30 22:53:36 +00:00 |
|
Treeco
|
ba7251c7e3
|
Realign workshops
|
2022-01-30 22:45:56 +00:00 |
|
Marcel
|
a41a766356
|
Merge branch 'james/guard-menacing' into 'master'
Fix guards menacing instead of defending villagers
See merge request veloren/veloren!3166
|
2022-01-30 22:40:35 +00:00 |
|
James Melkonian
|
44865d99ff
|
Fix guards menacing instead of defending villagers
|
2022-01-30 13:14:24 -08:00 |
|
Marcel
|
12f00696ba
|
Merge branch 'tygyh/Simplify-parameters' into 'master'
Tygyh/simplify parameters
See merge request veloren/veloren!3053
|
2022-01-30 19:42:44 +00:00 |
|
Marcel Märtens
|
201a5ac2c7
|
stricten some rules and fix some clippy warnings
|
2022-01-30 20:16:21 +01:00 |
|
Avi Weinstock
|
f3f08936d8
|
Decrease too-many-arguments-threshold and type-complexity-threshold.
|
2022-01-30 20:16:21 +01:00 |
|
Avi Weinstock
|
5f8957d8ef
|
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
|
2022-01-30 20:16:20 +01:00 |
|
Dr. Dystopia
|
7b5d9508b6
|
Create 'ColliderData' struct and implement it in 'resolve_e2e_collision' function
|
2022-01-30 19:50:32 +01:00 |
|
Imbris
|
21cad12272
|
Merge branch 'fix-ghost-item' into 'master'
Fix ghost item when trade gets declined
Closes #1429
See merge request veloren/veloren!3117
|
2022-01-30 17:31:15 +00:00 |
|
jshipsey
|
7cac4b4001
|
myrmidon fix
|
2022-01-30 02:02:23 -05:00 |
|
jshipsey
|
7827797106
|
weapon tweaks
|
2022-01-30 01:10:13 -05:00 |
|
Marcel
|
3120a64be2
|
Merge branch 'swilliams/entity-drops-csv-names' into 'master'
Changed entity drops csv export to export names instead of asset paths
See merge request veloren/veloren!3161
|
2022-01-29 17:37:45 +00:00 |
|
Scott Williams
|
21fd296407
|
Changed entity drops csv export to export names instead of asset paths
|
2022-01-29 17:37:45 +00:00 |
|
Imbris
|
89edd18787
|
Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options
|
2022-01-28 22:55:59 -05:00 |
|
Samuel Keiffer
|
fe532cf536
|
Merge branch 'isse/repeat-primitive' into 'master'
Repeat CSG primitive and float line segment
See merge request veloren/veloren!3158
|
2022-01-28 20:04:45 +00:00 |
|
Isidor Nielsen
|
6f99e70cca
|
Repeat CSG primitive and float line segment
|
2022-01-28 20:04:45 +00:00 |
|
Joshua Barretto
|
d8c4284a32
|
Merge branch 'zesterer/worldgen' into 'master'
Improvements to site2
See merge request veloren/veloren!3159
|
2022-01-28 17:14:07 +00:00 |
|
Joshua Barretto
|
15c5f2f969
|
Better paths in snow
|
2022-01-28 16:45:58 +00:00 |
|
Joshua Barretto
|
5b3d826396
|
Better hazard checks
|
2022-01-28 15:17:56 +00:00 |
|
Joshua Barretto
|
cb45cea6a0
|
Merge branch 'fix-dungeon-collision' into 'master'
Fix dungeon collision
See merge request veloren/veloren!3131
|
2022-01-28 14:07:01 +00:00 |
|
Joshua Barretto
|
69436db64c
|
Added wall lamps
|
2022-01-28 13:58:41 +00:00 |
|
threadexception
|
9822abf9ba
|
Fix dungeon collision
|
2022-01-28 13:59:49 +01:00 |
|
Joshua Barretto
|
e991ff7d6d
|
More precise path placement
|
2022-01-28 11:56:07 +00:00 |
|
jshipsey
|
4fbd3027a1
|
new mobs
|
2022-01-28 02:50:15 -05:00 |
|
Imbris
|
e53d1dde09
|
Merge branch 'juliancoffee/extended_loadout_config' into 'master'
Refactor loadout creation for Npc
See merge request veloren/veloren!3129
|
2022-01-27 23:05:53 +00:00 |
|
juliancoffee
|
fa724ec2e2
|
Fix doc-tests
|
2022-01-28 00:18:29 +02:00 |
|
juliancoffee
|
ed593cd0cb
|
Adress review №2
|
2022-01-28 00:02:34 +02:00 |
|