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

1427 Commits

Author SHA1 Message Date
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
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
Marcel
5e9bd564da Merge branch 'xMAC94x/terrainoptimisation' into 'master' 
if more than 1 player is in the area of a newly created chunk, skip additional copies

See merge request veloren/veloren!2030
 2021-03-30 08:27:13 +00:00
James Melkonian
c91a2e0d28 Fixed merchant wandering 2021-03-29 17:27:56 -07:00
Samuel Keiffer
c978386d40 Merge branch 'sam/mindflayer-balancing' into 'master' 
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
 2021-03-29 21:05:49 +00:00
Vincent Foulon
c4eca42fd8 Implement a basic dialogue system 2021-03-29 14:47:42 +00:00
Sam
d17edfcd64 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Marcel Märtens
06951048eb if more than 1 player is in the area of a newly created chunk, skip additional copies 2021-03-29 12:21:07 +02:00
Snowram
a1067a2ddb Merge branch 'snowram/new-scepters-starves' into 'master' 
Add new batch of starves and scepter (by Gemu)

See merge request veloren/veloren!2022
 2021-03-29 00:08:19 +00:00
Snowram
4b95401f7c Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Marcel Märtens
063d57b60c make msg::terrain parallel via rayon, we parallelize over the number of clients, so this is a change servers with more than 1 player profit from. 2021-03-28 21:08:40 +02:00
Treeco
bf155b1407 Move common code out into function 2021-03-28 18:22:47 +01:00
Treeco
2922b00c11 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Treeco
d47739c0c9 Added command to teleport to sites by name 2021-03-28 17:02:17 +01:00
Treeco
6d9a7e8fb3 Added spawn_town server setting 2021-03-28 17:02:17 +01:00
Joshua Barretto
fa1fee430b Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Treeco
e88f66f92e Temporarily disable humanoid rtsim entities until their pathfinding is fixed 2021-03-28 14:49:40 +01:00
Sam
8c91749cf8 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
Sam
20989428d3 Balance tweaks 2021-03-27 21:05:15 -04:00