Snowram
15b6f947c9
Set projectile offsets in states instead of globally
2021-09-22 01:07:09 +02:00
Samuel Keiffer
8e62fcd440
Merge branch 'wolfshaman/fixing_1328_set_waypoint_when_on_ground_and_not_going_down' into 'master'
...
fixing_1328_set_waypoint_when_on_ground_and_not_going_down
See merge request veloren/veloren!2832
2021-09-21 22:16:08 +00:00
Justin Shipsey
33a1474419
Merge branch 'snowram/wyvern' into 'master'
...
Snowram/wyvern
See merge request veloren/veloren!2847
2021-09-21 14:20:33 +00:00
Marcel
d3f55b9975
Merge branch 'juliancoffee/aim_bombs' into 'master'
...
Aimed bombs
See merge request veloren/veloren!2865
2021-09-21 14:18:31 +00:00
Marcel
3c72722e48
Merge branch 'kimtinh/add-vietnamese' into 'master'
...
Add Vietnamese translation
See merge request veloren/veloren!2856
2021-09-21 14:10:40 +00:00
Snowram
8d88a29a4b
Adds Xtilt to BirdLarge skeleton
2021-09-21 15:31:46 +02:00
Snowram
5574554eda
Set beam offset depending on body dimensions
2021-09-21 15:31:46 +02:00
Snowram
46021c31bd
Bird large beam offset hack
2021-09-21 15:31:43 +02:00
jshipsey
7978b16820
animation tweaks
2021-09-21 15:30:43 +02:00
Snowram
cfdcf59844
Split wyvern anims from the other birdlarge anims
2021-09-21 15:30:43 +02:00
jshipsey
be53c407cb
wyvern walk
2021-09-21 15:30:43 +02:00
Snowram
298c1fbccb
More wyvern anim work
2021-09-21 15:30:42 +02:00
Snowram
7384868c57
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
juliancoffee
2341a426f0
Allow aiming bombs
2021-09-20 22:29:25 +03:00
Marcel
c8b210c893
Merge branch 'xMAC94x/update_crates' into 'master'
...
update crates
See merge request veloren/veloren!2863
2021-09-20 13:31:14 +00:00
Marcel Märtens
636838f510
update crates
2021-09-20 14:39:01 +02:00
Joshua Barretto
717690b883
Merge branch 'james/rrt-pathfinding' into 'master'
...
Initial RRT flight pathfinding
See merge request veloren/veloren!2773
2021-09-19 19:30:31 +00:00
Justin Shipsey
d7fafbfdfd
Merge branch 'mehmetmalli/turkish-translations' into 'master'
...
Turkish translations
See merge request veloren/veloren!2861
2021-09-19 17:49:19 +00:00
Mehmet Mallı
0efa41a04d
Update buff.ron
2021-09-19 16:05:04 +00:00
Mehmet Mallı
c1d5e3b0d2
added main Turkish translations
2021-09-19 17:36:31 +03:00
Mehmet Mallı
c8c02fe838
added common Turkish translations
2021-09-19 17:36:05 +03:00
Mehmet Mallı
964c412a7c
changed Turkish translations for uncanny valley in char_selection
2021-09-19 17:35:41 +03:00
Mehmet Mallı
ba3aacb146
added Turkish translations for buffs
2021-09-19 17:35:08 +03:00
Joshua Barretto
845f8977ff
Merge branch 'juliancoffee/clay_gole_laser_fix' into 'master'
...
Tweak coefficient of beam_offset for clay_golem
See merge request veloren/veloren!2859
2021-09-18 17:36:08 +00:00
juliancoffee
215f4b9be0
Tweak coefficient of beam_offset for clay_golem
2021-09-18 19:55:46 +03:00
Ben Wallis
b93c2a0430
Merge branch 'xvar/egui-admin' into 'master'
...
Added new Admin Commands window to egui, including Give Items and Kits sections
See merge request veloren/veloren!2812
2021-09-18 16:02:27 +00:00
Ben Wallis
4349a14064
* Added new Admin Commands window to egui, including Give Items and Kits sections
...
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
2021-09-18 16:17:42 +01:00
Joshua Barretto
8d336d6625
Merge branch 'james/lava-dungeons' into 'master'
...
Prettier site2 houses
See merge request veloren/veloren!2852
2021-09-18 14:58:42 +00:00
Trung Do
b26294885c
Add Vietnamese translation
...
Not translate skills.ron yet.
2021-09-18 17:59:28 +07:00
Justin Shipsey
ddf2c2915d
Merge branch 'zesterer/remove-unscheduled-skydives' into 'master'
...
Remove unscheduled skydives
See merge request veloren/veloren!2851
2021-09-18 04:53:22 +00:00
James Melkonian
571dac7904
Move rrt algorithm into its own function
2021-09-17 16:27:00 -07:00
James Melkonian
7f9ab102c7
Make RRT pathfinding a cfg feature
2021-09-17 16:01:20 -07:00
James Melkonian
746840404c
Disable RRT pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
235e2def3b
Initial RRT flight pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
bb48d20a37
Prettier town houses
2021-09-17 15:49:14 -07:00
James Melkonian
7a72df7e27
Gable primitive and dungeon lava rooms
2021-09-17 15:45:26 -07:00
Joshua Barretto
a015035510
Use previous position caches for airship collision detection
2021-09-17 22:34:28 +01:00
Imbris
ada61107f9
Merge branch 'anomaluridae/cleanup-interactable' into 'master'
...
Seperation of targets vs interactables. Cleaner cursor interactions.
See merge request veloren/veloren!2754
2021-09-17 19:25:08 +00:00
Joshua Barretto
3bebf1febe
Merge branch 'juliancoffee/remove_level' into 'master'
...
Rename level in EntityInfo to health_scaling and small cleaning
See merge request veloren/veloren!2850
2021-09-17 17:38:10 +00:00
anomaluridae
d0629224d2
remove unneeded mut, provide default_select_pos to secondry key event handler, and use the is_filled() over the is_opaque() to be reader friendly
2021-09-17 10:34:20 -07:00
anomaluridae
dc76d5c05f
is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer
2021-09-17 10:34:20 -07:00
anomaluridae
f3d8adf3fa
choose nearest target, from a specific subset of targets, for scene highlighting vs interactable vs game primary/secondary key input
2021-09-17 10:34:20 -07:00
anomaluridae
a7cee0f11b
keep MAX_TARGET_RANGE within voxygen
2021-09-17 10:34:20 -07:00
anomaluridae
2789d2ae29
intentional use of terrain targeting and select_pos as passed to the event handler. select_pos is None when not needed.
2021-09-17 10:34:20 -07:00
anomaluridae
a02488ddd9
properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds.
2021-09-17 10:34:20 -07:00
anomaluridae
0f13db9600
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
anomaluridae
07cfa0ef35
add comment for future direction of Interactables.
2021-09-17 10:34:20 -07:00
anomaluridae
b1adc9c4e0
build positions for place versus remove block are cleaner (less likely to fail) when apply the +0.01 modifier versus -0.01 modifier selectively. this is equivalent to current master, and is simply more explicit now
2021-09-17 10:34:20 -07:00
anomaluridae
9ddc38ba18
changes per MR feedback. simplier Option handling with zip, filter, and fewr unwraps. use kind keyword (not typed). if lets when possible. additional syntax cleanup
2021-09-17 10:34:20 -07:00
anomaluridae
946ca442ab
make Target generic, over the specific typed targets
2021-09-17 10:34:20 -07:00
