Justin Shipsey
|
467174b0cc
|
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
|
2d71ca0f41
|
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
|
084acf6bf7
|
fit models, adjusted drop rates
|
2021-02-11 09:29:26 -05:00 |
|
Sarra
|
895679a128
|
tweaked a few things with the moth glider
|
2021-02-10 20:14:50 -05:00 |
|
Sarra
|
5942611db9
|
basic gliders
|
2021-02-10 19:02:36 -05:00 |
|
Sarra
|
331d9bf1c0
|
moth glider
|
2021-02-10 19:02:36 -05:00 |
|
Justin Shipsey
|
923c323ca1
|
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
|
22501ccf64
|
Rebase !1447 Chat input color and icon reflect channel message is sent to.
|
2021-02-10 19:42:59 +00:00 |
|
Ludvig Böklin
|
16921efb54
|
Add note about to_quat() being a cheap copy operation
|
2021-02-10 17:35:20 +01:00 |
|
Imbris
|
1504ca1846
|
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
|
93da46e1c1
|
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
|
47d877b888
|
Fix compile error under Windows
|
2021-02-10 03:38:01 +00:00 |
|
Joshua Barretto
|
e995932fe3
|
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
|
e5eab42a17
|
Crafting UI: sort items lexicographically by craftability and then alphabetically.
|
2021-02-09 19:30:54 -05:00 |
|
Snowram
|
c5481e6c83
|
Refactor, addresses more comments
|
2021-02-10 00:34:37 +01:00 |
|
Snowram
|
509a71bdc7
|
Adresses some comments, various visual tweaks
|
2021-02-10 00:30:23 +01:00 |
|
Snowram
|
17fe9519b3
|
Adds lights to dungeons
|
2021-02-10 00:30:23 +01:00 |
|
Samuel Keiffer
|
30a1299ce4
|
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
|
1d7ade770d
|
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
|
a120eaae36
|
Code quality
|
2021-02-09 14:06:27 +01:00 |
|
Ludvig Böklin
|
8e1bd2a5dc
|
Encourage migration towards using quaternion in animations
|
2021-02-09 13:52:44 +01:00 |
|
Ludvig Böklin
|
b151f88b63
|
Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot
|
2021-02-09 13:52:03 +01:00 |
|
Imbris
|
e80b2b1c6b
|
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
|
97153fc8e6
|
Changing main tool while in wield state moves character back to idle state.
|
2021-02-08 17:25:40 -05:00 |
|
Snowram
|
8944027eb1
|
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
|
357fb8ad79
|
Sarrakitty/small fixes
|
2021-02-08 20:37:24 +00:00 |
|
Sam
|
7e3ec94207
|
Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.
|
2021-02-08 13:55:50 -05:00 |
|
Sam
|
d6ffb1cea5
|
Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.
|
2021-02-08 12:31:17 -05:00 |
|
Sam
|
7289ee89fa
|
Server events directly emitted in states now.
|
2021-02-08 12:01:48 -05:00 |
|
Sam
|
45be7dd64d
|
Eradicated clones
|
2021-02-08 12:01:48 -05:00 |
|
Sam
|
a7e43b760f
|
Extended what states inventory manipulations touching the loadout could affect.
|
2021-02-08 12:01:47 -05:00 |
|
Sam
|
b7496b438f
|
Inventory changes that modify the loadout now go through a control action instead of a control event.
|
2021-02-08 12:01:47 -05:00 |
|
Forest Anderson
|
f6a0360521
|
Merge branch 'angel/add-github-mirror-action' into 'master'
Added Action that will mirror the Gitlab repo to Github
See merge request veloren/veloren!1763
|
2021-02-08 15:50:50 +00:00 |
|
Forest Anderson
|
1bcdef613e
|
Added Action that will mirror the Gitlab repo to Github
|
2021-02-08 09:55:43 -05:00 |
|
Samuel Keiffer
|
2abb4ac472
|
Merge branch 'swilliams/mindflayer-loot-table' into 'master'
Made Mindflayer drops exclusive to the Mindflayer.
See merge request veloren/veloren!1762
|
2021-02-07 19:04:20 +00: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 |
|
Ludvig Böklin
|
569234351b
|
Add Plane type, Projection trait, fix upright() and add doc tests
|
2021-02-07 17:16:15 +01:00 |
|
Imbris
|
61a02c5527
|
Update native_dialog to 0.5.2
|
2021-02-07 00:48:57 -05:00 |
|
Samuel Keiffer
|
b9dc561199
|
Merge branch 'sam/fix-roll' into 'master'
Fixes roll being free
See merge request veloren/veloren!1757
|
2021-02-06 22:15:06 +00:00 |
|
Imbris
|
af7f21729f
|
Merge branch 'trollderim/replace-magic-dr-number' into 'master'
Replace magic dr constant
Closes #915
See merge request veloren/veloren!1756
|
2021-02-06 20:28:40 +00:00 |
|
Sam
|
a4696e5c6f
|
Roll is no longer free.
|
2021-02-06 15:20:08 -05:00 |
|
Phillipp Mevenkamp
|
e56c6ecc6a
|
Replace magic dr constant
|
2021-02-06 18:21:58 +01:00 |
|
Imbris
|
110f8f3b9b
|
Merge branch 'james/agent-to-server' into 'master'
Move agent system to server
See merge request veloren/veloren!1750
|
2021-02-06 06:15:25 +00:00 |
|
James Melkonian
|
4d4c6d8b13
|
Move agent system to server
|
2021-02-06 06:15:25 +00:00 |
|
Ludvig Böklin
|
a888cd00d5
|
Redefine Ori as a quaternion
|
2021-02-05 09:33:14 +01:00 |
|
Imbris
|
500659504d
|
Merge branch 'character_ability_refactor' into 'master'
rel: #938 - Replaces fields in CharacterAbility enum that are integers with a float
See merge request veloren/veloren!1752
|
2021-02-05 01:39:12 +00:00 |
|
Pascal Fuhrmann
|
7e99de8017
|
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
|
2021-02-05 01:39:12 +00:00 |
|
Imbris
|
c9713c1327
|
Merge branch 'imbris/fix-test-server' into 'master'
Fix test server
See merge request veloren/veloren!1754
|
2021-02-04 06:23:09 +00:00 |
|
Imbris
|
36f7ac900e
|
fix test server
|
2021-02-04 00:18:46 -05:00 |
|
Samuel Keiffer
|
d3de145401
|
Merge branch 'azymohliad/update-uk' into 'master'
Update Ukrainian translation
See merge request veloren/veloren!1749
|
2021-02-03 16:18:50 +00:00 |
|