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
5,347 Commits 151 Branches 18 Tags 2.1 GiB
58e2d3a4ad
Commit Graph

394 Commits

Author SHA1 Message Date
jshipsey
2c14b2f891 clippy fixes 2020-07-05 09:39:56 -04:00
jshipsey
62eb66173f tweaks and fixes 2020-07-05 09:39:55 -04:00
Snowram
1b778ca191 Various small improvements to anims and models 2020-07-05 09:38:15 -04:00
jshipsey
ca9ae13527 more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets 2020-07-05 09:38:15 -04:00
jshipsey
014cab0257 remove warnings, rebase fix 2020-07-05 09:38:14 -04:00
jshipsey
e97be07e97 minor changes to account for movement speeds 2020-07-05 09:38:14 -04:00
Joshua Barretto
177bd7a128 More tolerant pathfinding 2020-07-05 09:38:14 -04:00
Joshua Barretto
db26c10299 Run tilting, per-species running speed 2020-07-05 09:38:14 -04:00
jshipsey
e689de3c8a better everything 2020-07-05 09:38:14 -04:00
Snowram
86b2272176 Salamander model fixes 2020-07-05 09:38:14 -04:00
jshipsey
9ef383ff03 simplify quadmed run, integrate dampener variable 2020-07-05 09:38:14 -04:00
Snowram
ce9cd29720 Add offset to quadmed legs + various fixes and improvements 2020-07-05 09:38:14 -04:00
jshipsey
f164bd2280 placeholder attack anim 2020-07-05 09:38:14 -04:00
jshipsey
894a823aad orientation tilt, make run frequency proportional to species size 2020-07-05 09:38:14 -04:00
jshipsey
a7c23ea5be custom scaling by species 2020-07-05 09:38:14 -04:00
jshipsey
94ab3665d5 pangolin and special pangolin variable 2020-07-05 09:38:14 -04:00
jshipsey
d8fff8833e quadlow spawn in world, continued adjustments 2020-07-05 09:38:14 -04:00
jshipsey
c5f7a60f3b more run animation work, adjusting pivots 2020-07-05 09:38:14 -04:00
jshipsey
03c1a97ba9 animation tweaks, fix some idle 2020-07-05 09:38:14 -04:00
jshipsey
db64972e42 starting on trot, removing some warnings 2020-07-05 09:38:14 -04:00
Snowram
648e140be3 Add wolf, frostfang and mouflon npcs 2020-07-05 09:38:14 -04:00
Snowram
4acdc24df9 Add tarasque and grolgar improvements 2020-07-05 09:38:14 -04:00
unknown
0de4b6b7f9 Makes anim hotload work for quadlow 2020-07-05 09:38:14 -04:00
Snowram
b1f4e4b9c1 Add new tusk ram model 2020-07-05 09:38:13 -04:00
Snowram
c22d543dd2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
1be42a8f85 Add tortoise mob 2020-07-05 09:38:13 -04:00
Snowram
016b05cf38 Add new grolgar model 2020-07-05 09:38:13 -04:00
Snowram
c7df12d2ea Set new lion model offsets, fix some jaws 2020-07-05 09:38:13 -04:00
unknown
4b493b196c Add asp mob 2020-07-05 09:38:13 -04:00
jshipsey
59777ee688 more quadmed run work 2020-07-05 09:38:13 -04:00
jshipsey
e362749fc7 more progress on on quad_med run 2020-07-05 09:38:13 -04:00
jshipsey
9f45d5525d tarasque work 2020-07-05 09:38:12 -04:00
Snowram
1ffefde739 Run anim progress 2020-07-05 09:38:12 -04:00
Snowram
1f5e0216c4 Tiger offsets, lion new model 2020-07-05 09:38:12 -04:00
jshipsey
967343ced6 finished quadlow run, positioning work on quadmed 2020-07-05 09:38:12 -04:00
Snowram
390f516e13 Homogenizes quadmed bones names 2020-07-05 09:38:12 -04:00
Snowram
9fec5f3d14 Add tiger mob 2020-07-05 09:38:12 -04:00
jshipsey
76354aa3cf small placement tweaks 2020-07-05 09:38:12 -04:00
jshipsey
6d9356d269 starting run anim 2020-07-05 09:38:12 -04:00
jshipsey
ccf939b4fd manifests, skeleton, basic placement 2020-07-05 09:38:12 -04:00
Snowram
c527484597 Add alligator, salamander and monitor npcs 2020-07-05 09:38:12 -04:00
Snowram
00b3301d6a Remove quad_low mobs from quad_medium 2020-07-05 09:38:12 -04:00
Snowram
fe1656931c Add legs to quadruped_medium 2020-07-05 09:38:12 -04:00
Snowram
72eb03ceb5 Add quadruped_low skeleton 2020-07-05 09:38:11 -04:00
Samuel Keiffer
85d1d4b3ff Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap. 2020-07-03 15:40:12 +00:00
Marcel
f9a7dbaa77 Merge branch 'scott-c/daggers' into 'master' 
Scott-c/1h-wielding #185

See merge request veloren/veloren!1095
 2020-07-01 12:07:35 +00:00
scott-c
d53b51954b Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Kevin Glasson
bb5d91edca Use find folder to locate debug dir 2020-06-30 18:54:42 +08:00
Kevin Glasson
2a42949df1 Refactor hot reloading 
- Remove conditional compilation in regards to the copying of an
  `_active` file so that the behaviour is the same accross all
  platforms.

- Simplify code slightly.

- Add documentation.
 2020-06-30 18:54:42 +08:00
unknown
7f02fa8132 Fixed glider animation so glider does not block view in first person. 2020-06-28 16:47:31 -04:00
Delyth Williams
94164b7839 Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Songtronix
750b9e198d fix: hot-anim feature 2020-06-24 14:35:52 +02:00
Shane Handley
304e06cbce Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
Marcel Märtens
9485b45e70 switch to tracing stlye and enhance logs with usefull information 
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
 2020-06-22 09:53:15 +02:00
Kevin Glasson
af3af6c169 Convert voxygen to use tracing 
There are several noteable changes in this commit that mean that logging
will behave differently to how it did previously.

- There are now no separate filter levels for terminal and file output.
This is a feature that is lacking in `tracing` but is set to be resolved
by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY
include it.

- The default log level was previously `WARN` - it is now `INFO`.
 2020-06-21 23:17:25 +08:00
Imbris
78bb801216 Fix cargo test failing 2020-06-19 01:46:20 -04:00
jshipsey
838eadda4e add hotloads to all anims 2020-06-19 00:48:19 -04:00
Imbris
124ed52554 Windows is weird, cargo is weird..... (also tidy up a few things) 2020-06-19 00:48:19 -04:00
Imbris
18e6b59966 Switch to using modify events with 300ms delay to prevent double reloading when notify produces multiple events at once 2020-06-19 00:48:19 -04:00
Imbris
01923d1580 Use debug, try to fix windows path 2020-06-19 00:48:19 -04:00
Imbris
d00e88b804 Hotreload animations using libloading 2020-06-19 00:48:19 -04:00
Justin Shipsey
2f896849d4 Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding 2020-06-16 21:32:39 +00:00
Justin Shipsey
688f917308 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Ben Wallis
950c62efc6 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00
jshipsey
b0b0fca64a fix shoulders in charselect 2020-06-04 02:14:03 -04:00
Justin Shipsey
3877efec50 optimization and tails 2020-06-01 00:33:24 +00:00
Monty Marz
f7d6f76a04 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00
Justin Shipsey
ea07d744a7 orientation animation 2020-05-27 06:41:55 +00:00
jshipsey
ceb771bb2c keep mobs from exploding whenever they're hit 2020-05-11 21:44:21 -04:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00
jshipsey
137c700b80 fix swim bug 2020-05-11 21:44:21 -04:00
jshipsey
5b48fe5661 delete unused jump file 2020-05-09 19:59:34 -04:00
Snowram
4ba222abcd Fix dragon jaw Z fighting 2020-05-10 01:40:53 +02:00
jshipsey
41ff0bde69 rebase 2020-05-09 18:56:08 -04:00
jshipsey
cf392b5a66 fmt 2020-05-09 18:11:25 -04:00
jshipsey
62bd79dba7 dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
5b77c74497 Add cockatrice 2020-05-09 18:09:27 -04:00
Snowram
0248c6a44e Cleanup 2020-05-09 18:09:27 -04:00
jshipsey
a6de8159f6 dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes 2020-05-09 18:09:06 -04:00
Snowram
9d2277ecd4 Better animations 2020-05-09 18:09:06 -04:00
jshipsey
5b518b137c skeletal tweaks 2020-05-09 18:09:06 -04:00
Snowram
cd452cc715 New dragon model, added jaw, splitted head into upper/lower 2020-05-09 18:09:05 -04:00
Snowram
875838ecdf Initial fly animation work 2020-05-09 18:08:35 -04:00
Snowram
9027967fb7 Initial run animation work 2020-05-09 18:08:35 -04:00
Snowram
7f0d1e9543 Initial idle animation work 2020-05-09 18:08:35 -04:00
Snowram
33f8a47cfa Symmetry of dragon skeleton 2020-05-09 18:08:35 -04:00
Robin Gilh
edcde84505 Dragon work 2 2020-05-09 18:07:31 -04:00
Robin Gilh
40360ff149 Dragon work 2020-05-09 18:07:31 -04:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Monty Marz
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Justin Shipsey
171e865f57 new animals 2020-04-28 03:13:23 +00:00
Justin Shipsey
b4af588a00 skel attribute transfer 2020-04-27 05:11:34 +00:00
Justin Shipsey
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Barretto
8e95444d85 Made GPU bone updates more conservative for moar fps 2020-04-25 21:44:23 +01:00
Joshua Barretto
01e2cd2b88 Warning cleanup 2020-04-23 18:19:42 +01:00
Monty Marz
44c5002db3 Pfau/crops 2020-04-23 18:19:41 +01:00
jshipsey
729912d33b corrected villager empty weapon issue 2020-04-23 18:19:41 +01:00
jshipsey
a89b28e117 adjusted run animation to allow villager walking 2020-04-23 18:19:41 +01:00
Joshua Barretto
8c73ec982c Resolved rebase problems 2020-04-23 18:19:40 +01:00
Joshua Barretto
b3c9122395 Overhauled domestic economy simulation, better debug information 2020-04-23 18:19:40 +01:00
jshipsey
d7e605e658 lantern visuals, random cape flutter 2020-04-12 18:41:08 +02:00
Imbris
2c4c006396 Lantern tweaks, remove unused bones 2020-04-12 18:41:07 +02:00
jshipsey
e2d60b858e cape work 2020-04-12 18:41:05 +02:00
jshipsey
ea2c646df3 initial cape implementation 2020-04-12 18:40:57 +02:00
jshipsey
ff56e5f9f9 fireball damage tweaks/staff shooting anim 2020-03-29 14:00:05 -04:00
jshipsey
fa54c90558 cleanup, tweak to triplestrike stage 1 2020-03-29 03:53:52 -04:00
Imbris
f551c4a2c5 Move armor types to a new location, use a const for the moving cutoff in voxygen anims 2020-03-28 01:52:12 -04:00
jshipsey
49ba196671 proper bow animation 2020-03-27 23:59:05 -04:00
AdamWhitehurst
d774091fa4 Add triple_strike anims for axe and hammer 2020-03-27 11:00:58 -07:00
jshipsey
0ffff86e25 third attack for triple strike 2020-03-27 01:57:30 -04:00
jshipsey
1c3d1d260c small animation tweaks 2020-03-26 23:51:55 -04:00
jshipsey
7692f1d354 fixed wield feet while jumping, tweaked charge anim 2020-03-26 18:26:23 -04:00
jshipsey
175fea98ef more cleanup, WIP fake swimming 2020-03-26 01:35:25 -04:00
jshipsey
c7d9b5ae0f fixed critter animation 2020-03-25 01:29:55 -04:00
jshipsey
047f6b8a01 fixed swimming, better charge 2020-03-25 01:22:07 -04:00
jshipsey
a6537ed69b starting foot movement with attacks, clearing some dead code 2020-03-25 00:15:06 -04:00
jshipsey
7a4f0fa9ac climb fix, const tweak update, trying equip anims 2020-03-24 00:24:31 -04:00
jshipsey
eddf3ec658 raised run anim speed 20% 2020-03-22 21:32:34 -04:00
jshipsey
9cbbe0311f rewrote the whole stupid skeleton to work much smarter 2020-03-22 16:06:53 -04:00
jshipsey
0773524031 wield idle, wield run 2020-03-22 11:55:28 -04:00
jshipsey
32c85d1bab axe attack 2020-03-22 00:11:24 -04:00
jshipsey
14f560f21b proper hammer smash, small tweaks 2020-03-21 15:47:16 -04:00
jshipsey
221f675217 spin attack 2020-03-21 14:54:29 -04:00
jshipsey
49986a0e09 bow work 2020-03-21 03:40:14 -04:00
Imbris
08db424169 Add safe_slerp function that ensures that slerping returns non-NaN normalized values 2020-03-21 00:53:41 -04:00
jshipsey
a0785e693a shooting anim state, cast anim, small tweaks 2020-03-20 18:54:27 -04:00
timokoesters
df858cb370 Remove all warnings 2020-03-20 15:45:36 +01:00
jshipsey
50e96efe6b hammer go smash 2020-03-20 02:38:53 -04:00
jshipsey
93bea033d9 axe, hammer proper wields 2020-03-20 01:27:54 -04:00
timokoesters
4741e41230 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
timokoesters
81591fcaf7 Make npcs attack again 2020-03-16 14:27:52 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
jshipsey
bce9d4c24f animation corrections 2020-03-08 17:02:25 -04:00
Snow
72b2334434 more eagle adjustements 2020-03-08 15:07:47 +00:00
Adam Whitehurst
49c7143144 Clean up warnings 2020-03-07 13:03:10 -08:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Justin Shipsey
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
Justin Shipsey
5438514343 animation housekeeping 2020-02-25 06:47:56 +00:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
timokoesters
aeb37a1f33 improvement: char speed 2020-02-03 20:43:36 +01:00
Marcel Märtens
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Justin Shipsey
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
timokoesters
76dfac7366 fix: rolling 2020-01-27 18:32:05 +01:00
Justin Shipsey
53e57cb5dc quad_medium animation 2020-01-27 14:16:23 +00:00
Justin Shipsey
64690279af new mobs 
alligators
 2020-01-26 00:22:48 +00:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Joshua Barretto
cfbf69ae89 Made rolling less slippy, added tilt 2019-12-30 15:16:21 +00:00