05f53a5316
Changed to one dynamic model per entity.
2022-03-03 01:10:50 -05:00
d9028ec978
Dynamic model now used for trail.
2022-03-03 01:10:49 -05:00
0794f980fe
Mostly snaked through another rendering pipeline
2022-03-03 01:10:47 -05:00
b8bb77a62c
Merge branch 'christof/shredded_economy' into 'master'
...
Diversify price calculation for items by using multiple categories per item.
See merge request veloren/veloren!3248
2022-03-03 02:32:34 +00:00
f347b9de11
Diversify price calculation for items by using multiple categories per item.
2022-03-03 02:32:34 +00:00
dbc969251c
Merge branch 'isse/rock' into 'master'
...
Better rocks
See merge request veloren/veloren!3247
2022-03-02 16:28:05 +00:00
bd8a7a0506
Better rocks
2022-03-02 16:28:04 +00:00
40d5920ca2
Merge branch 'isse/primitive-transform' into 'master'
...
Primitive group transformation and RotateAround primitive
See merge request veloren/veloren!3235
2022-03-01 23:38:05 +00:00
f8916f878a
Primitive group transformation and RotateAround primitive
2022-03-01 23:38:05 +00:00
39c8834af1
Merge branch 'infrandomness/worldgen/enable_return_self_not_must_use' into 'master'
...
Enable return_self_not_must_use lint
See merge request veloren/veloren!3249
2022-03-01 10:49:17 +00:00
1d44247efe
Enable return_self_not_must_use lint
2022-03-01 10:53:57 +01:00
de508c4e9d
Merge branch 'ubruntu/immovable_campfires' into 'master'
...
Fix waypoints being movable
Closes #1482
See merge request veloren/veloren!3246
2022-02-28 19:20:38 +00:00
94a9b407c2
Fix waypoints being movable
2022-02-28 19:20:37 +00:00
9539991e8f
Merge branch 'infrandomness/server/misbehaving_clients' into 'master'
...
Modify message catch-all arms
See merge request veloren/veloren!3245
2022-02-27 23:08:48 +00:00
042d258161
Modify message catch-all arms
2022-02-27 23:08:47 +00:00
466c1c4dcb
Merge branch 'ubruntu/interact-hud-fix' into 'master'
...
Fix interactable HUD
Closes #1474
See merge request veloren/veloren!3240
2022-02-27 21:50:08 +00:00
d18242a1df
Fix interactable HUD
2022-02-27 21:50:07 +00:00
7be5b4c051
Merge branch 'imbris/fix-possesion-comp-sync' into 'master'
...
Improve possession edge cases
See merge request veloren/veloren!3233
2022-02-27 20:10:16 +00:00
8742a37e0f
Changes based on review. Fix tests.
2022-02-27 14:43:08 -05:00
bc111abefd
Merge branch 'agent_worth_choosing_refactor' into 'master'
...
worth_choosing refactor
See merge request veloren/veloren!3237
2022-02-27 19:21:22 +00:00
fc9c3c3be9
worth_choosing refactor
2022-02-27 19:21:21 +00:00
e6c2239744
Fix typo. cargo fmt.
2022-02-27 13:47:13 -05:00
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