Ben Wallis
|
0f7ff21c20
|
Merge branch 'item-stacking-and-splitting' into 'master'
Implement stacking and splitting
Closes #904
See merge request veloren/veloren!1802
|
2021-03-02 00:08:47 +00:00 |
|
Jesus Bracho
|
c0573cca44
|
Implement stacking and splitting
|
2021-03-02 00:08:46 +00:00 |
|
ccgauche
|
db9991ce6d
|
Adressed all comments
|
2021-03-01 22:24:02 +01:00 |
|
heydabop
|
bfc82f7236
|
Fixes #974 - convert tool/weapon equip time to floating point seconds
|
2021-03-01 15:06:39 -06:00 |
|
ccgauche
|
9628dfaf99
|
Fixed comments
|
2021-03-01 21:29:18 +01:00 |
|
ccgauche
|
dbd4d70b79
|
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
|
2021-03-01 19:00:44 +01:00 |
|
Sam
|
f304fe0f10
|
Fix a few asset paths for armors.
|
2021-03-01 00:58:43 -05:00 |
|
Samuel Keiffer
|
0497a437a4
|
Merge branch 'sam/invulnerability-buff' into 'master'
Invulnerability Buff
Closes #965
See merge request veloren/veloren!1834
|
2021-03-01 05:46:46 +00:00 |
|
Sam
|
7e34f1225f
|
Migration for armor re-organization.
|
2021-03-01 00:42:35 -05:00 |
|
jshipsey
|
8944115f8e
|
more asset organization
|
2021-02-28 22:18:43 -05:00 |
|
Samuel Keiffer
|
537efdd47e
|
Merge branch 'aweinstock/trade-requestitem' into 'master'
During a trade, allow requesting items from the counterparty's inventory...
See merge request veloren/veloren!1829
|
2021-03-01 02:39:36 +00:00 |
|
Sam
|
d09baadab2
|
Added command: '/safezone'
|
2021-02-28 18:14:59 -05:00 |
|
Sam
|
a88ad7b971
|
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
|
2021-02-28 15:02:03 -05:00 |
|
Samuel Keiffer
|
7a62cbbafc
|
Merge branch 'sam/fix-roll-combo' into 'master'
Fixes being stuck in roll when interrupting combo melee.
See merge request veloren/veloren!1831
|
2021-02-28 18:02:01 +00:00 |
|
Avi Weinstock
|
7e458ecd40
|
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
|
2021-02-28 10:13:49 -05:00 |
|
Sam
|
d818ea2f1d
|
Fixes being stuck in roll when interrupting combo melee.
|
2021-02-28 08:50:33 -05:00 |
|
Sam
|
50c47ce84d
|
Made changes to fix torvus
|
2021-02-27 22:42:11 -05:00 |
|
Samuel Keiffer
|
cb267ac3ee
|
Merge branch 'sam/combo-comp' into 'master'
Combo now persists as a compnent, rather than a field on a state
See merge request veloren/veloren!1828
|
2021-02-28 02:42:40 +00:00 |
|
Joshua Barretto
|
b9b36e0bf5
|
Merge branch 'zesterer-master-patch-28400' into 'master'
Fix jump routes not being pathed
See merge request veloren/veloren!1706
|
2021-02-28 00:41:38 +00:00 |
|
Sam
|
b25a376995
|
Re-allowed for what stage you were on to persist through a roll
|
2021-02-27 19:24:18 -05:00 |
|
Sam
|
404c7f0905
|
Combo melee now checks combo
|
2021-02-27 18:24:28 -05:00 |
|
Joshua Barretto
|
6051c06462
|
fmt
|
2021-02-27 23:21:01 +00:00 |
|
Sam
|
f24433c8cf
|
Added combo component
|
2021-02-27 14:55:06 -05:00 |
|
Sam
|
238fcaf5f1
|
Particle rebase fixes
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
8d316aac8c
|
feedback adjustments
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
0a353576dc
|
address comments
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
17112926e7
|
Adds harvester npc
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
51bc74b2a5
|
visual weapon variation, adjust minotaur dash, keyframed golem quake
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
16a44cd532
|
minotaur moves, added claygolem
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
417f4638ed
|
balance pass 2
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
79ec9115f5
|
rebase, yeti in dungeon
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
e06ebf3507
|
initial balance
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
858fbe1a6c
|
Adds yeti npc
|
2021-02-27 01:42:46 -05:00 |
|
Snowram
|
1b9815dc34
|
Adds 3 new npcs, tusk ram new design
|
2021-02-27 01:42:46 -05:00 |
|
Sam
|
53b0ba286a
|
Ice particles for Wendigo
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
ce3b2141e1
|
theropod retrofit, some more moves
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
5792faa992
|
some new moves, combine biped weapons into one file
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
57d5e90ddd
|
full bipedsmall armor swaps
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
cb59c8017e
|
anim tweaks, more loadout setup
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
aa4237b019
|
BL improvements, various fixes
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
e4e25e20c9
|
rebase
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
ca3248cc93
|
new dungeon setups, new npcs, weapon specific loadouts, anims
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
ac16a8900d
|
bow
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
66664f3f89
|
the stabs
|
2021-02-27 01:42:45 -05:00 |
|
unknown
|
559ece5ede
|
More npcs work
|
2021-02-27 01:42:45 -05:00 |
|
unknown
|
6f18d16aa2
|
Add new quadmeds npcs with rough offsets
|
2021-02-27 01:42:44 -05:00 |
|
Snowram
|
f48fea57f4
|
Sahagin, Adlet npcs
|
2021-02-27 01:42:43 -05:00 |
|
jshipsey
|
7cf723bb9d
|
gnome
|
2021-02-27 01:42:43 -05:00 |
|
jshipsey
|
266986626d
|
biped_small setup
|
2021-02-27 01:42:43 -05:00 |
|
Samuel Keiffer
|
a99a78abdb
|
Merge branch 'sam/improve-aura-buffs' into 'master'
Auras now apply a buff only once, instead of applying a buff every second.
See merge request veloren/veloren!1824
|
2021-02-27 03:21:47 +00:00 |
|
Snowram
|
1172c2f2c3
|
Merge branch 'Sarrakitty/OceanFlora' into 'master'
added coral reefs, kelp forests, and seagrass
See merge request veloren/veloren!1819
|
2021-02-27 01:52:33 +00:00 |
|
Sam
|
64a809ee5b
|
Made comments more descriptive
|
2021-02-26 18:15:24 -05:00 |
|
Sam
|
45dd36be07
|
Auras now apply a buff only once, instead of applying a buff every second.
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
|
2021-02-26 17:57:01 -05:00 |
|
Samuel Keiffer
|
8e07174c1d
|
Merge branch 'aweinstock/coin-item' into 'master'
Add a coin item and make amounts visible on dropped items.
See merge request veloren/veloren!1821
|
2021-02-26 04:17:12 +00:00 |
|
Samuel Keiffer
|
6af9e58965
|
Merge branch 'add-gemu-models' into 'master'
Add sword and bow models from backlog
See merge request veloren/veloren!1818
|
2021-02-26 02:59:51 +00:00 |
|
Avi Weinstock
|
7d2e8f72eb
|
Add a coin item and make amounts visible on dropped items.
|
2021-02-25 21:31:30 -05:00 |
|
Samuel Keiffer
|
00937a4e8b
|
Merge branch 'aweinstock/modularforms' into 'master'
Support modular weapon components made from a tagged material using the material as a multiplier.
See merge request veloren/veloren!1815
|
2021-02-26 00:53:02 +00:00 |
|
Avi Weinstock
|
e1484c28c0
|
Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.
|
2021-02-25 15:26:49 -05:00 |
|
Sarra
|
f39f5ab5d3
|
added coral reefs, kelp forests, and seagrass
|
2021-02-25 05:33:18 -05:00 |
|
Sam
|
ee5c9d78ca
|
Swords
|
2021-02-24 18:54:06 -05:00 |
|
Marcel
|
553e8c2195
|
Merge branch 'sam/torvus-fix-test' into 'master'
Fix for torvus
See merge request veloren/veloren!1816
|
2021-02-23 20:51:14 +00:00 |
|
Avi Weinstock
|
78014d7d3b
|
Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers.
|
2021-02-23 15:49:34 -05:00 |
|
Avi Weinstock
|
4e57678f34
|
Support modular weapon components made from a tagged material using the material as a multiplier.
|
2021-02-23 15:31:51 -05:00 |
|
Snowram
|
14c252d8b2
|
Merge branch 'snowram/turret' into 'master'
Object animation, beam fixes, turret implementation
See merge request veloren/veloren!1805
|
2021-02-23 20:16:56 +00:00 |
|
Sam
|
3d57db9485
|
Test fix for torvus
|
2021-02-23 14:38:58 -05:00 |
|
Imbris
|
da3edf54fb
|
Merge branch 'ccgauche/plugin-retreive' into 'master'
ccgauche/plugin retreive
See merge request veloren/veloren!1788
|
2021-02-23 16:36:05 +00:00 |
|
ccgauche
|
4b1c033f6e
|
Added scopeguard to protect against unwind
|
2021-02-23 13:58:13 +01:00 |
|
ccgauche
|
74ec5c652a
|
Added safety section to the EcsAccessManager
|
2021-02-23 13:58:07 +01:00 |
|
Marcel
|
2fbd382c91
|
Merge branch 'xMAC94x/physics_followup' into 'master'
physics followup, fix arrow problems
See merge request veloren/veloren!1811
|
2021-02-23 02:00:40 +00:00 |
|
Imbris
|
f33d3873b4
|
Merge branch 'aweinstock/modular-weapon-rigging' into 'master'
Support modular weapon voxel meshes being made by assembling their components.
See merge request veloren/veloren!1806
|
2021-02-23 00:45:26 +00:00 |
|
Avi Weinstock
|
c3ac8a1b51
|
Support modular weapon voxel meshes being made by assembling their components.
|
2021-02-23 00:45:26 +00:00 |
|
Marcel
|
6081ebbe15
|
Merge branch 'sam/ecs-sys-struct' into 'master'
Sam/ecs sys struct
See merge request veloren/veloren!1813
|
2021-02-23 00:08:09 +00:00 |
|
ccgauche
|
f85e79af07
|
Fixed turbofish issues
|
2021-02-23 00:03:29 +01:00 |
|
ccgauche
|
a12e554266
|
Removed the unwrap to ensure the WASM instance can't crash the host
|
2021-02-23 00:03:27 +01:00 |
|
ccgauche
|
387daf8aea
|
Change invalid message in examples and cleanup
Updated changelog + Removed hello plugin from plugins folder
|
2021-02-23 00:02:58 +01:00 |
|
ccgauche
|
6c991cc2cd
|
Changed to less restrictive memory ordering
|
2021-02-23 00:02:51 +01:00 |
|
ccgauche
|
267e7d8b4c
|
Finalized Retrieve API
|
2021-02-22 23:59:41 +01:00 |
|
ccgauche
|
06aa7ab70c
|
Retrieves added + New ECS memory layout for plugins
|
2021-02-22 23:59:32 +01:00 |
|
ccgauche
|
1597fcc79e
|
Fixed the plugin compilation and added comments
TODO: Remove compilation errors on WASM side (while using common).
|
2021-02-22 23:59:25 +01:00 |
|
ccgauche
|
8a693d9fde
|
New cleaner safer version
|
2021-02-22 23:59:15 +01:00 |
|
ccgauche
|
a067a20b69
|
added basic retreive
|
2021-02-22 23:59:11 +01:00 |
|
Marcel Märtens
|
6008109413
|
physics followup, fix arrow problems by adding the vel_dt to the collision boundry
|
2021-02-22 23:51:01 +01:00 |
|
Sam
|
3f467a32e6
|
Changed naming from 'immutable data' to 'read data'
|
2021-02-22 16:02:37 -05:00 |
|
Sam
|
2b5120319d
|
Character behavior system now uses immutable data struct
|
2021-02-22 15:30:53 -05:00 |
|
Sam
|
fae1db90d5
|
Controller system now uses immutable data struct
|
2021-02-22 14:33:54 -05:00 |
|
Sam
|
dcacd82293
|
Stats system now uses immutable data struct
|
2021-02-22 14:27:34 -05:00 |
|
Sam
|
27fe1c20ac
|
Aura system now uses immutable data struct
|
2021-02-22 14:14:10 -05:00 |
|
Sam
|
4c0c06ea4c
|
Buff system now uses immutable data struct
|
2021-02-22 14:03:18 -05:00 |
|
Sam
|
605513ea56
|
Beam system now uses immutable data struct
|
2021-02-22 13:57:56 -05:00 |
|
Sam
|
11a0d67b35
|
Shockwave system now uses immutable data struct
|
2021-02-22 13:49:56 -05:00 |
|
Sam
|
b278cad807
|
Projectile system now uses immutable data struct
|
2021-02-22 13:37:42 -05:00 |
|
Sam
|
91e982b3ee
|
Melee system now uses immutable data struct
|
2021-02-22 13:25:21 -05:00 |
|
Marcel Märtens
|
1a7c179bbb
|
share tokio Runtime between Client and Server, name rayon Threadpool
|
2021-02-22 17:35:06 +01:00 |
|
Vincent Glize
|
4f37c626ea
|
Optimize Entity <> Entity collision check by calculating a entity via sphere.
|
2021-02-22 12:36:42 +01:00 |
|
Justin Shipsey
|
1f88b87ca4
|
fix glider crash
|
2021-02-22 06:31:12 +00:00 |
|
Joshua Barretto
|
e2290783fc
|
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
|
370259fe54
|
CI - Fix clippy errors
Fix trailing whitspace
|
2021-02-22 00:57:25 +00:00 |
|
Snowram
|
4078eeb877
|
Various fixes to object animation, cleanup
|
2021-02-21 19:56:46 +01:00 |
|
Snowram
|
f25b2b1500
|
Various fixes to beam, body based interp
|
2021-02-21 19:17:56 +01:00 |
|
Sam
|
11050a05ce
|
Beam particles now determined from beam segment rather than character state.
|
2021-02-21 19:17:56 +01:00 |
|