Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,894 Commits 151 Branches 18 Tags
Commit Graph

1879 Commits

Author SHA1 Message Date
Snowram
4c74899143 Removes flame wyvern from RTsim pool until proper introduction 2021-09-22 20:59:04 +02:00
Joshua Barretto
34380bd686 Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'" 
This reverts merge request !2866
 2021-09-22 11:45:54 +00:00
Samuel Keiffer
5b6deacd06 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
b444a74d8f Consolidates projectile offsets into utils 2021-09-22 03:05:57 +02:00
ubruntu
5c01595bda Trade Fix III: Revolutions 2021-09-21 23:16:00 +00:00
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
Snowram
46021c31bd Bird large beam offset hack 2021-09-21 15:31:43 +02:00
juliancoffee
2341a426f0 Allow aiming bombs 2021-09-20 22:29:25 +03:00
Marcel Märtens
636838f510 update crates 2021-09-20 14:39:01 +02: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
juliancoffee
d3e08ff663 Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
juliancoffee
938091e8a3 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
75954d289e 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
ab3e68f432 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
58a4659c47 Remove body::Shape enum, make npc use CapsulePrism 2021-09-17 13:28:34 +03:00
juliancoffee
feefd36036 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
db090c8112 Another trade fix 2021-09-16 22:06:30 +00:00
Sam
46a6d21d63 Fixed exp fix mistake and fixed lava, campfire, and bomb damage. 2021-09-15 08:32:44 -04:00
Sam
7433994fca Fixed fall damage and sceptre regen. 2021-09-14 06:53:01 -04:00
ubruntu
4ffae084e8 Fix trade/merchant bugs 2021-09-14 07:31:06 +00:00
wolfshaman
dbb6d75427 fixing_1328_set_waypoint_when_on_ground_and_not_going_down 2021-09-13 16:51:02 -04:00
Samuel Keiffer
0f7cd1baa4 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
727c5f107c Addressed MR 2824 comments 2021-09-10 15:20:14 -04:00
Marcel Märtens
215b20fa92 Change the version number to 0.11 2021-09-10 20:19:17 +02:00
Monty Marz
0e0cbae08c 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Sam
a4c6621fa0 Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
Joshua Barretto
003e071e91 Allowed players to assist NPCs in fights without problems by tweaking aggro rules 2021-09-08 13:17:53 +01:00
Aleksandr Nariadchikov
c4c62f4c4f [#1251] Code style refactoring 2021-09-06 20:33:08 +03:00
Aleksandr Nariadchikov
0de752263a [#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
363332ec86 [#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
7115382535 Server: Fix character deletion mentioned in #1327 2021-09-06 16:02:41 +03:00
jshipsey
1c8e14964d address comments, boost village pop, lower raid chance 2021-09-06 00:01:26 -04:00
Khalid Ali
bbf1dc4167 Use unreachable instead of panic 2021-09-05 18:13:20 -05:00
Khalid Ali
dfad30d7dd Add RepeaterRanged and fix scaling ChargedRange 2021-09-05 18:03:54 -05:00
Khalid Ali
5ada9f362a Set direction using character state 2021-09-05 17:07:09 -05:00
Sam
c770545526 Cultists no longer attack the starting town. 2021-09-05 11:36:40 -04:00
Joshua Barretto
102a6fe1f0 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
278451b6e6 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
69f18c8fe6 Better formatting 2021-09-04 20:56:55 +03:00
juliancoffee
134699e1db 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
23daa0e5c7 added a bipedsmall variant to loot fallback 2021-09-04 12:11:09 -05:00
Sam
d98bc92be1 Raiders raid less often, raid for less time, and sit at their home for longer. 2021-09-04 12:42:42 -04:00
Sam
bfcb27db5a Cultists now properly raid villages. 2021-09-04 12:25:04 -04:00
Sam
111cab4892 Attempt at getting raiders to wander around village once they get there. 2021-09-04 01:10:57 -04:00
Sam
13192b6024 Hacky raid mechanics for cultist raiders. 2021-09-04 00:34:30 -04:00
Sam
2fae9d9b56 Cultist enemies are now spawned by rtsim. 2021-09-04 00:05:48 -04:00
Sam
7983c75911 Allowed specifying that rtsim entities spawn at a particular site. 2021-09-03 23:34:24 -04:00