InfRandomness
|
8359d5754a
|
Add new primitive to draw giant trees
|
2022-03-24 15:13:53 +00: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 |
|
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 |
|
Imbris
|
1ff8fffa1d
|
Merge branch 'olexorus/2021_cleanup' into 'master'
Simplifications made possible by the 2021 Edition
Closes #1447
See merge request veloren/veloren!3277
|
2022-03-15 21:05:53 +00:00 |
|
Mel
|
0ba3a806c0
|
Apply mount transform position to weapon trails
|
2022-03-15 21:47:17 +01:00 |
|
Marcel
|
1b8662968c
|
Merge branch 'DaforLynx/small-sound-fixes' into 'master'
Small sound fixes
See merge request veloren/veloren!3276
|
2022-03-15 16:23:10 +00:00 |
|
DaforLynx
|
e936a27d40
|
Small sound fixes
|
2022-03-15 16:23:10 +00:00 |
|
Olexorus
|
2212c3d70c
|
Remove borrow-checker appeasing code that's no longer necessary in Rust 2021
|
2022-03-15 16:49:03 +01:00 |
|
Olexorus
|
cf66eccb75
|
Use Rust 2021 postfix .into_iter()
|
2022-03-15 16:34:56 +01:00 |
|
Samuel Keiffer
|
998b1deb15
|
Merge branch 'manuel2258/npc_chasing_utility' into 'master'
Impl #1357: Agent chasing utility
See merge request veloren/veloren!3243
|
2022-03-14 17:59:05 +00:00 |
|
Manuel Schmidbauer
|
0037518472
|
Impl #1357: Agent chase abort
- Adds util funcs to calculate benefit of continue pursue vs letting
target escape
- Hooks util funcs into agent's hostile tree
|
2022-03-14 18:06:57 +01:00 |
|
Imbris
|
9a3b5d3ec8
|
Merge branch 'imbris/fix-optional-command-parsing' into 'master'
Don't consume command args that fail parsing, so that optional args are properly skipped.
See merge request veloren/veloren!3274
|
2022-03-13 21:59:01 +00:00 |
|
Imbris
|
06b605a8d0
|
Add note on reasoning in optional argument parsing behavior
|
2022-03-13 16:03:29 -04:00 |
|
Imbris
|
008e9051f7
|
Don't consume command args that fail parsing, so that optional args are properly skipped.
|
2022-03-13 15:41:37 -04:00 |
|
Imbris
|
bcd4a81174
|
Merge branch 'galaipa/add-basque' into 'master'
Add initial Basque language translation
See merge request veloren/veloren!3220
|
2022-03-13 18:37:50 +00:00 |
|
Imbris
|
6d101419c7
|
Merge branch 'imbris/small-fixed' into 'master'
Small logging filter directives refactor including removing: "ignoring ``: invalid...
See merge request veloren/veloren!3271
|
2022-03-13 16:37:45 +00:00 |
|
Treeco
|
be9a41547d
|
Merge branch 'DaforLynx/town-music-returned' into 'master'
Reinstate town music.
See merge request veloren/veloren!3272
|
2022-03-13 11:18:32 +00:00 |
|
DaforLynx
|
ff624dd6e9
|
Reinstate town music.
|
2022-03-13 11:18:32 +00:00 |
|
Justin Shipsey
|
8072c9db3b
|
Merge branch 'DaforLynx/louder-rivers' into 'master'
Loud rivers
See merge request veloren/veloren!3254
|
2022-03-13 07:47:23 +00:00 |
|
DaforLynx
|
7b6f424bb0
|
Loud rivers
|
2022-03-13 07:47:23 +00:00 |
|
Imbris
|
e00cd7685b
|
Small logging filter directives refactor including removing: "ignoring ``: invalid filter directive"message that always appeared when using RUST_LOG env var
|
2022-03-13 01:37:52 -05:00 |
|
Samuel Keiffer
|
1ecd4a80a0
|
Merge branch 'DaforLynx/fix-movement-sfx' into 'master'
Fix swim sfx, fix glider sfx, add glide sfx
See merge request veloren/veloren!3269
|
2022-03-13 05:44:07 +00:00 |
|
DaforLynx
|
123fee2707
|
Fix swim sfx, fix glider sfx, add glide sfx
|
2022-03-13 05:44:07 +00:00 |
|
Samuel Keiffer
|
c5365c850a
|
Merge branch 'isse/primitive-fixes' into 'master'
Primitive fixes
See merge request veloren/veloren!3260
|
2022-03-13 03:34:49 +00:00 |
|
Isidor Nielsen
|
7621a21560
|
Primitive fixes
|
2022-03-13 03:34:49 +00:00 |
|
Joshua Barretto
|
5ee6278860
|
Merge branch 'tormod-spread-towns-out' into 'master'
Fix bug where chunks outside the map counted as occupied.
See merge request veloren/veloren!3268
|
2022-03-12 13:10:32 +00:00 |
|
Tormod G. Hellen
|
5f12163e54
|
Prevent towns being placed in the ocean just off the coast.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
5e3ef83195
|
Force incompatible sites further apart.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
afdb7fe9ea
|
Increase quality of town placements.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
68072231dc
|
Force towns further apart.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
031db61c1e
|
Fix bug where chunks outside the map counted as occupied.
This prevented sites from being placed near the edge of the map.
|
2022-03-12 02:45:43 +01:00 |
|
Joshua Barretto
|
87b139d32b
|
Merge branch 'isse/painter-spawn' into 'master'
Add entity spawn on painter
See merge request veloren/veloren!3265
|
2022-03-09 21:40:23 +00:00 |
|
Isidor Nielsen
|
e21f04d456
|
Add entity spawn on painter
|
2022-03-09 21:40:23 +00:00 |
|
Marcel
|
dfd1d3a2d9
|
Merge branch 'xMAC94x/client_lag' into 'master'
extra scope for plot
See merge request veloren/veloren!3266
|
2022-03-09 11:34:55 +00:00 |
|
Marcel Märtens
|
167e3321e1
|
put tracy in a seperate scope
|
2022-03-08 20:57:55 +01:00 |
|
Samuel Keiffer
|
a411db17bf
|
Merge branch 'tygyh/Refactor-path_toward_target' into 'master'
Tygyh/refactor path toward target
See merge request veloren/veloren!3241
|
2022-03-08 16:43:37 +00:00 |
|
Marcel
|
d05cb99007
|
Merge branch 'unvariant/trading_fix' into 'master'
prevent glider and sneak from triggering during trade
See merge request veloren/veloren!3264
|
2022-03-08 10:25:16 +00:00 |
|
ninefox
|
115b2875b3
|
prevent glider and sneak from triggering during trade
|
2022-03-07 20:28:38 -08:00 |
|
Imbris
|
f6b805db77
|
Merge branch 'isse/map-marker-fixes' into 'master'
Map marker fixes
See merge request veloren/veloren!3262
|
2022-03-07 12:16:04 +00:00 |
|
Isidor Nielsen
|
a5ab36e6b5
|
Map marker fixes
|
2022-03-07 12:16:04 +00:00 |
|
Marcel
|
9fe45ddb89
|
Merge branch 'christof/icetea_quickfix' into 'master'
hotfix for sunflow ice tea costing 16x the amount of its ingredients
See merge request veloren/veloren!3258
|
2022-03-05 14:22:29 +00:00 |
|
Christof Petig
|
c3d6b8c250
|
crafting factor was wrongly used as well …
|
2022-03-05 13:18:09 +01:00 |
|
Christof Petig
|
d02018f893
|
hotfix for sunflow ice tea costing 16x the amount of its ingredients
also makes price debugging output more readable
|
2022-03-05 13:07:55 +01:00 |
|