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 |
|
Isidor Nielsen
|
a685a353cb
|
Shared and persistent waypoints
|
2022-02-20 10:10:18 +00:00 |
|
Marcel
|
6a9924d6ca
|
Merge branch 'imbris/small-fixes' into 'master'
Small bits of code cleanup
See merge request veloren/veloren!3222
|
2022-02-20 09:41:21 +00:00 |
|
Marcel
|
eaf6422fbf
|
Merge branch 'imbris/screenshot-mapping' into 'master'
Fix race in screenshot logic
See merge request veloren/veloren!3221
|
2022-02-20 09:38:24 +00:00 |
|
Marcel Märtens
|
e2648f6733
|
apply changes from MR!2904
|
2022-02-20 10:18:24 +01:00 |
|
Imbris
|
565785c0aa
|
Remove TODO, UidAllocator needed on client to map uid -> entities
|
2022-02-19 20:01:40 -05:00 |
|
Imbris
|
d8996a9b94
|
Remove unwrap in handling of the DeleteServer message in the main menu ui
|
2022-02-19 19:37:53 -05:00 |
|
Imbris
|
d7d8d8d2da
|
Small cleanup in server-cli/src/main.rs
|
2022-02-19 19:22:13 -05:00 |
|
Imbris
|
adec5905bd
|
Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted.
|
2022-02-19 19:05:04 -05:00 |
|
Marcel
|
b5bac97c2e
|
Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.12
See merge request veloren/veloren!3219
|
2022-02-18 23:41:06 +00:00 |
|
Marcel Märtens
|
802b9e7914
|
Change the version number to 0.12
|
2022-02-18 22:36:53 +01:00 |
|
Marcel
|
caf46a3f8d
|
Merge branch 'treeco/remove-settings-button' into 'master'
Removed dead settings button from main menu
See merge request veloren/veloren!3218
|
2022-02-18 16:36:42 +00:00 |
|
Treeco
|
fdd7237dfc
|
Removed dead settings button from main menu
|
2022-02-18 16:11:30 +00:00 |
|