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
7,568 Commits 151 Branches 18 Tags
Commit Graph

1444 Commits

Author SHA1 Message Date
Joshua Yanovski
1c38230494 Fix players being able to pick up other players. 2021-04-11 15:52:55 +02:00
Marcel
e0af7d8d87 Merge branch 'UMR1352/fix#1059' into 'master' 
fix issue #1059: Debug items should disappear when dropped

Closes #1059

See merge request veloren/veloren!2088
 2021-04-10 17:41:43 +00:00
Joshua Yanovski
909f2c4680 Remove panics and unwraps, part 1. 
Also fixes various other miscellaneous bugs.
 2021-04-10 10:03:21 +02:00
Enrico Marconi
b9c01d990f fix issue #1059: Debug items should disappear when dropped 2021-04-09 13:46:43 +02:00
Marcel Märtens
1b38cfbd2d remove spamming of the logs 2021-04-08 23:55:13 +02:00
Imbris
fd30663156 Merge branch 'vfoulon80/behavior-component' into 'master' 
New Component: Behavior

See merge request veloren/veloren!2033
 2021-04-08 19:16:28 +00:00
Vincent Foulon
5809116afa Remove TRADE capability, use trade_site attribute instead 2021-04-08 19:06:57 +02:00
Vincent Foulon
7c4da6e501 Address comments 2021-04-08 18:33:00 +02:00
Louis Pearson
b80bc61eb8 Document Travel enum 2021-04-08 05:40:56 -06:00
Louis Pearson
a7c1a97dda Use distance_squared to speed up calculations 2021-04-08 05:10:22 -06:00
Louis Pearson
3bcdd06c87 Fix travellers stuck in town 
There was an off by one error in the code that negates the progress
along paths that are reversed.
 2021-04-08 05:10:04 -06:00
Louis Pearson
ee302607f0 Tries to implement npcs only travelling by paths 
Unfortunately, there's a degenerate case where npcs can get stuck in a
town. Not sure why
 2021-04-08 04:19:02 -06:00
Louis Pearson
1b3c52aecc Refine airship pathing 2021-04-08 04:19:02 -06:00
Louis Pearson
275296b15e Add CustomPath to Travel enum 
Defines a custom path to follow, instead of using one from the World.
Airships use this to slightly adjust their course to reduce collisions.
 2021-04-08 04:19:02 -06:00
Louis Pearson
3f488db523 Convert rtsim pathfinding logic to a FSM 2021-04-08 04:19:02 -06:00
Louis Pearson
3d000833a6 Resolve comments 2021-04-08 04:19:02 -06:00
Louis Pearson
dfad4f9a49 Expect instead of unwrap 2021-04-08 04:19:02 -06:00
Louis Pearson
91df480e4b Make rtsim entities ensure sanity of track 2021-04-08 04:19:02 -06:00
Louis Pearson
642dcf08b8 First pass at rtsim following paths 2021-04-08 04:19:02 -06:00
Vincent Foulon
8cb001e91b Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly 2021-04-07 22:02:57 +02:00
Vincent Foulon
e0da6aa572 Address comments 
- make Behavior's capabilities and state private
 - Typo in a comment
 - add basic tests

Apply 1 suggestion(s) to 1 file(s)

Remove comments in agent.rs
 2021-04-07 22:02:42 +02:00
Vincent Foulon
d3045ddff9 address mutability comment 2021-04-07 17:39:12 +02:00
Vincent Foulon
c33e73bbed use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
72d0067e5c Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
6c65e213c4 cleanup old code 2021-04-07 17:26:27 +02:00
Vincent Foulon
1aebb5a0e7 Change check for trading NPC 2021-04-07 17:26:19 +02:00
Vincent Foulon
822db0895c Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
ccf89c4275 Create Behavior component 2021-04-07 17:21:53 +02:00
Vincent Foulon
024e366126 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
Louis Pearson
a2fda31449 Add default world build AABB 2021-04-05 07:39:09 -06:00
Marcel
d7ed57ca7e Merge branch 'login-trim-username' into 'master' 
login trim username, improve validation, social ordering #1040

Closes #1040

See merge request veloren/veloren!2042
 2021-04-04 22:09:16 +00:00
DaforLynx
5ee9108e0d Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Sam
33503bd9c2 Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Sam
ed5cb2b5f0 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
e83a2eef3d Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
8d1700b882 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
01296ac816 Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
0a29d93164 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
25034a6a0b Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
f88fd5f349 Fixed trading 2021-04-02 23:04:26 -04:00
Sam
4cc4e3a158 Support for creature specific materails and materials having a quantity. 2021-04-02 23:04:25 -04:00
Sam
7846c6fdbf Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
Marcel
1add298f21 Merge branch 'vfoulon80/trading-dialogues' into 'master' 
Add dialogue when the Merchant is busy and randomize some trading dialogues

See merge request veloren/veloren!2038
 2021-04-01 18:08:44 +00:00
Vincent Foulon
ce5970c8c1 address review comments 2021-04-01 19:13:08 +02:00
aljazerzen
697d4a52d9 login trim username, improve validation, social ordering 2021-04-01 16:43:27 +02:00
aljazerzen
205e989350 after leaving group, issue warning instead of changing chat mode 2021-04-01 15:43:50 +02:00
aljazerzen
f7ba4148b3 after leaving a group, set chat mode to world 2021-04-01 15:43:05 +02:00
Vincent Foulon
b6ea31446f Add dialogue when the Merchant is busy and randomize some trading dialogues 2021-03-31 19:06:41 +02:00
Avi Weinstock
19ac0b2245 Allow fast stacking into and out of a trade with {ctrl,shift} click. 
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
 2021-03-30 18:39:10 -04:00
Marcel
b6481e759d Merge branch 'james/fix-merchant-wander' into 'master' 
Fix merchant wandering

See merge request veloren/veloren!2035
 2021-03-30 10:52:42 +00:00