Imbris
d5bde47a03
Merge branch 'bwerf/fix_minimap_marker' into 'master'
...
Minimap draw order fix
See merge request veloren/veloren!3244
2022-02-27 15:29:19 +00:00
Karl Werf
4dae579aca
Minimap draw order fix
...
Minimap location marker and player indicator are no longer drawn on top of the main map if they overlap.
Minimap location marker is no longer a button.
2022-02-27 15:41:12 +01:00
Dr. Dystopia
7e70d7648e
Dereference 'tgt_pos' variables
2022-02-27 10:36:01 +01:00
Dr. Dystopia
a39d514bae
Replace 'tgt_data' parameter with 'tgt_pos' parameter
2022-02-27 10:19:45 +01:00
Imbris
4aa89fd6cc
Merge branch 'unvariant/center_item_drops' into 'master'
...
Center item drops
See merge request veloren/veloren!3232
2022-02-27 02:07:30 +00:00
ninefox
329051c6df
removed extra fields from item_drop_manifest.ron
...
added TODO about applying non-random rotations in load.rs
2022-02-26 10:13:04 -08:00
Imbris
9885dcdebc
Merge branch 'imbris/experimental-low-glow' into 'master'
...
Add experimental shader option that lowers glow strength for lights near the camera
See merge request veloren/veloren!3238
2022-02-26 15:42:08 +00:00
Justin Shipsey
e0abb8f0e6
Merge branch 'imbris/small-fix' into 'master'
...
Small fix
See merge request veloren/veloren!3239
2022-02-26 06:37:43 +00:00
Imbris
fb2f731ac3
Small fix
2022-02-26 01:05:28 -05:00
Imbris
08f67a335f
Add experimental shader option that lowers glow strength for lights near the camera
2022-02-26 00:26:42 -05:00
Dr. Dystopia
75322ddfc0
Extract 'dist_to_pos' variable
2022-02-25 22:00:42 +01:00
Dr. Dystopia
ee26778118
Extract 'dist_to_pos_xy' variable
2022-02-25 21:57:29 +01:00
Justin Shipsey
56a924b1c6
Merge branch 'floppy-fix_SeaCrocodiles_spawning_in_lakes' into 'master'
...
fix SeaCrocodiles spawning in lakes
See merge request veloren/veloren!3236
2022-02-25 20:56:34 +00:00
Dr. Dystopia
019d619cf6
Extract 'spacing' variable
2022-02-25 21:48:29 +01:00
Dr. Dystopia
15bea26823
Extract 'target_position' clojure
2022-02-25 21:44:43 +01:00
Dr. Dystopia
d921e1e3ea
Extract 'pos' variable
2022-02-25 21:40:42 +01:00
Dr. Dystopia
e2d42207a4
Update 'path_toward_target' doc comment
2022-02-25 21:37:01 +01:00
Dr. Dystopia
4aebe19d94
Extract 'distance_to_target' variable
2022-02-25 21:35:50 +01:00
Dr. Dystopia
0dad86e1ca
Replace flag parameters with 'Path' enum
2022-02-25 21:35:35 +01:00
floppy
b0ba5b9979
fix SeaCrocodiles spawning in lakes
2022-02-25 18:13:47 +01:00
ninefox
5aa98b7b3e
Applied review suggestions
2022-02-23 18:37:04 -08:00
ninefox
61913402a2
add code to center item drops
...
reduce size of coins
2022-02-23 17:16:10 -08:00
Samuel Keiffer
f369e9ba12
Merge branch 'sam/slash-nerf' into 'master'
...
Nerf to Slashing Damage
See merge request veloren/veloren!3230
2022-02-22 23:42:53 +00:00
Sam
1456efefd1
Nerf
2022-02-22 18:17:23 -05:00
Joshua Barretto
5678bd2bbb
Merge branch 'better-town-placement' into 'master'
...
Better town placement
See merge request veloren/veloren!3208
2022-02-22 21:36:48 +00:00
Tormod G. Hellen
5df1ee6382
Prevent castles being assailable from above.
2022-02-22 22:11:01 +01:00
Tormod G. Hellen
609b26ce20
Prevent trees being placed in barren regions.
2022-02-22 21:00:52 +01:00
Tormod G. Hellen
a2d24521ee
Prevent things being close that shouldn't.
2022-02-22 21:00:52 +01:00
Tormod G. Hellen
b6b67d367a
Prevent close settlements.
2022-02-22 21:00:52 +01:00
Tormod G. Hellen
acce8aefa4
Determine town suitability using log function.
2022-02-22 21:00:52 +01:00
Tormod G. Hellen
22a75332f8
Ensure towns are placed only in viable locations.
2022-02-22 21:00:52 +01:00
Tormod G. Hellen
1ae93ee00e
Add more water checks.
...
Not sure if necessary or just paranoia.
2022-02-22 21:00:52 +01:00
Tormod G. Hellen
339d6f2a3b
Refactor for clarity.
...
This code was a bit hard to read. The name ought to make it easier.
2022-02-22 21:00:52 +01:00
Marcel
061e91cec1
Merge branch 'ubruntu/pet-campfireheal' into 'master'
...
Campfire heals pets when owner sits
See merge request veloren/veloren!3229
2022-02-22 09:23:07 +00:00
ubruntu
6d795b6ecd
Campfire heals pets when owner sits
2022-02-22 09:23:07 +00:00
Imbris
423ee8d14b
Merge branch 'test-server_fix' into 'master'
...
Fix test-server
See merge request veloren/veloren!3227
2022-02-21 02:29:20 +00:00
Inojelis
b0122a6b46
remove blank line
2022-02-21 04:04:56 +02:00
Inojelis
9bdb7198f5
Fix imports
2022-02-21 03:46:02 +02:00
Inojelis
13308d009d
Fix run config
2022-02-21 03:33:58 +02:00
Inojelis
cdd01655c1
Fix run config
2022-02-21 02:50:16 +02:00
Inojelis
3e5a220980
Fix generate_chunk to also accept Calendar
2022-02-21 02:48:12 +02:00
Marcel
473a807e46
Merge branch 'isse/workshop-fixes' into 'master'
...
Workshop fixes
See merge request veloren/veloren!3226
2022-02-20 22:21:00 +00:00
IsseW
e9e4be6e7e
break when there are no stations
2022-02-20 22:11:09 +01:00
IsseW
258b3c7535
Workshop fixes
2022-02-20 22:08:13 +01:00
Joshua Barretto
4ef1c92858
Merge branch 'enable_custom_names_for_lakes' into 'master'
...
enable custom naming bricks for lake biomes
See merge request veloren/veloren!3210
2022-02-20 19:47:23 +00:00
Imbris
19afa40ad3
Merge branch 'isse/move-marker-changelog' into 'master'
...
Move changelog
See merge request veloren/veloren!3225
2022-02-20 17:28:41 +00:00
IsseW
e05499c044
Move changelog
2022-02-20 18:25:16 +01:00
Marcel
2a9f75340a
Merge branch 'spanish_translation' into 'master'
...
apply changes from MR!2904
See merge request veloren/veloren!3224
2022-02-20 16:26:24 +00:00
Marcel
6506a97dcd
Merge branch 'zesterer/enable-site2-towns' into 'master'
...
Enabled site2 towns by default
See merge request veloren/veloren!3206
2022-02-20 14:02:53 +00:00
Marcel
df7cd2da1a
Merge branch 'isse/shared-waypoints' into 'master'
...
Shared and persistent waypoints
See merge request veloren/veloren!3162
2022-02-20 10:10:18 +00:00
