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

2084 Commits

Author SHA1 Message Date
jshipsey
f8a6a48b41 BL improvements, various fixes 2021-02-27 01:42:45 -05:00
jshipsey
6f49e0b94e rebase 2021-02-27 01:42:45 -05:00
jshipsey
fc80fff924 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
jshipsey
fbaaa60513 bow 2021-02-27 01:42:45 -05:00
jshipsey
4e3bf62732 the stabs 2021-02-27 01:42:45 -05:00
unknown
aa4f68d72b More npcs work 2021-02-27 01:42:45 -05:00
unknown
917afb3f0d Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
Snowram
39b76036b1 Sahagin, Adlet npcs 2021-02-27 01:42:43 -05:00
jshipsey
37a4bb4bef gnome 2021-02-27 01:42:43 -05:00
jshipsey
fd96357775 biped_small setup 2021-02-27 01:42:43 -05:00
Samuel Keiffer
b88bf6bd21 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
2021-02-27 03:21:47 +00:00
Snowram
79d4ca6fae Merge branch 'Sarrakitty/OceanFlora' into 'master' 
added coral reefs, kelp forests, and seagrass

See merge request
2021-02-27 01:52:33 +00:00
Sam
4cb61a2e8d Made comments more descriptive 2021-02-26 18:15:24 -05:00
Sam
714dc9106d 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
a1ff097987 Merge branch 'aweinstock/coin-item' into 'master' 
Add a coin item and make amounts visible on dropped items.

See merge request
2021-02-26 04:17:12 +00:00
Samuel Keiffer
d4e54217fc Merge branch 'add-gemu-models' into 'master' 
Add sword and bow models from backlog

See merge request
2021-02-26 02:59:51 +00:00
Avi Weinstock
890aa6fbee Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
Samuel Keiffer
f608ff9806 Merge branch 'aweinstock/modularforms' into 'master' 
Support modular weapon components made from a tagged material using the material as a multiplier.

See merge request
2021-02-26 00:53:02 +00:00
Avi Weinstock
e58768bc37 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
07f34e11f9 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
Sam
8dbdaa8759 Swords 2021-02-24 18:54:06 -05:00
Marcel
b305a3f5e0 Merge branch 'sam/torvus-fix-test' into 'master' 
Fix for torvus

See merge request
2021-02-23 20:51:14 +00:00
Avi Weinstock
fa891ff74a 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
77aeb43247 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -05:00
Snowram
af01c69456 Merge branch 'snowram/turret' into 'master' 
Object animation, beam fixes, turret implementation

See merge request
2021-02-23 20:16:56 +00:00
Sam
ef3cc6e144 Test fix for torvus 2021-02-23 14:38:58 -05:00
Imbris
7b4450d858 Merge branch 'ccgauche/plugin-retreive' into 'master' 
ccgauche/plugin retreive

See merge request
2021-02-23 16:36:05 +00:00
ccgauche
15e101c957 Added scopeguard to protect against unwind 2021-02-23 13:58:13 +01:00
ccgauche
4080152b56 Added safety section to the EcsAccessManager 2021-02-23 13:58:07 +01:00
Marcel
2fa374a32a Merge branch 'xMAC94x/physics_followup' into 'master' 
physics followup, fix arrow problems

See merge request
2021-02-23 02:00:40 +00:00
Imbris
0d3a990931 Merge branch 'aweinstock/modular-weapon-rigging' into 'master' 
Support modular weapon voxel meshes being made by assembling their components.

See merge request
2021-02-23 00:45:26 +00:00
Avi Weinstock
a25ad7f205 Support modular weapon voxel meshes being made by assembling their components. 2021-02-23 00:45:26 +00:00
Marcel
b83703c1c5 Merge branch 'sam/ecs-sys-struct' into 'master' 
Sam/ecs sys struct

See merge request
2021-02-23 00:08:09 +00:00
ccgauche
a673c1a132 Fixed turbofish issues 2021-02-23 00:03:29 +01:00
ccgauche
bb0ab44e88 Removed the unwrap to ensure the WASM instance can't crash the host 2021-02-23 00:03:27 +01: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
ccgauche
ba8cf8437c Changed to less restrictive memory ordering 2021-02-23 00:02:51 +01:00
ccgauche
9e137b0738 Finalized Retrieve API 2021-02-22 23:59:41 +01:00
ccgauche
4a460c2885 Retrieves added + New ECS memory layout for plugins 2021-02-22 23:59:32 +01:00
ccgauche
eb30572d29 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
9832139e4e New cleaner safer version 2021-02-22 23:59:15 +01:00
ccgauche
143d23beb9 added basic retreive 2021-02-22 23:59:11 +01:00
Marcel Märtens
bd0178a1b2 physics followup, fix arrow problems by adding the vel_dt to the collision boundry 2021-02-22 23:51:01 +01:00
Sam
284a42060d Changed naming from 'immutable data' to 'read data' 2021-02-22 16:02:37 -05:00
Sam
cec54039bc Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Sam
d7808a4bf0 Controller system now uses immutable data struct 2021-02-22 14:33:54 -05:00
Sam
92394bb1b1 Stats system now uses immutable data struct 2021-02-22 14:27:34 -05:00
Sam
aa8068b021 Aura system now uses immutable data struct 2021-02-22 14:14:10 -05:00
Sam
f88d98790f Buff system now uses immutable data struct 2021-02-22 14:03:18 -05:00
Sam
a2f4bc1b76 Beam system now uses immutable data struct 2021-02-22 13:57:56 -05:00