e52159f638
Remove original character from game world when possessing to make persistence more robust.
2022-02-27 13:47:13 -05:00
10803a9735
Stop using Character presence kind when possessing so that persistence doesn't get messed up.
2022-02-27 13:47:12 -05:00
c2ad763b9c
Handle removing/inserting SyncFrom::ClientEntity components properly during possession.
2022-02-27 13:47:12 -05:00
63ed36bdde
Limit possesse to regions which possessor is subscribed to.
2022-02-27 13:47:12 -05:00
6f9ff17ce8
Properly handle cleanup of old entity controller during possession on both the client and server sides
2022-02-27 13:47:12 -05:00
1a744808f0
Cleanup up possession code and add TODOs for issues to fix. Remove
...
SyncFrom debug_assertions hack.
2022-02-27 13:47:12 -05:00
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
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
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
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
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
e0abb8f0e6
Merge branch 'imbris/small-fix' into 'master'
...
Small fix
See merge request veloren/veloren!3239
2022-02-26 06:37:43 +00:00
fb2f731ac3
Small fix
2022-02-26 01:05:28 -05:00
08f67a335f
Add experimental shader option that lowers glow strength for lights near the camera
2022-02-26 00:26:42 -05:00
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
b0ba5b9979
fix SeaCrocodiles spawning in lakes
2022-02-25 18:13:47 +01:00
5aa98b7b3e
Applied review suggestions
2022-02-23 18:37:04 -08:00
61913402a2
add code to center item drops
...
reduce size of coins
2022-02-23 17:16:10 -08:00
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
1456efefd1
Nerf
2022-02-22 18:17:23 -05:00
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
5df1ee6382
Prevent castles being assailable from above.
2022-02-22 22:11:01 +01:00
609b26ce20
Prevent trees being placed in barren regions.
2022-02-22 21:00:52 +01:00
a2d24521ee
Prevent things being close that shouldn't.
2022-02-22 21:00:52 +01:00
b6b67d367a
Prevent close settlements.
2022-02-22 21:00:52 +01:00
acce8aefa4
Determine town suitability using log function.
2022-02-22 21:00:52 +01:00
22a75332f8
Ensure towns are placed only in viable locations.
2022-02-22 21:00:52 +01:00
1ae93ee00e
Add more water checks.
...
Not sure if necessary or just paranoia.
2022-02-22 21:00:52 +01:00
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
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
6d795b6ecd
Campfire heals pets when owner sits
2022-02-22 09:23:07 +00:00
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
b0122a6b46
remove blank line
2022-02-21 04:04:56 +02:00
9bdb7198f5
Fix imports
2022-02-21 03:46:02 +02:00
13308d009d
Fix run config
2022-02-21 03:33:58 +02:00
cdd01655c1
Fix run config
2022-02-21 02:50:16 +02:00
3e5a220980
Fix generate_chunk to also accept Calendar
2022-02-21 02:48:12 +02:00
473a807e46
Merge branch 'isse/workshop-fixes' into 'master'
...
Workshop fixes
See merge request veloren/veloren!3226
2022-02-20 22:21:00 +00:00
e9e4be6e7e
break when there are no stations
2022-02-20 22:11:09 +01:00
258b3c7535
Workshop fixes
2022-02-20 22:08:13 +01:00
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
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
e05499c044
Move changelog
2022-02-20 18:25:16 +01:00
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
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
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
a685a353cb
Shared and persistent waypoints
2022-02-20 10:10:18 +00:00
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
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
e2648f6733
apply changes from MR!2904
2022-02-20 10:18:24 +01:00
