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,700 Commits 151 Branches 18 Tags 2.1 GiB
338e81de10
Commit Graph

9700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
juliancoffee
338e81de10 Deduplicate pvp-checks 2021-09-03 17:28:34 +03:00
juliancoffee
2e79c61123 Implement /battlemode_force command 
+ add placeholder for /battlemode command (currently can only show your
  battle mode)
 2021-09-03 17:28:34 +03:00
juliancoffee
f01309dfc2 Add PerPlayer server flag for BattleMode 2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00
Samuel Keiffer
0dcfe2721b Merge branch 'sam/fix-discontinuous-roll' into 'master' 
Fix roll

See merge request veloren/veloren!2805
 2021-09-03 00:33:34 +00:00
Sam
0a3b541940 Removed ability to 'droideka' through dungeons. 2021-09-02 19:48:30 -04:00
Sam
5f08089bd9 Recover section no longer has 0 movement. 2021-09-02 19:27:07 -04:00
Marcel
815ed547ff Merge branch 'juliancoffee/asset_override' into 'master' 
Add support for override asset folder

See merge request veloren/veloren!2802
 2021-09-02 23:12:41 +00:00
Samuel Keiffer
7295204227 Merge branch 'juliancoffee/dungeon_chests' into 'master' 
Rebalance chest density in dungeons

See merge request veloren/veloren!2803
 2021-09-02 22:58:33 +00:00
juliancoffee
f88373f7d8 Nerf coin drop from enemies 2021-09-03 01:15:27 +03:00
juliancoffee
38493b615b Rebalance chest density in dungeons 
- Make it depend on relative floor and not absolute floor to keep it the
  same through different dungeons.
- Make it start around the middle of dungeon to avoid chest only runs.
 2021-09-03 01:08:15 +03:00
juliancoffee
6c1ecc9766 Add support for override asset folder 
- ASSETS_OVERRIDE environment variable with asset path which has higher
  priority.
 2021-09-02 20:24:23 +03:00
Marcel
970d57f905 Merge branch 'juliancoffee/skill_boost_rework' into 'master' 
ECS & Diary info synchronization

See merge request veloren/veloren!2771
 2021-09-02 16:04:23 +00:00
Marcel
4291fe9e13 Merge branch 'xMAC94x/mumble_api' into 'master' 
mumble positional audio support via mumble-link

See merge request veloren/veloren!2788
 2021-09-02 11:40:35 +00:00
Marcel Märtens
cf1a6b1806 switch to SharedLink and unset context 2021-09-02 12:29:01 +02:00
Justin Shipsey
a00c0d4c0d Merge branch 'sam/loot' into 'master' 
Small dungeon loot rebalance.

See merge request veloren/veloren!2801
 2021-09-02 05:34:19 +00:00
Sam
daf287a469 Small loot rebalance. 2021-09-01 23:50:17 -04:00
Samuel Keiffer
a733ad00e6 Merge branch 'ubruntu/sometimes-drop-nothing' into 'master' 
NPCs can drop nothing

See merge request veloren/veloren!2794
 2021-09-01 23:17:36 +00:00
ubruntu
bbc366e1b3 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Marcel
ad5cb064e2 Merge branch 'juliancoffee/i18n_formatting' into 'master' 
(en) i18n cleaning

See merge request veloren/veloren!2798
 2021-09-01 22:47:36 +00:00
Joshua Barretto
a193620375 Merge branch 'sam/center' into 'master' 
Turn towards center of sprite instead of corner.

See merge request veloren/veloren!2800
 2021-09-01 22:25:29 +00:00
Sam
41a385c517 Turn towards center of sprite instead of corner. 2021-09-01 17:24:09 -04:00
juliancoffee
f157f8efca (en) i18n cleaning 2021-09-01 19:38:59 +03:00
Joshua Barretto
82886dcd3f Merge branch 'zesterer/tiny-fixes' into 'master' 
Worldgen hotfix

See merge request veloren/veloren!2797
 2021-09-01 12:47:50 +00:00
Samuel Keiffer
ba2b26dfa3 Merge branch 'knightresspaladin/block-tweaks' into 'master' 
Make parrying refund the block stamina cost and cancel the recover animation

See merge request veloren/veloren!2792
 2021-09-01 11:50:49 +00:00
Joshua Barretto
002cd03430 Tree trunk color differences 2021-09-01 12:49:35 +01:00
Joshua Barretto
71826bccae Improved tree hanging and cedar distribution 2021-09-01 12:09:15 +01:00
Joshua Barretto
1b0cb40d94 Made ore streams mineable 2021-09-01 12:05:00 +01:00
Marcel
f4af2e2589 Merge branch 'xMAC94x/CodeOfConduct' into 'master' 
add smaller variant of the code of conduct and include feedback

See merge request veloren/veloren!2701
 2021-09-01 10:03:00 +00:00
Knightress Paladin
f49dc2191d Make parrying refund the block stamina cost and cancel the recover animation 2021-08-31 23:46:33 -07:00
Imbris
16e2550e46 Merge branch 'capucho/naga' into 'master' 
Replace shaderc with naga

See merge request veloren/veloren!2749
 2021-08-31 22:38:17 +00:00
João Capucho
446d93dda0
Replace shaderc with naga 2021-08-31 22:53:10 +01:00
Joshua Barretto
70b3374705 Merge branch 'sam/sprite-interaction' into 'master' 
Sprite Interaction

See merge request veloren/veloren!2790
 2021-08-31 18:42:16 +00:00
Sam
156820cd5c Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite. 2021-08-31 13:57:17 -04:00
Sam
5dbc05730d Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement. 2021-08-31 13:37:57 -04:00
Sam
f986176604 Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection. 2021-08-31 13:37:56 -04:00
Sam
2a3cc3d35a No longer send collect inventory event if interactable sprite kind cannot be found. 2021-08-31 13:37:56 -04:00
Sam
c66e1b3a56 Removed distance check from sprite colelction event handling as it is already checked when entering state. 2021-08-31 13:37:56 -04:00
Sam
6b71133c50 Fixed interaction to work underwater. 2021-08-31 13:37:55 -04:00
Sam
13fa154e55 Changelog and added arm length (body radius) to sprite pickup range. 2021-08-31 13:37:53 -04:00
Sam
6d91bae44b Sprite interaction now uses pathfinding to check that it can be picked up. 2021-08-31 13:37:36 -04:00
Sam
28d23c89ed Added simple distance check for sprite interaction. 2021-08-31 13:37:36 -04:00
Sam
9e5744f3ee Entities will now attempt to orient towards the sprite they are interacting with. 2021-08-31 13:37:36 -04:00
jshipsey
42a0dd785b finished anim 2021-08-31 13:37:35 -04:00
Sam
44c3b0f153 Added attack hook event, attacks now cancel item use and sprite interaction. 2021-08-31 13:37:32 -04:00
Sam
513982ca43 Fixed compile error when importing sprite position. 2021-08-31 13:36:05 -04:00
jshipsey
3ddcde645f anim basics 2021-08-31 13:36:04 -04:00
Sam
538cb56b87 Sprites now go through a character state to be picked up. 2021-08-31 13:36:04 -04:00
Joshua Barretto
171e329609 Merge branch 'xvar/fix-egui-toggle' into 'master' 
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled

See merge request veloren/veloren!2793
 2021-08-31 17:07:13 +00:00
Ben Wallis
ad079377fb Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled 2021-08-31 17:21:13 +01:00