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

9961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
7983c75911 Allowed specifying that rtsim entities spawn at a particular site. 2021-09-03 23:34:24 -04:00
juliancoffee
182d3c4815 Workaround of bug with global Player component 
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
 2021-09-04 02:29:02 +03:00
Marcel
663fe0fdbc Merge branch 'xMAC94x/fix_macos' into 'master' 
disable mumble-link on macos

See merge request veloren/veloren!2804
 2021-09-03 23:25:40 +00:00
juliancoffee
c87905305d Improve UX of /battlemode 2021-09-04 01:41:48 +03:00
juliancoffee
91539a3b67 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03:00
juliancoffee
df066f364a Cooldowns 
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
 2021-09-04 01:41:48 +03:00
Marcel Märtens
5357ec43d6 disable mumble-link on macos 2021-09-04 00:32:16 +02:00
juliancoffee
b96de1adf7 Fix town detection 2021-09-03 17:28:34 +03:00
juliancoffee
6c1095884a Make it compile without feature(worldgen) 
+ move settings check to toggling mode segment
 2021-09-03 17:28:34 +03:00
juliancoffee
deacec94d7 Allow changing mode only with enabled settings 
- send warning in force mode
 2021-09-03 17:28:34 +03:00
juliancoffee
d43f34aea8 Allow changing battle_mode only in towns 2021-09-03 17:28:34 +03:00
juliancoffee
7be1c4d14a Deduplicate pvp-checks 2021-09-03 17:28:34 +03:00
juliancoffee
1cedaa4417 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
e5e3349fb6 Add PerPlayer server flag for BattleMode 2021-09-03 17:28:34 +03:00
juliancoffee
4709855465 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00
Samuel Keiffer
ca7ecfd0e8 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
a9be3b77db Removed ability to 'droideka' through dungeons. 2021-09-02 19:48:30 -04:00
Sam
c9746240ff Recover section no longer has 0 movement. 2021-09-02 19:27:07 -04:00
Marcel
a8c1d01a69 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
c2d45efe22 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
3697cdd6bf Nerf coin drop from enemies 2021-09-03 01:15:27 +03:00
juliancoffee
8788896e9c 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
29d91cdd6a 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
a7e08abec6 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
91931c5072 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
71604e0f6d switch to SharedLink and unset context 2021-09-02 12:29:01 +02:00
Justin Shipsey
63ade1ee58 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
a7fd04caf3 Small loot rebalance. 2021-09-01 23:50:17 -04:00
Samuel Keiffer
36c59fcc31 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
5072708123 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Marcel
b70fc67099 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
3b8af8dfa2 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
99b5631d9d Turn towards center of sprite instead of corner. 2021-09-01 17:24:09 -04:00
juliancoffee
2f6d029d44 (en) i18n cleaning 2021-09-01 19:38:59 +03:00
Joshua Barretto
418b9928bd 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
1c61153b81 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
71f30d7b68 Tree trunk color differences 2021-09-01 12:49:35 +01:00
Joshua Barretto
2081c20a88 Improved tree hanging and cedar distribution 2021-09-01 12:09:15 +01:00
Joshua Barretto
4b7fc1f4bb Made ore streams mineable 2021-09-01 12:05:00 +01:00
Marcel
ca518c15c5 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
ae0be40dd5 Make parrying refund the block stamina cost and cancel the recover animation 2021-08-31 23:46:33 -07:00
Imbris
0b922deed6 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
0476f9ce0b
Replace shaderc with naga 2021-08-31 22:53:10 +01:00
Joshua Barretto
33db9281e6 Merge branch 'sam/sprite-interaction' into 'master' 
Sprite Interaction

See merge request veloren/veloren!2790
 2021-08-31 18:42:16 +00:00
Sam
8bc237142a 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
f1a9f5cfed 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
689c69b8fc 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
6d27b6eeea No longer send collect inventory event if interactable sprite kind cannot be found. 2021-08-31 13:37:56 -04:00
Sam
c8459dbdcb 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
878bea8091 Fixed interaction to work underwater. 2021-08-31 13:37:55 -04:00