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,097 Commits 151 Branches 18 Tags 2.1 GiB
950c62efc6
Commit Graph

231 Commits

Author SHA1 Message Date
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
jshipsey
deadd665c8 tweaks animations to better align with true positions 2019-10-12 14:19:55 -04:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
jshipsey
66e8f4c4bc
added bow wielding animations 2019-10-04 21:02:45 +02:00
Monty Marz
4c1eba1f3e Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Monty Marz
3a0131306f Character assets Part 1 2019-09-18 16:46:12 +00:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping 
With an additional approximation to allow for the same size jumps given different framerates.
 2019-09-09 19:11:40 +00:00
haslersn
1796c09ca1 common: Rework volume API 
See the doc comments in `common/src/vol.rs` for more information on
the API itself.

The changes include:

* Consistent `Err`/`Error` naming.
  * Types are named `...Error`.
  * `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
  to an upcoming change where a “map” in the game related sense will
  be added.
* Add volume iterators. There are two types of them:
  * _Position_ iterators obtained from the trait `IntoPosIterator`
    using the method
    `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `Vec3<i32>`.
  * _Volume_ iterators obtained from the trait `IntoVolIterator`
    using the method
    `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
  Those traits will usually be implemented by references to volume
  types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
  type which usually implements several volume traits, such as `Chunk`).
  * _Position_ iterators iterate over the positions valid for that
    volume.
  * _Volume_ iterators do the same but return not only the position
    but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
  `Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
  * `RasterableVol` represents a volume that is compile-time sized and has
    its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
    because such a volume can be used with `VolGrid3d`.
  * `RectRasterableVol` represents a volume that is compile-time sized at
    least in x and y direction and has its lower bound at `(0, 0, z)`.
    There's no requirement on he lower bound or size in z direction.
    The name `RectRasterableVol` was chosen because such a volume can be
    used with `VolGrid2d`.
 2019-09-06 15:43:31 +02:00
jshipsey
b81cd6a8f9 combine character.action movement blocks 2019-08-30 22:51:46 -04:00
jshipsey
78bf7a0997 slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation 2019-08-30 22:50:53 -04:00
jshipsey
d84c07c1cb fixed tiny feet in char creation 2019-08-30 22:50:53 -04:00
jshipsey
f8d0b1040a readded cidle 2019-08-30 22:50:53 -04:00
jshipsey
bec942753e some stuff fixed, other stuff still broken 2019-08-30 22:50:53 -04:00
jshipsey
e6197d4c10 separate static anims for feet (run/static) 2019-08-30 22:50:53 -04:00
timokoesters
84d0f61596
Make pipeline succeed 2019-08-26 14:05:17 +02:00
timokoesters
eb34e5bb27
fmt 2019-08-26 13:12:43 +02:00
jshipsey
39bd888a7c
idle block animation 2019-08-26 13:12:38 +02:00
jshipsey
2ca81323d5 added shoulder movement and fixed placement 2019-08-18 02:35:27 -04:00
Monty Marz
8c1d244bf8 New Female Danari and Elf models, Airblocks for tower ruins and witch house 2019-08-04 11:23:01 +00:00
jshipsey
13310ab9ca improved animations and movement 2019-08-01 23:57:26 -04:00
Joshua Barretto
331b6c8b3a Altered Item structure 2019-08-01 09:12:00 +01:00
Joshua Barretto
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Monty Marz
ff6a72bc40 New orc head models 2019-07-14 14:34:47 +00:00
jshipsey
529281e2c3 removed weapon_id attribs, replaced with matches 2019-07-07 19:24:20 -04:00
jshipsey
12667b9172 fmt 2019-07-07 18:06:29 -04:00
jshipsey
5cd1bfb3d2 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
jshipsey
02ac56d84d clearing animation warnings 2019-07-04 10:58:59 -04:00
jshipsey
cc548eb669 glider animation fix 2019-06-30 18:53:45 -04:00
jshipsey
aea0d0002b head position fixes 2019-06-30 18:53:45 -04:00
jshipsey
2ce5c5881e combat run/jump/idle animation states 2019-06-30 18:53:44 -04:00
timokoesters
fe6f627d42
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00
Monty Marz
cef52a0440 Char fixes 2019-06-28 14:45:02 +00:00
Justin Shipsey
4ac7307f8f minor main menu changes 
made the settings button's text grey and removed hover/press image as long as it's not functional

changed server list placement and spacing
 2019-06-28 08:24:13 +00:00
Joshua Barretto
25b48b9cf6 Removed dt debugging in animation code 2019-06-26 17:22:28 +01:00
timokoesters
7fc53db328
Fix fps dependent animation interpolation by using dt 2019-06-25 21:43:45 +02:00
jshipsey
8dd1e46883
run tweaks 2019-06-16 19:59:15 +02:00
jshipsey
ed2773fbca
changed hand motion on run animation 2019-06-16 19:59:15 +02:00
jshipsey
8e019cdbec
lowered roll duration 2019-06-16 19:59:14 +02:00
jshipsey
0c534efddd
adjusted v-tilt, roll speed, run animation tempo 2019-06-16 19:59:13 +02:00
jshipsey
e066d98762
slight roll tweak, altered speeds in physics 2019-06-16 19:59:13 +02:00
jshipsey
ecf0d9647c
added roll physics, improved anims for roll, glide, run, attached hands to torso 2019-06-16 19:59:12 +02:00
timokoesters
e2c81dd036
Fixes for .maybe() and animation 2019-06-16 19:57:04 +02:00
jshipsey
4de5489367
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
jshipsey
99b4406d79 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
9da2d82197 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816 Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Cody
75ca605f5d
Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names. 2019-05-31 16:36:24 -04:00
Cody
a258be7aac
Fixes some typos, comment inconsistencies, and incorrect naming conventions. 2019-05-31 16:36:16 -04:00
jshipsey
6cb1a75b93 speed tweak 
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
 2019-05-27 19:48:44 -04:00
jshipsey
f9e2828de5 swing animation changes 
Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd
 2019-05-27 19:03:52 -04:00
jshipsey
5f22c4e26f swing animation 
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
 2019-05-27 18:54:09 -04:00
Monty Marz
8a3b308224 Wolf model assets update 
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
 2019-05-26 19:12:32 +00:00
jshipsey
c342a7136b tweaking quadrupedmedium 
Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d
 2019-05-26 10:39:57 -04:00
jshipsey
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
jshipsey
e84d19b5c8 fmt 
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
 2019-05-24 19:01:10 -04:00
jshipsey
98630b3692 attack state 
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
 2019-05-24 18:42:22 -04:00
jshipsey
ac41a2241c laying groundwork for combat anims, untangling skeleton 
Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2
 2019-05-24 18:33:56 -04:00
jshipsey
a65d6e733f rotation simplification 
Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0
 2019-05-24 18:33:55 -04:00
jshipsey
5049b9a2ae attack state 
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
 2019-05-24 18:33:55 -04:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
7b09070fc8 fmt 
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
 2019-05-16 20:23:45 +01:00
jshipsey
6db00e371d popup origin fix 
Former-commit-id: 9a7ba69115e7b574bc2f3bf26afad71e3c682c38
 2019-05-16 01:29:48 -04:00
jshipsey
50fa3cf098 glide anim 
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
 2019-05-16 00:40:35 -04:00
Joshua Barretto
5092df0e7f Improved quadruped origin 
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
 2019-05-15 17:06:58 +01:00
jshipsey
efc019f7a4 idle, run, jump animations 
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
 2019-05-15 00:24:36 -04:00
jshipsey
2a2b873f56 added skeleton, needs animation fix 
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
 2019-05-13 22:24:34 -04:00
jshipsey
732c43ce11 first quadruped changes 
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
 2019-05-13 19:43:10 -04:00
jshipsey
98380df9b2 pipeline fix 
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
 2019-05-12 22:39:16 -04:00
jshipsey
1bc03efa90 minor alignment fix 
Former-commit-id: ecfa2eff0982e21d523a8a454890a1e6ed6d9bd7
 2019-05-12 22:10:47 -04:00
jshipsey
e8c91f753e Merge branch 'master' of https://gitlab.com/veloren/veloren 
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
 2019-05-12 21:52:44 -04:00
jshipsey
dec9632460 animation adjustments 
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
 2019-05-12 20:52:30 -04:00
Joshua Barretto
a8981378bf Improved performance and compilation speed for debug builds 
Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3
 2019-05-12 18:43:55 +01:00
Forest Anderson
cf22cb99e7 Ran fmt 
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
 2019-05-09 17:30:44 -04:00
Joshua Barretto
89f9589cf0 Fixes to head animations 
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
 2019-05-09 20:18:13 +01:00
Joshua Barretto
54cc9e137a fmt 
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
 2019-05-09 18:58:16 +01:00
Joshua Barretto
3b44bda43c Secret feature 
Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
 2019-05-09 18:57:47 +01:00
Joshua Barretto
94fd0b1a22 Fixed running animation, changed movement physics 
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
 2019-05-09 18:57:47 +01:00
jshipsey
ac78d322d6 animation orientation fix, first jump 
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
 2019-05-09 18:57:47 +01:00
Joshua Barretto
3705f9a871 Added anim_time to animations 
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
 2019-05-09 18:57:47 +01:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
Joshua Barretto
0b0c71592c Fixed orientation issue 
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
 2019-04-25 17:52:11 +01:00
jshipsey
c0a8a677b7 simplified scaling code 
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
 2019-04-24 23:33:36 -04:00
jshipsey
0a34bfab9b run animation incremental tweaks 
Former-commit-id: fa43d89890e22da665dc29606baed46e23f8eb6e
 2019-04-24 23:32:35 -04:00
jshipsey
bc5074a2b8 velocity tilt 
Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753
 2019-04-24 23:31:18 -04:00
jshipsey
56a8a247cc simplified scaling code 
Former-commit-id: 2a1c8450f002862f67873c375674413902e138ef
 2019-04-24 23:30:06 -04:00
jshipsey
9c15fa08a8 run animation incremental tweaks 
Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318
 2019-04-24 23:28:51 -04:00
jshipsey
9510edd148 velocity tilt 
Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6
 2019-04-24 23:26:22 -04:00
jshipsey
97603120a2 simplified scaling code 
Former-commit-id: 3f85bf6aef1f3931570fafb8b2aa5b0dc26f8fad
 2019-04-24 23:25:05 -04:00
jshipsey
4d0660affb run animation incremental tweaks 
Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55
 2019-04-24 23:25:05 -04:00
jshipsey
df39bcb2dc velocity tilt 
Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8
 2019-04-24 23:25:05 -04:00
jshipsey
44374969fb Merge branch 'master' of https://gitlab.com/jshipsey/fresh 
Former-commit-id: ba8dfe2c6b54b40b25ce2fe71d2eef8827f8a779
 2019-04-20 19:39:54 -04:00
jshipsey
c492e72a99 tidying up code 
Former-commit-id: 0f77e7baf0c628969bc31e4d5fc4b42e18ab57d2
 2019-04-20 19:37:09 -04:00
jshipsey
7778546b69 more rebasing 
Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf
 2019-04-20 19:34:40 -04:00
jshipsey
0e71756643 merge fix 
Former-commit-id: 38fa38de2b2985062e3260170b4f6f06d17515a1
 2019-04-20 19:28:18 -04:00
jshipsey
a7f300feee rebasing 
Former-commit-id: 1ef4423a8f839f5c72c650dd0ba4affddc0215fa
 2019-04-20 19:28:18 -04:00
jshipsey
9d2040d509 tidying up code 
Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9
 2019-04-20 19:20:49 -04:00
jshipsey
6fd783e6eb animation minor fixes 
Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675
 2019-04-20 19:20:48 -04:00
jshipsey
78d7cfd89d animation adjustments 
Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6
 2019-04-20 19:18:42 -04:00
jshipsey
33411a6004 merge fix 
Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4
 2019-04-20 19:13:38 -04:00
jshipsey
a04ddf67f6 quadruped testing 
Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5
 2019-04-20 19:13:38 -04:00
jshipsey
357a035757 Merge branch 'master' of https://gitlab.com/jshipsey/fresh 
Former-commit-id: 0b7dab49b7d7d92149b2873a8390ab699db63642
 2019-04-20 18:57:09 -04:00
jshipsey
83f8759746 tidying up code 
Former-commit-id: 062930589922dc903be9e959eb06fd203945c101
 2019-04-20 18:52:34 -04:00
jshipsey
7717d12c7a more rebasing 
Former-commit-id: c38dde30d5ced7cefad40e3f4ae4208f412bdd23
 2019-04-20 18:47:15 -04:00
jshipsey
c655790c8a merge fix 
Former-commit-id: a344856978c40e12d37dba5aaa0e0abac1dba9f4
 2019-04-20 18:41:05 -04:00
jshipsey
ee4a261a28 rebasing 
Former-commit-id: 38e7f49fb503caa9ca2377ac48f8fb3a1b22301e
 2019-04-20 18:37:09 -04:00
jshipsey
3d318a85e4 tidying up code 
Former-commit-id: df86599ae47b71bb744f5589da4511fa71603541
 2019-04-20 18:12:45 -04:00
jshipsey
46f571f99a animation minor fixes 
Former-commit-id: 4326db41103a0d3f87c7ad638fb38cd2f3eec71c
 2019-04-20 18:08:56 -04:00
Piotr
2800c9e9f5 make 11.0 a const 
Former-commit-id: 4602f3147b434e93256d48938b813325e74ad551
 2019-04-20 20:35:45 +02:00
jshipsey
3ff88ff478 animation adjustments 
Former-commit-id: 8720a7442a27103989eae7333b2a48265b94fd07
 2019-04-19 20:20:01 -04:00
jshipsey
4d0466a618 merge fix 
Former-commit-id: b83fed02f8a49e5914c8939bb2ec5e6f76bad2a2
 2019-04-19 19:42:12 -04:00
jshipsey
b107a46b07 fixing conflict 
Former-commit-id: 4b0293ce11a5ae4ca0c8b265959fee2138941032
 2019-04-19 19:05:33 -04:00
timokoesters
8cc4399d18 Handle bone orientation and scale as well 
Former-commit-id: 80c80342ae3458b98c2520359bc0a0705b22dbc1
 2019-04-16 20:55:04 +02:00
timokoesters
713b59aeff Implement animation smoothing 
Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df
 2019-04-16 20:26:24 +02:00
Piotr
ddb32eec30 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Joshua Barretto
51f7d85508 Ensured that Client is Send 
Former-commit-id: abadfc7d1d86110ed442cdb5a2e639c163c96e04
 2019-04-14 14:23:43 +01:00
Joshua Barretto
11630877e3 Moved figure rendering to a better place 
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
a8b0039898 Added networked entity updates, player entity allocation 
Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c
 2019-03-19 11:35:38 +00:00
Joshua Barretto
dbbcc1e80e Added basic networked communications, chat communication 
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
 2019-03-04 19:58:58 +00:00
jshipsey
966fcc1709 quadruped testing 
Former-commit-id: eb863aa33671032799b70833619ebb3d4d77c58a
 2019-03-04 19:58:58 +00:00
jshipsey
7e8781024b quadruped testing 
Former-commit-id: 50340b74d803ec84b6af43ae6d787d72bf2c2d57
 2019-03-02 17:41:34 -05:00
Joshua Barretto
248577bdef Added test terrain loading and meshing 2019-01-23 20:01:58 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +00:00
Joshua Barretto
bd561dd1aa Added terrain pipeline 2019-01-14 23:13:58 +00:00
Joshua Barretto
ae4f1ae2ea Added vox trait 2019-01-14 18:49:53 +00:00
Joshua Barretto
c5a506dad2 Moved client to session type 2019-01-14 15:47:57 +00:00
Joshua Barretto
0a122431db Restructured animation code 2019-01-14 14:40:22 +00:00
Joshua Barretto
86e70751e0 Moved to Skeleton and Animation traits 2019-01-14 14:18:58 +00:00
Joshua Barretto
8184bc6fc0 Added figures, segments, test .vox files, basic animation test 2019-01-13 20:53:55 +00:00