Imbris
67e3b87717
Add note on a clippy suppression pointing to relevant clippy issue
2021-09-26 11:24:30 -04:00
Marcel Märtens
e36eef99c8
apply some clippy fixes that comes with the new toolchain version
2021-09-24 23:18:18 +02:00
Marcel Märtens
2a82405df2
update toolchain to nightly-2021-09-24
2021-09-24 23:18:07 +02:00
Snowram
76d41aa340
Removes flame wyvern from RTsim pool until proper introduction
2021-09-22 20:59:04 +02:00
Joshua Barretto
4e61e5a04f
Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"
...
This reverts merge request !2866
2021-09-22 11:45:54 +00:00
Samuel Keiffer
0b477ec9af
Merge branch 'snowram/projectile-offsets' into 'master'
...
Set projectile offsets in states instead of globally
See merge request veloren/veloren!2855
2021-09-22 01:55:39 +00:00
Snowram
5838a84568
Consolidates projectile offsets into utils
2021-09-22 03:05:57 +02:00
ubruntu
33526afe5a
Trade Fix III: Revolutions
2021-09-21 23:16:00 +00:00
Snowram
9c2ce83430
Set projectile offsets in states instead of globally
2021-09-22 01:07:09 +02:00
Samuel Keiffer
576f2a6e9f
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
2c3640b527
Merge branch 'snowram/wyvern' into 'master'
...
Snowram/wyvern
See merge request veloren/veloren!2847
2021-09-21 14:20:33 +00:00
Marcel
daa93a6d16
Merge branch 'juliancoffee/aim_bombs' into 'master'
...
Aimed bombs
See merge request veloren/veloren!2865
2021-09-21 14:18:31 +00:00
Snowram
7a73e4240b
Bird large beam offset hack
2021-09-21 15:31:43 +02:00
juliancoffee
6e2f9be13f
Allow aiming bombs
2021-09-20 22:29:25 +03:00
Marcel Märtens
88685cc016
update crates
2021-09-20 14:39:01 +02:00
Ben Wallis
d665ce329d
* 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
juliancoffee
f810af4eec
Rename EntityInfo level field to health_scaling
2021-09-17 20:12:42 +03:00
juliancoffee
4e3fb87526
Adress review
...
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
with p0=p1=Vec2::zero())
2021-09-17 13:28:34 +03:00
juliancoffee
c069a3523d
Fix beam offsets
...
- Introduce notion of min and max radius for Body instead of old
`radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
juliancoffee
eeb3bec8ad
Refactor implementation of e2e collision
...
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
Capsule.
2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678
Remove body::Shape enum, make npc use CapsulePrism
2021-09-17 13:28:34 +03:00
juliancoffee
3b308a3f6f
Add CapsulePrism collider variant
...
+ Add placeholder physics collision implementation as copy of cylinder
Box collider.
+ Display it with debug hitboxes.
2021-09-17 13:28:34 +03:00
ubruntu
56f26dc3a8
Another trade fix
2021-09-16 22:06:30 +00:00
Sam
99981338bb
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.
2021-09-15 08:32:44 -04:00
Sam
c4c4318ac0
Fixed fall damage and sceptre regen.
2021-09-14 06:53:01 -04:00
ubruntu
8eb61192fd
Fix trade/merchant bugs
2021-09-14 07:31:06 +00:00
wolfshaman
d321d1aad4
fixing_1328_set_waypoint_when_on_ground_and_not_going_down
2021-09-13 16:51:02 -04:00
Samuel Keiffer
73d3d3e4bb
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
85f4e66337
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Marcel Märtens
7913e6a9ba
Change the version number to 0.11
2021-09-10 20:19:17 +02:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Joshua Barretto
78fce06b47
Allowed players to assist NPCs in fights without problems by tweaking aggro rules
2021-09-08 13:17:53 +01:00
Aleksandr Nariadchikov
3f31f07cc2
[ #1251 ] Code style refactoring
2021-09-06 20:33:08 +03:00
Aleksandr Nariadchikov
c22104ea56
[ #1251 ] Mutable variables are removed. For killing checking non players without alignments as well as with it.
2021-09-06 19:31:12 +03:00
Aleksandr Nariadchikov
75bbe619fd
[ #1251 ] /kill_npcs admin command does not kill player's pets now without additional argument "--also-pets"
2021-09-06 18:21:32 +03:00
Xeriab Nabil
c9e2293a6c
Server: Fix character deletion mentioned in #1327
2021-09-06 16:02:41 +03:00
jshipsey
3c623c6801
address comments, boost village pop, lower raid chance
2021-09-06 00:01:26 -04:00
Khalid Ali
cbc6cdfad1
Use unreachable instead of panic
2021-09-05 18:13:20 -05:00
Khalid Ali
a0b78ffd16
Add RepeaterRanged and fix scaling ChargedRange
2021-09-05 18:03:54 -05:00
Khalid Ali
871a1ccbfc
Set direction using character state
2021-09-05 17:07:09 -05:00
Sam
9675d2b45a
Cultists no longer attack the starting town.
2021-09-05 11:36:40 -04:00
Joshua Barretto
896d9299e5
Merge branch 'ubruntu/fix-dungeon-loot-fallback' into 'master'
...
fix BipedSmall NPCs using fallback loot table
See merge request veloren/veloren!2809
2021-09-04 18:53:55 +00:00
Joshua Barretto
003b9f57ce
Merge branch 'juliancoffee/pvp_command' into 'master'
...
Implement /battlemode command and more
See merge request veloren/veloren!2787
2021-09-04 18:37:01 +00:00
juliancoffee
670e29a286
Better formatting
2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0
Adress review:
...
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
plant fields, which is kinda meh)
- better error displaying
2021-09-04 20:38:53 +03:00
Bryant Deters
f8c54cbd05
added a bipedsmall variant to loot fallback
2021-09-04 12:11:09 -05:00
Sam
261fd562dc
Raiders raid less often, raid for less time, and sit at their home for longer.
2021-09-04 12:42:42 -04:00
Sam
f65b3a094d
Cultists now properly raid villages.
2021-09-04 12:25:04 -04:00
Sam
f198349f61
Attempt at getting raiders to wander around village once they get there.
2021-09-04 01:10:57 -04:00