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
4,991 Commits 151 Branches 18 Tags 2.1 GiB
dc2fc11956
Commit Graph

1384 Commits

Author SHA1 Message Date
Joshua Barretto
75c1d44010 Merge branch 'zesterer/worldsim' into 'master' 
World simulation, generation, and pathfinding improvements (including castles and caves)

See merge request veloren/veloren!1282
 2020-08-12 21:40:56 +00:00
Joshua Barretto
e3cab272c3 Fixed floating sprites in towns, clippy fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
50a85853e3 Fmt and clippy lints fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
85ed5ad356 Updated changelog, cleaned up warnings, minor fixes 2020-08-12 21:16:11 +01:00
Joshua Barretto
15b1717295 Added decals to towns 2020-08-12 21:15:53 +01:00
Joshua Barretto
6992194ad4 Better surface swimming, no underwater sprites 2020-08-12 21:15:53 +01:00
Monty Marz
c1b07465cf added grass sprites 2020-08-12 21:15:53 +01:00
Joshua Barretto
9329b4ce55 Added monsters to caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
d7ccb28ea7 Pathfinding improvements 2020-08-12 21:15:53 +01:00
Joshua Barretto
d48ed42fda Prevented NPCs running gleefully off cliffs without a second thought 2020-08-12 21:15:53 +01:00
Pfauenauge
ee83479748 drop gate parts 2020-08-12 21:15:53 +01:00
Joshua Barretto
dfecf0dad6 Massively improved pathfinding reliability 2020-08-12 21:15:53 +01:00
Joshua Barretto
9bb10a6d00 Various improvements to castles, dungeons and more 2020-08-12 21:15:53 +01:00
Joshua Barretto
0bad704719 Made agents flee 2020-08-12 21:15:53 +01:00
Joshua Barretto
41229b4665 Added large caves, cave scatter, removed old caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
a9126f7e25 Simulation improvements, removed block glows 2020-08-12 21:15:52 +01:00
Joshua Barretto
bdb39b8e7f Better castle variation, improved paths, multi-storey houses 2020-08-12 21:15:52 +01:00
Joshua Barretto
41916d4594 Better castles, initial light prop for lit objects 2020-08-12 21:15:52 +01:00
WelshPixie
568a3e375e fixed sprite rotations 2020-08-12 21:15:52 +01:00
Joshua Barretto
d6cdb0c433 Began adding castles 2020-08-12 21:15:52 +01:00
Joshua Barretto
1f4cec773b Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
f21a50e393 Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Monty Marz
fcdd875bff UI fixes, assets update 2020-08-12 18:10:18 +00:00
Monty Marz
6789b7ae27 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
9aab296264 Add firework item 2020-08-12 22:25:28 +08:00
Imbris
893da3622a Merge branch 'scott-c/particles' into 'master' 
Particles

See merge request veloren/veloren!1156
 2020-08-09 17:09:43 +00:00
jshipsey
45971fa403 state corrections 2020-08-08 17:05:48 -04:00
jshipsey
9ff5c23cf0 readd sneak 2020-08-08 13:47:32 -04:00
scott-c
a0107d5cda fix rebase 2020-08-08 19:26:52 +08:00
scott-c
cc36e9c300 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
bb8ba75287 cleanup redundant function 2020-08-08 19:26:52 +08:00
Joshua Barretto
7c31baef6f Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
scott-c
1a263834e7 Add campfire command 2020-08-08 19:25:33 +08:00
scott-c
bb2a5c885b Add fireball and bomb particle effects 2020-08-08 19:25:00 +08:00
scott-c
4bc373a832 remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
3139e85dff allow for col particles 2020-08-08 19:25:00 +08:00
scott-c
803677f0fb Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
da5f4828a5 Add particle lifespan 2020-08-08 19:25:00 +08:00
scott-c
39b676cd8f Add ParticleMgr 2020-08-08 19:24:55 +08:00
scott-c
42a10a6059 Add ParticleEmitter Component 2020-08-08 19:24:22 +08:00
Monty Marz
142b386628 address comments 2020-08-08 00:13:00 -04:00
Imbris
a7df000a6f Fireballs no longer damage group members 2020-08-08 01:16:35 +02:00
Imbris
af8560ea36 Remove pets from the group exp division calculation but still give them exp, fix bug with group code when pets are deleted 2020-08-08 01:16:35 +02:00
Imbris
390d289d35 Add timeout's to group invites, and configurable limit to group size 
Fix a few group bugs, enable invite timeout and group limits in ui
 2020-08-08 01:16:35 +02:00
Monty Marz
28a8f847cc timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Imbris
543d971a19 Projectiles ignore entities in the same group, pets no longer follow group leader 2020-08-08 01:15:58 +02:00
Monty Marz
1eb671e1a6 Update CHANGELOG.md, german locale 2020-08-08 01:15:58 +02:00
Imbris
3a22b3694d New group UI functions 2020-08-08 01:14:19 +02:00
Imbris
d856c20225 Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
0a8f148559 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
d9e3937a82 Basic UI 
Basic ui for groups and group window
 2020-08-08 01:12:35 +02:00
Imbris
10c3d01466 Add basic group functionality (no voxygen wiring yet) 2020-08-08 01:09:01 +02:00
nepo
cb65070aba nepo/dullahan 2020-08-07 03:56:59 +00:00
Sam
3b1163fa50 Removed commented code 2020-08-06 10:15:24 -05:00
Sam
83a6e08c7a Removed energy refund on M2 attacks. Re-added custom heights on creatures. Tweaked movement on triple strike. 2020-08-06 09:43:50 -05:00
Silentium2318
1c40218de9 More weapon and hit box tweaks 2020-08-06 09:43:47 -05:00
Silentium2318
1de40154c7 Weapon balancing 2020-08-06 09:39:49 -05:00
Silentium2318
a59438e3e4 Dis some distance and attack arc tweaking 2020-08-06 09:39:09 -05:00
Silentium2318
b0f55b3f79 Weapon balancing 2020-08-06 09:38:22 -05:00
Imbris
c2f3e1b47f Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
a0b1259b7e Merge branch 'BottledByte/ability_design' into 'master' 
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
 2020-08-06 04:44:51 +00:00
BottledByte
34c87d7a86 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
ab1c43be84 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar 
Also fixed two wrong asset references and did some .ron formatting
 2020-08-05 01:21:42 +02:00
BottledByte
a167ee98ee De-enumerized armor variants 2020-08-03 03:41:32 +00:00
BottledByte
dc91209a7b Removed fine-grained Item enums and replaced them with Strings 
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
 2020-08-02 01:21:32 +00:00
Samuel Keiffer
f930f52df5 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Snowram
1421517f84 Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
487131efb8 cyclops run anim 2020-08-01 02:19:45 -04:00
jshipsey
5d2be2240e maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
90d7485c38 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
8991b60929 catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
baf67f303e new models, anim tweaks 2020-08-01 02:19:44 -04:00
Marcel Märtens
7f97baca70 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00
Marcel Märtens
0d5e61c4b6 update auth to newest version 2020-07-29 19:28:22 +02:00
Marcel Märtens
96cde882ef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
Samuel Keiffer
827b91d691 Bow charged shot attack 2020-07-26 03:06:53 +00:00
Samuel Keiffer
527e7a329e Armor fixes 2020-07-25 23:57:04 +00:00
Monty Marz
31cfc05123 lots of things 
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
 2020-07-23 12:10:13 +00:00
jshipsey
5b76ed23f4 small fixes 2020-07-20 21:37:13 -04:00
Imbris
3c954534ed Merge branch 'treeco/fix-spawn-damage' into 'master' 
Reset rather than accumulate velocity when stuck or in unloaded chunks

See merge request veloren/veloren!1185
 2020-07-18 19:08:40 +00:00
Imbris
c7e8a6bfae Remove gravity rather than reset velocity in unloaded chunks 2020-07-18 07:13:30 -04:00
Imbris
23e1378c78 Merge branch 'zesterer/winit-20' into 'master' 
Upgrade winit to 0.22.2

See merge request veloren/veloren!788
 2020-07-18 03:26:59 +00:00
Imbris
db36578f83 Merge branch 'Menko/utility_items_fix_issue_612' into 'master' 
#612 Fixed utility items not being removed from inventory/hotbar

See merge request veloren/veloren!1123
 2020-07-18 02:41:45 +00:00
Nemanja
5caa6a07b0 #612 Fixed utility items not being removed from inventory/hotbar 2020-07-18 02:41:45 +00:00
Imbris
db91ebe9b5 fix a few minor bugs 2020-07-17 21:24:28 -04:00
Imbris
d1b635efa4 Rearrange PlayState system to work without loop control 2020-07-17 21:24:28 -04:00
Samuel Keiffer
6cce09be85 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
lausek
a3326b5744 fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Joshua Barretto
446923f7d8 Merge branch 'zesterer/small-fixes' into 'master' 
Zesterer/small fixes

See merge request veloren/veloren!1190
 2020-07-14 09:54:17 +00:00
Joshua Barretto
3e5c3de2ac Neater compass 2020-07-13 23:23:44 +01:00
Joshua Barretto
cf69d0c5d8 Added minimap compass 2020-07-10 15:00:20 +01:00
Joshua Barretto
951a977b2f Improved hill path following 2020-07-10 00:43:11 +01:00
Songtronix
5b57072064 fix: use correct specs(-idvs) versions 
related to torvus
 2020-07-09 19:46:30 +02:00
Joshua Barretto
ac30fcbd0e Commented unused but potentially useful code 2020-07-09 16:54:10 +01:00
Joshua Barretto
47e413c530 Improved pathfinding tolerance and reliability 2020-07-09 16:54:10 +01:00
Treeco
1f1d9c5625 Reset rather than accumulate velocity when stuck or in unloaded chunks 2020-07-09 15:58:07 +01:00
Samuel Keiffer
25c28f26d6 Different body types now have different health values and gain different amounts of healths on leveling. 2020-07-09 00:04:25 +00:00
Samuel Keiffer
fe47a14ba5 Spin attack for axe 2020-07-08 19:58:41 +00:00
Ben Frankel
823141f825 Maintain character state when inventory is modified 
If the mainhand slot is swapped out or dropped while the character is
wielding, the character will be set to idle (same behavior). However, if
an item is picked up or used; or a non-mainhand item is dropped; or two
non-mainhand items are swapped; the character state will not be set to
idle (new behavior).

Rationale for keeping the same behavior:

Swapping a weapon out while in a wielding state can put the player in a
barehanded wielding state, which would be inconsistent with the fact
that that state can't be entered by toggling wield while barehanded.

Rationale for setting the new behavior:

Setting character state to idle was originally added because "Interact"
was mapped to right mouse button, so picking up an item with RMB would
also activate secondary attack if the player was wielding during the
interaction. Now the default keybinding for "Interact" is E, so this
isn't a problem unless the player changes their keybinding to RMB.

In addition, setting character state to idle for any inventory
manipulation may cause players to fall out of glider unexpectedly.
 2020-07-07 09:43:48 -07:00