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

2861 Commits

Author SHA1 Message Date
Snowram
8b6688581a Fixes light offset for objects 2021-03-02 19:28:33 +01:00
ccgauche
2bb54137a0 Merge branch 'master' into 'ccgauche/plugin-player-join-event' 
# Conflicts:
#   CHANGELOG.md
 2021-03-02 09:45:15 +00:00
Justin Shipsey
c9e8302cda Merge branch 'armor-org' into 'master' 
armor org

See merge request veloren/veloren!1835
 2021-03-02 01:29:46 +00:00
Ben Wallis
026188f7e2 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
6b1ba22d1f Implement stacking and splitting 2021-03-02 00:08:46 +00:00
jshipsey
8a82e1aa37 final asset corrections, fix glider anim 2021-03-01 17:37:47 -05:00
heydabop
839f599c49 Fixes #974 - convert tool/weapon equip time to floating point seconds 2021-03-01 15:06:39 -06:00
ccgauche
cc06cbce83 Fixed comments 2021-03-01 21:29:18 +01:00
ccgauche
927b2868ec Lots of improvement in pointer management (switched from i32 to u64) + New event implemented 2021-03-01 19:00:44 +01:00
Samuel Keiffer
c06e36fe6b 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
Samuel Keiffer
a2c19cd047 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
7837f480cd Buff icon 2021-02-28 17:31:35 -05:00
Sam
45c739da02 Factored formatting of buff text out to a single function. 2021-02-28 16:04:33 -05:00
Sam
e582c2bdc6 Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command. 2021-02-28 15:02:03 -05:00
Imbris
0db3b6a74c Merge branch 'Lerg/Issue_#976' into 'master' 
Issue #976 Some inputs are missing the ability to be rebound

See merge request veloren/veloren!1832
 2021-02-28 18:23:30 +00:00
Justin Shipsey
2c397f63cc Merge branch 'heydabop/966-controller-y-invert' into 'master' 
#966 - Setting to invert controller Y axis

See merge request veloren/veloren!1817
 2021-02-28 18:02:04 +00:00
Lerg
56cae542ec Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator 2021-02-28 19:02:32 +03: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
Samuel Keiffer
c4f70416eb 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
Sam
453c4b5d16 Re-allowed for what stage you were on to persist through a roll 2021-02-27 19:24:18 -05:00
Sam
2aa332b5e2 Combo melee now checks combo 2021-02-27 18:24:28 -05:00
Snowram
fe4f4a305e Reduces the instances of f64 in anims 2021-02-27 23:21:03 +01:00
jshipsey
043b280b58 look-based anims 2021-02-27 16:19:33 -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
Justin Shipsey
ab49c56072 Merge branch 'slipped/gremlins' into 'master' 
dungeon enemy overhaul part 1

See merge request veloren/veloren!1697
 2021-02-27 17:00:52 +00:00
Samuel Keiffer
c7f7ba46cd Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master' 
Issue #836 - Declutter the scrolling combat text

See merge request veloren/veloren!1823
 2021-02-27 16:18:18 +00:00
jshipsey
77c89d732b weapon/manifest tweaks 2021-02-27 10:44:55 -05:00
Lerg
9974129e7d Issue #836 - Declutter the scrolling combat text 2021-02-27 15:10:47 +03:00
Sam
8db54e9b53 Particle rebase fixes 2021-02-27 01:42:47 -05:00
jshipsey
4aaef35d1d address comments 2021-02-27 01:42:47 -05:00
Snowram
cf228c7642 Adds harvester npc 2021-02-27 01:42:47 -05:00
jshipsey
b32aab5a26 visual weapon variation, adjust minotaur dash, keyframed golem quake 2021-02-27 01:42:47 -05:00
jshipsey
8f463921f8 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
jshipsey
7feb00f7e4 balance pass 2 2021-02-27 01:42:47 -05:00
jshipsey
c44a542fab rebase, yeti in dungeon 2021-02-27 01:42:47 -05:00
jshipsey
9fdba83b03 initial balance 2021-02-27 01:42:47 -05:00
Snowram
7d9d66709c Adds yeti npc 2021-02-27 01:42:46 -05:00
jshipsey
c9b9d81003 dash, spin, jump changes 2021-02-27 01:42:46 -05:00
Snowram
ba18f1fab3 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
Sam
56acb6a5f0 Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
jshipsey
befa6b3a21 theropod retrofit, some more moves 2021-02-27 01:42:46 -05:00
jshipsey
0ffcd62d12 some new moves, combine biped weapons into one file 2021-02-27 01:42:46 -05:00
jshipsey
ce8b4d27a2 full bipedsmall armor swaps 2021-02-27 01:42:46 -05:00
Sam
8721f053f9 Fixed particles. 2021-02-27 01:42:46 -05:00
jshipsey
7e2794c234 anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
jshipsey
fa1f2b0880 golem retrofit 2021-02-27 01:42:46 -05:00
Timo Kösters
ef2cc3082a Improve particles 2021-02-27 01:42:46 -05:00
jshipsey
d8eeffeacd speedier weapons initial testing 2021-02-27 01:42:45 -05:00
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