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

255 Commits

Author SHA1 Message Date
ccgauche
384e731bd0 Update CHANGELOG.md 2021-03-02 09:46:08 +00:00
ccgauche
2bb54137a0 Merge branch 'master' into 'ccgauche/plugin-player-join-event' 
# Conflicts:
#   CHANGELOG.md
 2021-03-02 09:45:15 +00:00
Jesus Bracho
6b1ba22d1f Implement stacking and splitting 2021-03-02 00:08:46 +00:00
ccgauche
612a507bc6 Updated CI + Changelog 2021-03-01 19:28:27 +01:00
Avi Weinstock
1831efd8e4 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
Monty Marz
7d366aa09a reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button 2021-02-27 19:02:26 +00:00
jshipsey
77c89d732b weapon/manifest tweaks 2021-02-27 10:44:55 -05:00
Sarra
07f34e11f9 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
ccgauche
4bd02c9a03 Change invalid message in examples and cleanup 
Updated changelog + Removed hello plugin from plugins folder
 2021-02-23 00:02:58 +01:00
Joshua Barretto
56bf0f6af0 Merge branch 'humanoid_ai_glide_when_falling' into 'master' 
FIX #956: Humanoid ai glide when falling

See merge request veloren/veloren!1772
 2021-02-22 00:57:25 +00:00
Overblob
4024f2d7e1 CI - Fix clippy errors 
Fix trailing whitspace
 2021-02-22 00:57:25 +00:00
Sam
b0c26317b5 Added functionality for buffs queueing. Saturation now queues. 2021-02-20 17:13:17 -05:00
Avi Weinstock
44db4199b0 Implement persistence for modular weapons. 
This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search.

Squahed fixes:

- Fix some constraint violations that occurred when swapping inventory items.
- Comment out recipes for modular weapons.
- Make update_item_at_slot_using_persistence_key and is_modular more idiomatic.
- Add changelog entry.
- Document `defer_foreign_keys` usage.
 2021-02-20 14:31:46 -05:00
Snowram
9a02777d22 Allows some species to be immune to specific buffs 2021-02-20 14:03:15 +00:00
Avi Weinstock
d44565d6cc Client-side trade improvements. 
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
 2021-02-19 15:20:27 -05:00
Marcel
0f633e7b7c Merge branch 'xMAC94x/network_tokio' into 'master' 
xMAC94x/network_tokio switch from `async_std` to `tokio`

See merge request veloren/veloren!1789
 2021-02-17 22:47:11 +00:00
Ada Lovegirls
540635ed99 Fixed missing controller actions 
(cherry picked from commit 2ef5fb90e89bf3f8f0acc84e269f6948c696c196)
 2021-02-17 21:10:14 +00:00
Marcel Märtens
048fcf88f8 Stabelize Network again: 
- completly switch to Bytes, even in api. speed up TCP by fak 2
 - improve benchmarks
 - speed up mpsc metrics
 - gracefully handle shutdown by interpreting Ok(0) as tokio::tcpstream closed now.
 - fix hotloop in participants by adding `Some(n)` to fix endless handing.
 - fix closing bug by closing streams after `recv_mgr` is shutdown even if now shutdown is triggered locally.
 - fix prometheus
 - no longer throw when a `Stream` is dropped while participant still receives a msg for it.
 - fix the bandwith handling, TCP network send speed is up to 1.5GiB/s while recv is 150MiB/s
 - add documentation
 - tmp require rt-multi-threaded in client for tokio, to not fail cargo check

this is prob stable, i tested over 1 hour.
after that some optimisations in priomgr.
and impl. propper bandwith.
Speed is up to 2GB/s write and 150MB/s recv on a single core

sync add documentation
 2021-02-17 19:37:48 +01:00
Ada Lovegirls
483bd4aaca Merge branch 'master' into 'ada/improve-controller-bindings' 
# Conflicts:
#   CHANGELOG.md
 2021-02-16 15:30:46 +00:00
Synis
c5b934725a Added changelog entry 2021-02-16 13:26:40 +01:00
Lippy13
4a96334b4f Fix #689 - dungeon without stairs to boss floor 2021-02-16 00:54:44 +00:00
AdaLovegirls
68d557dbd4 Improve controller keybindings 2021-02-14 21:31:31 -06:00
Avi Weinstock
f86f22f0e8 MR 1775 review fixes. 
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
 2021-02-14 11:13:56 -05:00
Snowram
c5481e6c83 Refactor, addresses more comments 2021-02-10 00:34:37 +01:00
Scott Williams
0799d7fd1f Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops. 2021-02-07 19:04:20 +00:00
James Melkonian
8951e427e4 Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Joshua Barretto
60276ddcb5 Added snow particles 2021-01-31 15:15:17 +00:00
jiminycrick
b689226173 Add migration for starter gear 2021-01-28 17:22:39 -08:00
Scott Williams
3adb9f9f03 All gems make a sound. 2021-01-25 22:53:23 +00:00
Snowram
fd17d10f06 Merge branch 'swilliams/gems' into 'master' 
Adds 6 different gems and removes shiny gem.

See merge request veloren/veloren!1729
 2021-01-25 01:25:40 +00:00
Samuel Keiffer
f183f52b91 Merge branch 'lboklin/glider-stamina' into 'master' 
Glider stamina cost now only when first starting to glide based on fall speed

See merge request veloren/veloren!1727
 2021-01-25 00:17:32 +00:00
Scott Williams
6fb816f71c Added to changelog. 2021-01-24 16:52:56 +00:00
Ludvig Böklin
712baf9c33 Glider stamina only costs on deploy 2021-01-24 10:56:35 +01:00
Scott Williams
c7700f4caf General NPC Hitbox Adjustments 2021-01-24 04:00:57 +00:00
Scott Williams
32eca9b0a5 Swilliams/golem hitbox fix 2021-01-22 16:30:35 +00:00
Sam
db59547de9 Golems are now lactose tolerant. 2021-01-20 11:54:57 -05:00
jiminycrick
18b981bd45 More footstep sfx based on distance 2021-01-19 19:51:19 -08:00
jiminycrick
6ac42b3a61 Make only humanoid agents attempt to roll 2021-01-19 10:42:46 -08:00
Sam
39ed979510 Added command to give yourself skill points. 
adjusted social window

Changelog
 2021-01-19 08:07:49 -05:00
Scott Williams
8f5c3e3d0c Changed default option to false for smooth_pan_enable. 2021-01-08 21:08:57 +00:00
Ben Wallis
8661cb1ffc Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
ccgauche
4874635465 Updated changelog 2021-01-08 16:34:26 +01:00
Imbris
35ef4af4f6 Move to WindowEvent from DeviceEvent for zooming 2021-01-08 01:38:33 -05:00
ubruntu
97f89a11f0 Reduced downward fall of birds, Humanoid travelers no longer visit dungeons, birds only travel between dungeons 2021-01-05 01:04:01 +00:00
Vincent Foulon
89ca98c780 Update Changelog 2020-12-31 12:32:21 +01:00
Frinksy
fd554827a0 fixing #881 
- Multiple buffs make the UI icons flicker
 2020-12-22 15:40:57 +00:00
Justin Shipsey
0df66ff6d0 Merge branch 'gliding-energy-cost' into 'master' 
Glider mid-air deploy and gliding energy-cost

See merge request veloren/veloren!1626
 2020-12-18 21:18:32 +00:00
Ludvig Böklin
ec35d5d75e Glider mid-air deploy and gliding energy-cost 2020-12-18 19:16:06 +01:00
Adam Blanchet
e3b9de37fb working towards #861 - 
Use scancodes for (at minimum) key remapping

added ScanCode fallback for when winit doesn't provide a VirtualKeyCode

renamed SKey to ScanKey
 2020-12-18 10:01:30 +01:00
Benoît du Garreau
bd962ce2ab Update CHANGELOG 2020-12-17 12:06:24 +01:00