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

6748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8efc53fcef feedback adjustments 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
jshipsey
749fc13882 rendering 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
jshipsey
36711e8885 wielding 2021-02-27 01:42:45 -05:00
jshipsey
2a908d5638 run anim tweaks 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
64617f1abe Trims skeletal attributes 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 veloren/veloren!1824
 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 veloren/veloren!1819
 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
Marcel
ee2ca23a85 Merge branch 'xMAC94x/netfixF' into 'master' 
Shutdown improvements

See merge request veloren/veloren!1822
 2021-02-26 10:33:03 +00:00
Marcel Märtens
aa88f90056 Shutdown improvements 
- Timeout for Participant::drop, it will stop eventually
 - Detect tokio runtime in Participant::drop and no longer use std::sleep in that case (it could hang the thread that is actually doing the shutdown work and deadlock
 - Parallel Shutdown in Scheduler: Instead of a slow shutdown locking up everything we can now shutdown participants in parallel, this should reduces `WARN` part took long for shutdown dramatically
 2021-02-26 10:50:30 +01:00
Sarra
cc92fa9c7b coral and kelp, cargo fmt 2021-02-25 23:47:38 -05:00
Sarra
73f966dc63 tweaking coral models and seagrass spawns 2021-02-25 23:39:41 -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 veloren/veloren!1821
 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 veloren/veloren!1818
 2021-02-26 02:59:51 +00:00