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,671 Commits 151 Branches 18 Tags 2.1 GiB
952a77f94d
Commit Graph

6671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ada Lovegirls
06575f601e Merge branch 'master' into 'ada/improve-controller-bindings' 
# Conflicts:
#   CHANGELOG.md
 2021-02-16 15:30:46 +00:00
Joshua Barretto
82fe46ddb6 Merge branch 'synis/fix-underwater-campfires' into 'master' 
Synis/fix underwater campfires

See merge request veloren/veloren!1783
 2021-02-16 14:59:04 +00:00
Synis
2e4cf7cc4e Added changelog entry 2021-02-16 13:26:40 +01:00
Synis
a29ce3c428 Waypoints are no longer placed underwater 2021-02-16 13:23:12 +01:00
Joshua Barretto
bf9dbee14a Merge branch 'Quibble/boss-stairs-fix' into 'master' 
Fix #689 - dungeon without stairs to boss floor

Closes #689

See merge request veloren/veloren!1781
 2021-02-16 02:59:05 +00:00
Samuel Keiffer
d1ed85e751 Merge branch 'aweinstock/item-tags' into 'master' 
Implement tags for items, allowing a crafting recipe to take any item with that tag as input.

See merge request veloren/veloren!1778
 2021-02-16 01:05:54 +00:00
Avi Weinstock
03d28f7d93 Implement tags for items, allowing a crafting recipe to take any item with that tag as input. 
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
 2021-02-16 01:05:54 +00:00
Lippy13
b64fc5e822 Fix #689 - dungeon without stairs to boss floor 2021-02-16 00:54:44 +00:00
Ludvig Böklin
0f1227ca7d Use nlerp for interpolating rotations in animation 2021-02-15 11:01:59 +01:00
AdaLovegirls
390812f54e Improve controller keybindings 2021-02-14 21:31:31 -06:00
Imbris
0da363e420 Merge branch 'aweinstock/trade-implementation' into 'master' 
Aweinstock/trade implementation

See merge request veloren/veloren!1775
 2021-02-14 19:16:52 +00:00
Avi Weinstock
c984035976 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
Avi Weinstock
232ddb0860 Polish trading implementation and address review comments. 
- Fix item swapping edge case
- Document more assumptions/edge cases
- fmt and clippy
- s/ServerGeneral::GroupInvite/ServerGeneral::Invite/
- Use `Client::current` in `Client::is_dead`
 2021-02-14 11:11:35 -05:00
Joshua Barretto
8ece00d6c6 Merge branch 'snowram/fix-staicases-lights' into 'master' 
Fixes lights positions and orientations in staircases

See merge request veloren/veloren!1776
 2021-02-14 01:17:53 +00:00
Snowram
f1f6a12718 Fixes lights positions and orientations in staircases 2021-02-13 22:27:37 +01:00
Ludvig Böklin
84990553e0 Use Ori for base rotation matrix 2021-02-13 11:02:50 +01:00
Avi Weinstock
f6db8bb7c4 Implement actual inventory-manipulation part of trading server side. 2021-02-12 18:43:10 -05:00
Avi Weinstock
abb5684883 Trade implementation progress. 
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
 2021-02-12 18:43:10 -05:00
Avi Weinstock
e2b55e0706 Implement enough of a trade UI that dragging & dropping items into it round-trips between clients. 2021-02-12 18:43:09 -05:00
Avi Weinstock
aeb2398fc6 Trade implementation progress. 
- Server messages now bring up the trade window.
- When a trade is declined, it closes the window on both clients.
 2021-02-12 18:43:09 -05:00
Avi Weinstock
ae528124fc Trade implementation progress. 
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
 2021-02-12 18:43:09 -05:00
Avi Weinstock
e9b811b62b Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Avi Weinstock
250391656f Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key). 2021-02-12 18:43:09 -05:00
Snowram
e54602c752 Merge branch 'Sarrakitty/gliders' into 'master' 
Sarrakitty/gliders

See merge request veloren/veloren!1771
 2021-02-12 09:49:53 +00:00
Justin Shipsey
97ca792b3a Merge branch 'DaforLynx/crickets' into 'master' 
Makes crickect sfx more realistic, more varied, and temperature-based.

See merge request veloren/veloren!1773
 2021-02-12 00:54:43 +00:00
DaforLynx
ebbb06a400 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
Sarra
8ac23ffcc2 fit models, adjusted drop rates 2021-02-11 09:29:26 -05:00
Sarra
7c23f97d89 tweaked a few things with the moth glider 2021-02-10 20:14:50 -05:00
Sarra
14b344469a basic gliders 2021-02-10 19:02:36 -05:00
Sarra
0511563e35 moth glider 2021-02-10 19:02:36 -05:00
Justin Shipsey
44a9d8dc71 Merge branch 'nward/chat-input-color-icon-rebased' into 'master' 
Rebase  !1447  Chat input color and icon reflect channel message is sent to.

See merge request veloren/veloren!1769
 2021-02-10 19:42:59 +00:00
Quellus
63952875d9 Rebase !1447 Chat input color and icon reflect channel message is sent to. 2021-02-10 19:42:59 +00:00
Ludvig Böklin
74badd3dbd Add note about to_quat() being a cheap copy operation 2021-02-10 17:35:20 +01:00
Imbris
5b35757538 Merge branch 'Quibble/win-compile-fix' into 'master' 
Fix compile error under Windows

See merge request veloren/veloren!1770
 2021-02-10 05:52:56 +00:00
Imbris
3e98e18c46 Merge branch 'aweinstock/sort-crafting' into 'master' 
Crafting UI: sort items lexicographically by craftability and then alphabetically.

See merge request veloren/veloren!1767
 2021-02-10 04:04:42 +00:00
Lippy13
23d2a7ca10 Fix compile error under Windows 2021-02-10 03:38:01 +00:00
Joshua Barretto
f2660ef5f9 Merge branch 'snowram/dungeon-lights' into 'master' 
Adds lights to dungeons

See merge request veloren/veloren!1759
 2021-02-10 02:01:46 +00:00
Avi Weinstock
5d0c18efeb Crafting UI: sort items lexicographically by craftability and then alphabetically. 2021-02-09 19:30:54 -05:00
Snowram
6ac52daeae Refactor, addresses more comments 2021-02-10 00:34:37 +01:00
Snowram
477bdfdfe7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
Snowram
02f446fe4b Adds lights to dungeons 2021-02-10 00:30:23 +01:00
Samuel Keiffer
155feb8e8a Merge branch 'sam/better-inventory-loadout-swapping' into 'master' 
Restricts when players can change their loadout to non-attack states

See merge request veloren/veloren!1761
 2021-02-09 18:23:55 +00:00
Ludvig Böklin
990198cd87 Don't test Dir->Ori correctness because it will fail from floating point errors 2021-02-09 15:44:12 +01:00
Ludvig Böklin
065e260e78 Code quality 2021-02-09 14:06:27 +01:00
Ludvig Böklin
fa78674840 Encourage migration towards using quaternion in animations 2021-02-09 13:52:44 +01:00
Ludvig Böklin
582ddfc3cd Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot 2021-02-09 13:52:03 +01:00
Imbris
70cc4ebd8f Merge branch 'update-native-dialog' into 'master' 
Update native_dialog to 0.5.2

See merge request veloren/veloren!1760
 2021-02-09 00:30:38 +00:00
Sam
398fcf7bdd Changing main tool while in wield state moves character back to idle state. 2021-02-08 17:25:40 -05:00
Snowram
05fe99d7cf Merge branch 'Sarrakitty/Small_fixes' into 'master' 
Sarrakitty/small fixes

See merge request veloren/veloren!1764
 2021-02-08 20:37:24 +00:00
Sarra Kitty
a956dad360 Sarrakitty/small fixes 2021-02-08 20:37:24 +00:00