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
10,000 Commits 151 Branches 18 Tags
77a1fc26bd
Commit Graph

1904 Commits

Author SHA1 Message Date
Joshua Barretto
afc0fa0ffd Prevented double-spawning of chunks 2021-10-08 12:20:46 +01:00
Joshua Barretto
fa767246f3 Added minimum server-side chunk loading 2021-10-07 14:23:55 +01:00
Treeco
6409bd1abb Fix large map loading 2021-10-06 02:26:58 +01:00
Imbris
7898af73c2 Revert "Merge branch 'ubruntu/par-entity-sync' into 'master'" 
This reverts merge request
2021-10-05 14:42:39 +00:00
Bryant Deters
b2d384b436 using par_join.for_each as if I know what I'm doing 2021-10-01 18:05:52 -05:00
Imbris
2cc2db3186 Merge branch 'ubruntu/trade-fix-part3' into 'master' 
Trade fix (with hashmap awareness)

See merge request
2021-10-01 21:17:19 +00:00
ubruntu
241fbc47dd Trade fix (with hashmap awareness) 2021-10-01 21:17:19 +00:00
juliancoffee
e5d6fd2887 Cleaning 2021-09-27 23:21:57 +03:00
juliancoffee
7df22ceaec Make ItemDrop component with Item again 2021-09-27 20:36:18 +03:00
juliancoffee
3c0211bf0b Adress review 
- Added comments on why Waypoint branch of NpcData is unreachable.
- Added comments on signature of get_adhoc_loadout.
 2021-09-27 15:09:22 +03:00
juliancoffee
98382ea012 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
Sam
9a57b218ed Rtsim now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
99e19dc5d0 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
38c004d494 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
Sam
06f3e04034 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Marcel
64a8e3c5df Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2021-09-24`

See merge request
2021-09-26 19:25:02 +00:00
Samuel Keiffer
d7a89bf944 Merge branch 'sam/cr-weights' into 'master' 
Changed weights of cr calculation and exp from cr formula.

See merge request
2021-09-26 18:21:56 +00:00
Sam
f74bb6d70a Condense assignment of variables 2021-09-26 13:51:27 -04:00
Imbris
ec5204af37 Add note on a clippy suppression pointing to relevant clippy issue 2021-09-26 11:24:30 -04:00
Seth
f99211d482 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Sam
14cdb2b803 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Sam
d0c78c3d63 Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Marcel Märtens
96bd27db62 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Marcel Märtens
8c0c86b192 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +02:00
Sam
961782851f Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
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
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
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
2021-09-21 22:16:08 +00:00
Justin Shipsey
33a1474419 Merge branch 'snowram/wyvern' into 'master' 
Snowram/wyvern

See merge request
2021-09-21 14:20:33 +00:00
Marcel
d3f55b9975 Merge branch 'juliancoffee/aim_bombs' into 'master' 
Aimed bombs

See merge request
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
2021-09-13 15:23:18 +00:00