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,061 Commits 151 Branches 18 Tags 2.1 GiB
c8576d35d4
Commit Graph

1914 Commits

Author SHA1 Message Date
socksonme
c8576d35d4 Renamed emit_alarm to emit_scream 2021-10-16 19:11:57 +03:00
socksonme
ea11cb388e small code quality change 2021-10-15 23:23:45 +03:00
socksonme
092720346e Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Joshua Barretto
99a83aba2b Merge branch 'make-merchants-send-trade-on-iteraction' into 'master' 
Make merchants send the player a trade request when interacted with

Closes 

See merge request
2021-10-11 16:45:18 +00:00
juliancoffee
a4f882a8d6 Fix Traveller names 
- Previously RtSim were created with automatic name for body generated
  from EntityConfig, not from RtSim body. Now RtSim body is set for
  EntityConfig.
 2021-10-11 15:06:43 +03:00
antoniomuso
ab92c4d52f Make merchants send the player a trade request when interacted with 2021-10-09 21:14:01 +02:00
Joshua Barretto
af18c2590d Merge branch 'ubruntu/group-loot-notifications' into 'master' 
Groups can see what each member picks up

See merge request
2021-10-09 10:50:02 +00:00
ubruntu
ba9923c049 Groups can see what each member picks up 2021-10-09 10:50:01 +00:00
Imbris
5394ab16bb Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain. 2021-10-08 16:17:31 -04:00
Imbris
8575661d28 Ensure cancelled chunks are not loaded into the terrain 2021-10-08 13:20:50 -04:00
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