Justin Shipsey
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
Christof Petig
f347b9de11
Diversify price calculation for items by using multiple categories per item.
2022-03-03 02:32:34 +00:00
Joshua Barretto
dbc969251c
Merge branch 'isse/rock' into 'master'
...
Better rocks
See merge request veloren/veloren!3247
2022-03-02 16:28:05 +00:00
Isidor Nielsen
bd8a7a0506
Better rocks
2022-03-02 16:28:04 +00:00
Samuel Keiffer
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
Isidor Nielsen
f8916f878a
Primitive group transformation and RotateAround primitive
2022-03-01 23:38:05 +00:00
Dr. Dystopia
4aab1eea43
Remove redundant 'tgt_pos' variables
2022-03-01 22:54:44 +01:00
Dr. Dystopia
5aa1d3ceaf
Rename 'vec3' parameter to 'pos_difference'
2022-03-01 22:47:01 +01:00
Dr. Dystopia
f99a637606
Rename 'dist_to_pos' variable to 'pos_diff'
2022-03-01 22:44:55 +01:00
Dr. Dystopia
50f877bdf6
Rename 'dist_to_pos_xy' variable to 'dist_xy'
2022-03-01 22:42:03 +01:00
Dr. Dystopia
83f46658a9
Fix pathing execution
2022-03-01 22:40:43 +01:00
Dr. Dystopia
0a3de57be6
Rename 'distance_to_target' variable to 'pos_difference'
2022-03-01 22:38:35 +01:00
Dr. Dystopia
4d24ff0027
Rename 'target_position' clojure to 'partial_path_tgt_pos'
2022-03-01 22:33:25 +01:00
Marcel
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
infrandomness
1d44247efe
Enable return_self_not_must_use lint
2022-03-01 10:53:57 +01:00
Joshua Barretto
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
ubruntu
94a9b407c2
Fix waypoints being movable
2022-02-28 19:20:37 +00:00
Imbris
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
InfRandomness
042d258161
Modify message catch-all arms
2022-02-27 23:08:47 +00:00
Imbris
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
ubruntu
d18242a1df
Fix interactable HUD
2022-02-27 21:50:07 +00:00
Imbris
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
Imbris
8742a37e0f
Changes based on review. Fix tests.
2022-02-27 14:43:08 -05:00
Marcel
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
N A
fc9c3c3be9
worth_choosing refactor
2022-02-27 19:21:21 +00:00
Imbris
e6c2239744
Fix typo. cargo fmt.
2022-02-27 13:47:13 -05:00
Imbris
e52159f638
Remove original character from game world when possessing to make persistence more robust.
2022-02-27 13:47:13 -05:00
Imbris
10803a9735
Stop using Character presence kind when possessing so that persistence doesn't get messed up.
2022-02-27 13:47:12 -05:00
Imbris
c2ad763b9c
Handle removing/inserting SyncFrom::ClientEntity components properly during possession.
2022-02-27 13:47:12 -05:00
Imbris
63ed36bdde
Limit possesse to regions which possessor is subscribed to.
2022-02-27 13:47:12 -05:00
Imbris
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
Imbris
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
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
