Commit Graph

3111 Commits

Author SHA1 Message Date
Monty Marz
f77bb63f0b Merge branch 'pfau/fix-trees' into 'master'
Save the trees!

See merge request veloren/veloren!707
2020-01-06 14:21:04 +00:00
Pfauenauge90
38d44cc87f fixed the trees being cut off 2020-01-06 15:07:08 +01:00
Adam Whitehurst
dc33f6ad6a Ruin them again (the comments) 2020-01-05 15:28:20 -08:00
Adam Whitehurst
4e18ffe6c2 RUIN the comments 2020-01-05 15:26:04 -08:00
Adam Whitehurst
5bba0a96fc Fix refs 2020-01-05 15:21:37 -08:00
Adam Whitehurst
542f06eef4 Add new() to states 2020-01-05 15:17:22 -08:00
Adam Whitehurst
4e5cf63452 Clean Up Systems 2020-01-05 14:55:27 -08:00
Adam Whitehurst
8bf35a197b Update weapon .ron 2020-01-05 11:26:22 -08:00
Adam Whitehurst
8fe5cec947 Clean up, make state handlers options 2020-01-05 10:19:09 -08:00
Adam Whitehurst
2f3ccbc5d6 Update Comments 2020-01-03 12:46:41 -08:00
Imbris
4fa05150a2 Merge branch 'imbris/char-screen-transition' into 'master'
Fix issues regarding going back to the character selection screen

Closes #386

See merge request veloren/veloren!700
2020-01-02 19:40:21 +00:00
Joshua Barretto
423e741cb6 Merge branch 'zesterer/better-rollin' into 'master'
Made rolling less slippy, added tilt

See merge request veloren/veloren!699
2020-01-02 18:35:27 +00:00
Imbris
f52aef224e Fix typos, don't insert Controller if it doesn't already exist in the
mount system so that Controller components are not added to entities
client side
2020-01-02 05:34:27 -05:00
Adam Whitehurst
2635c405fe Ability comps and sys 2020-01-01 09:16:29 -08:00
Imbris
7313ec69cb Merge branch 'shandley/character-exp-sfx' into 'master'
Update SFX structure to add experience / levelling SFX

See merge request veloren/veloren!693
2020-01-01 02:55:48 +00:00
S Handley
2644e29484 Refactor and Rename for clarity
Implements a potential structure for splitting the SFX event mapping
into smaller individual files for maintainability.

- Remove inventory events for now: For a later commit.
- No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.
2020-01-01 02:55:48 +00:00
Imbris
1acf08390a Fix issue where controller events aren't processed while mounted. Fix non humanoids being able to climb and glide. 2019-12-31 16:41:45 -05:00
Imbris
c9caf14877 Fix formatting, Update CHANGELOG, turn overflow checks on for dev
profile
2019-12-31 16:38:13 -05:00
Imbris
06ea29bd4c Small connection error handling improvement 2019-12-31 16:38:13 -05:00
Imbris
ede05c47b0 fix(char screen induced ghosts):
Adds removing extra components and deleting entities clientside when
going back to the character screen. Also, simplifies ClientState by
removing the Dead variant and removing ClientMsg::StateRequest in favor
of more specific ClientMsg variants.
2019-12-31 16:38:13 -05:00
Songtronix
89fd9e2853 Merge branch 'add-airshipper-aur-to-readme' into 'master'
Added the link to airshipper-git AUR package to the README

See merge request veloren/veloren!701
2019-12-31 19:15:20 +00:00
Mckol
d55ea709f6 Added the link to airshipper-git AUR package to the README 2019-12-31 17:09:29 +00:00
AdamWhitehurst
b67a4835f4 Update disabled state flags 2019-12-31 05:19:23 -08:00
Joshua Barretto
cfbf69ae89 Made rolling less slippy, added tilt 2019-12-30 15:16:21 +00:00
AdamWhitehurst
ba7ca785f6 Successful build 2019-12-30 05:56:42 -08:00
Monty Marz
2a618467cd Merge branch 'pfau/assets' into 'master'
Animated UI elements (map, healthbars...), Asset updates

See merge request veloren/veloren!697
2019-12-30 12:16:36 +00:00
Monty Marz
8aff5faa83 assets update
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
2019-12-30 12:16:35 +00:00
Imbris
cec303a3c6 Merge branch 'imbris/player-list' into 'master'
Show players out of range on the player list, fix another overflow causing bug

See merge request veloren/veloren!691
2019-12-30 02:17:16 +00:00
Imbris
ec3e075020 fix(player list): Show players not in range on the player list
fix(overflow): Stops including block updates that fail (since chunks
don't exist on the client) in `TerrainUpdates` (which would trigger
meshing of those nonexistent chunks). Furthermore, removes
remeshing of chunks with block updates if those chunks don't have all their
neighbours (since those wouldn't be meshed in the first place).
2019-12-29 20:51:05 -05:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
Acrimon
722024ed7f Merge branch 'dylankile/hierarchical-pathfinding' into 'master'
hierarchical pathfinding

See merge request veloren/veloren!686
2019-12-29 20:58:21 +00:00
Dylan Kile
badd3113d5 hierarchical pathfinding 2019-12-29 20:58:21 +00:00
AdamWhitehurst
7a4cdfb7a4 Documentation comments 2019-12-29 08:36:59 -08:00
Forest Anderson
95e9710243 Merge branch 'angelonfira/changelog' into 'master'
Added changelog

See merge request veloren/veloren!694
2019-12-29 12:28:00 +00:00
Forest Anderson
c60367e1be Added changelog 2019-12-29 12:28:00 +00:00
AdamWhitehurst
ca44497258 Add movement_utils 2019-12-28 08:10:39 -08:00
AdamWhitehurst
06053faed0 Add state disables, cleanup imports 2019-12-26 10:01:19 -08:00
AdamWhitehurst
8e0317e03d refactor states to handle update logic 2019-12-26 06:43:59 -08:00
AdamWhitehurst
c2ceabea0e finish movment states handle() fn logic 2019-12-22 08:08:48 -08:00
AdamWhitehurst
1ab09220b0 Rudimentary Stand State handle() move 2019-12-21 07:57:15 -08:00
Imbris
ddfa2b4600 Merge branch 'imbris/sync' into 'master'
Fix sync issues

Closes #359 and #377

See merge request veloren/veloren!675
2019-12-21 04:26:38 +00:00
Imbris
6524ea31d1 Fix flight turning 2019-12-20 22:51:35 -05:00
Imbris
934c5d6846 Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc 2019-12-20 22:51:35 -05:00
Imbris
b2752d2419 Cutout unnecessary Resource syncing machinery and Tracker trait 2019-12-20 22:51:35 -05:00
Imbris
5813f626d1 cleanup 2019-12-20 22:48:14 -05:00
Imbris
bfaa18e010 Fix NaN in agent sys, stop pushback from turning player around, account for Scale in melee attack hit detection 2019-12-20 22:48:14 -05:00
Imbris
8f7323f41b Stop syncing health change timer updates 2019-12-20 22:48:14 -05:00
Imbris
d341073a44 Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Imbris
c3ac251fa8 Stop syncing Projectile component to the client 2019-12-20 22:48:14 -05:00
Imbris
e49cafafbf Actually send deletion messages 2019-12-20 22:48:14 -05:00