Adam Whitehurst
0cdb80427d
better triple_strike
2020-03-20 15:03:29 -07:00
timokoesters
44ec09a8e7
Go to idle state when picking items up
2020-03-20 20:23:04 +01:00
timokoesters
df858cb370
Remove all warnings
2020-03-20 15:45:36 +01:00
Adam Whitehurst
0b7a572178
update triple_strike
2020-03-19 15:40:03 -07:00
timokoesters
1e1ce2adbf
Fix weapon not updating after swapping to a weapon of the same type
2020-03-19 20:57:36 +01:00
timokoesters
26674390ab
Hide player body after death
2020-03-19 20:36:19 +01:00
timokoesters
87c276b292
Add hard coded loot
2020-03-18 20:37:42 +01:00
timokoesters
4741e41230
Add support for different models per weapon type
2020-03-17 18:28:07 +01:00
timokoesters
08b44db1fc
Stop first person bounce in air
2020-03-17 16:08:53 +01:00
Pfauenauge90
b9f6dfac77
fixes
2020-03-17 16:07:20 +01:00
Pfauenauge90
40910b28e4
unclothed parts
2020-03-17 15:39:29 +01:00
timokoesters
b040e18246
Fix body parts not changing
2020-03-16 22:06:23 +01:00
timokoesters
d5db1f6ca0
Add dash ability to sword M2
2020-03-16 16:34:53 +01:00
timokoesters
81591fcaf7
Make npcs attack again
2020-03-16 14:27:52 +01:00
timokoesters
1279f70184
Add shield item
2020-03-16 13:40:14 +01:00
timokoesters
4195273cf9
Adjust first person camera and underwater wield orientation
2020-03-16 13:19:51 +01:00
timokoesters
87acc01d48
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 12:32:57 +01:00
timokoesters
1f78344d6f
Move equipment from loadout into body
2020-03-15 19:44:47 +01:00
Joshua Barretto
e20feeeb0c
Added armour items and equipping of armour
2020-03-15 16:42:09 +01:00
timokoesters
aa963b7686
Merge remote-tracking branch 'origin/master' into clientstates
2020-03-15 15:27:06 +01:00
timokoesters
598a4c6cbb
Add loadout struct for info on weapon configurations
2020-03-14 22:33:20 +01:00
AdamWhitehurst
6fc94c22ba
Update timed combo, add CharacerBehavior trait
2020-03-14 12:50:07 -06:00
Mckol
8838682f0b
Added Controller support
2020-03-10 21:00:13 +00:00
jshipsey
bce9d4c24f
animation corrections
2020-03-08 17:02:25 -04: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
Adam Whitehurst
b1d1299fe6
Clean up character states
2020-03-07 10:15:02 -08:00
Imbris
ed5afaec8a
Fix tests
2020-03-05 23:12:51 -05:00
Imbris
4a0c474be1
Remove Client dependency from Scene types and audio managers, add an
...
example for using voxygen as a library to renderer images of characters
2020-03-05 23:12:51 -05:00
Justin Shipsey
86e15695fc
weapon control bone
2020-03-05 14:02:11 +00:00
timokoesters
d0439fdd84
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-24 21:34:17 +01:00
timokoesters
2fa902270e
fix: block
2020-02-24 18:10:42 +01:00
Treeco
abe47d8621
Gamma setting now works
2020-02-17 00:46:31 +00:00
Monty Marz
93d7c67cdc
Hack to allow minimap rotation.
...
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
2020-02-06 17:34:32 +00:00
timokoesters
0bc07a0835
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-03 22:02:32 +01:00
timokoesters
aa52c6fd4f
fix: jumping and attacking
2020-02-03 17:03:52 +01:00
S Handley
b7ce91fead
Move music under audio
...
Also add some blank time after each track so that we get some silence
between tracks.
2020-02-03 11:55:32 +00:00
Marcel Märtens
dae31ae5b6
apply new rustfmt - touching alot of files
2020-02-01 21:39:39 +01:00
timokoesters
76dfac7366
fix: rolling
2020-01-27 18:32:05 +01:00
Treeco
6bcab1e89b
Fixed lag caused when turning the camera with large entity counts
2020-01-26 20:04:56 +00:00
Joshua Barretto
d04a595b3f
Made waypoints work, added waypoint spawning
2020-01-26 12:52:28 +00:00
Joshua Barretto
11193a692a
Better neutral AI, initial waypoint objects
2020-01-26 12:52:28 +00:00
Joshua Barretto
2d9aa21eef
Added test world, friendly NPC pathfinding
2020-01-26 12:52:07 +00:00
Justin Shipsey
64690279af
new mobs
...
alligators
2020-01-26 00:22:48 +00:00
Monty Marz
b583f60326
35 new ground sprites, UI fixes
2020-01-25 11:14:02 +00:00
timokoesters
6515daddce
fixes
2020-01-24 16:57:24 +01:00
Joshua Yanovski
1d6d0ea03d
Fix all warnings.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
e91578ffdb
Cargo fmt most things (except erosion.rs).
2020-01-23 18:18:12 +01:00
Joshua Yanovski
2b38927345
Fixes for nonstandard chunk and map sizes.
...
Also fixes a longstanding map rendering issue.
2020-01-23 18:18:11 +01:00
timokoesters
7b558b4542
refactor: combine actionstate and movestate
2020-01-21 23:54:59 +01:00
timokoesters
ae1fa5e4c4
improvement: fog doesn't go back and forth anymore
2020-01-19 16:03:27 -05:00
Imbris
b3cdde3ce9
fix: panic in terrain meshing
2020-01-19 16:03:27 -05:00
Adam Whitehurst
d82e93b39f
Merge master and build
2020-01-16 05:27:30 -08:00
Imbris
2b4d4aa480
Merge branch 'yusdacra/tweaks' into 'master'
...
Fixes minor issues with frustum culling
See merge request veloren/veloren!712
2020-01-11 16:36:51 +00:00
Monty Marz
851d7858e6
Scrolling Combat Text (SCT)
2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
127f8fb72b
Fix lpindex not being updated for culled objects, and don't
...
recalculate frustum for every entity
2020-01-09 22:22:06 +03:00
AdamWhitehurst
de36e75264
Fix imports, update matches
2020-01-08 11:31:42 -08:00
Yusuf Bera Ertan
4a0a2d5229
Cargo fmt
2020-01-08 20:09:54 +03:00
Yusuf Bera Ertan
24013f1a32
Use treeculler crate
2020-01-07 19:40:06 +03:00
Yusuf Bera Ertan
0b67dad4a5
Fix figure visible value not updating
2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan
31d18b3381
Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum
2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan
c19c222a90
Use temporal coherence for chunk frustum culling
2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan
e32153e980
Improve frustum culling by using AABBs, add related debug information
2020-01-07 18:44:33 +03: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
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
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
d341073a44
Upgrade to specs 0.15.1
2019-12-20 22:48:14 -05:00
Adam Whitehurst
20575e0aab
Update controller
2019-12-09 14:45:10 +00:00
Adam Whitehurst
92d99af53c
feat: weapon-type dependent wield and attack durations
...
also some controller.rs cleanup
2019-12-03 06:30:08 +00:00
Treeco
7c17c45f47
made first person camera follow race heights, minor zoom chances
2019-12-01 19:05:28 +00:00
S Handley
ea2e0d17de
SFX system
...
This is an event based approach to SFX sounds. There is a specific
character sound event mapper which determines sfx to play based on
character or NPC state, as well as emitting sfx events for
non-character-triggers such as levelling up.
2019-11-23 08:26:39 +00:00
Songtronix
bdcea57201
feat(log): add date to log file
2019-11-22 19:12:58 +01:00
Joshua Barretto
8745d0a3af
Non-linear depth buffer
2019-11-20 09:59:27 +00:00
Joshua Barretto
28e625635f
Split terrain rendering to avoid redrawing skybox
2019-11-19 19:09:22 +00:00
Joshua Barretto
5162256e45
Faster and more visually pleasing clouds
2019-11-19 19:09:22 +00:00
Joshua Barretto
aa111d34e5
Added clouds
2019-11-19 19:09:22 +00:00
Joshua Barretto
eb7b55d3ad
Merge branch 'zesterer/better-water' into 'master'
...
Better water
See merge request veloren/veloren!643
2019-11-12 14:55:54 +00:00
Adam Whitehurst
64a0d8d91f
Make character anims conditional by Tool held
2019-11-10 15:36:47 -08:00
Joshua Barretto
671313a523
Overhauled water shaders
2019-11-05 15:45:01 +00:00
Monty Marz
a0a8011d7e
Updated: Help Window, Map, Item Descriptions
2019-10-27 22:22:40 +00:00
jshipsey
12f83cf270
rebase, small fixes
2019-10-25 22:20:38 -04:00
jshipsey
c5942dfcc9
purged references to npckind from anim files, removed warnings
2019-10-25 21:50:14 -04:00
jshipsey
2b5fd372c5
streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.
2019-10-25 21:50:14 -04:00
jshipsey
ada6142c1f
added large bipeds, small birbs, small fish skeletons
2019-10-25 21:47:23 -04:00
jshipsey
4f5f7402f0
added dragon skeleton
2019-10-25 21:44:33 -04:00
jshipsey
e858c31b4c
fish_medium and bird_medium skelingtons
2019-10-25 21:39:06 -04:00
jshipsey
574f070758
added large bipeds, small birbs, small fish skeletons
2019-10-25 21:34:29 -04:00
jshipsey
644939810f
added dragon skeleton
2019-10-25 21:33:59 -04:00
jshipsey
54fc712076
fish_medium and bird_medium skelingtons
2019-10-25 21:33:02 -04:00
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
timokoesters
20248a4818
feat: store items as RON files
...
When a new item is created, a ron file will be used as a template
2019-10-24 23:47:26 +02:00
Monty Marz
3e0ac48bd8
Multiple Assets and UI fixes and additions
2019-10-23 19:40:45 +00:00
Imbris
39656e92be
Merge branch '276-hotloading-armor' into 'master'
...
Resolve "Enable hotloading of different offsets for armors/weapons"
Closes #276
See merge request veloren/veloren!545
2019-10-18 00:29:09 +00:00
Adam Fogle
c41627d75f
Removed the recolor property from the armor ron files.
2019-10-17 19:45:29 -04:00
Monty Marz
fdfab6a807
refactor: create_projectile doesn't take a light
...
It returns a builder so the caller can just do it
2019-10-17 20:59:36 +00:00
Joshua Barretto
04c64dc122
Better (and faster) water shaders
2019-10-17 17:11:55 +01:00
Joshua Barretto
c01e19fc05
Don't render water that isn't there, improved chunk render order
2019-10-16 12:40:18 +01:00
Adam Fogle
3a4c307d38
Code cleanup, formatting changes, and fixed the cloth belt's offset.
2019-10-16 00:42:57 -04:00
Joshua Barretto
707b79f2c8
Smoother movement, Space for climbing
2019-10-14 11:22:48 +01:00
Adam Fogle
8f7b4afafd
Manifest file is now used to load armor.
...
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
2019-10-12 08:31:42 -04:00
Adam Fogle
a5db28113f
Redid the mainfest files to remove race/gender.
...
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
2019-10-12 08:31:42 -04:00
Adam Fogle
a2b2d0d493
Created Spec structs for each armor type.
...
Moved mesh creating code for each armor type
into matching struct.
Each Spec struct now loads the matching manifest file.
Manifest file is NOT used yet.
Warning thrown due to adding new parameter to the mesh function
for use reading the manifest file.
2019-10-12 08:31:42 -04:00
Adam Fogle
da54cf76bc
Armor names now end with left/right.
...
Armor names no longer include their armor part.
This should be inferred from their folder.
2019-10-12 08:31:42 -04:00
Imbris
2651cb9179
Adjust far plane and bring near plane back in a bit
2019-10-10 22:24:24 +00:00
Luc Fauvel
b3697e1ea7
Increased near plane value
2019-10-09 22:23:09 -04:00
Monty Marz
d82ec6715a
Item icons, chests and more
2019-10-09 19:28:05 +00:00
timokoesters
25cc1f0103
fix: orientation now supports z rotation
2019-10-06 22:03:29 +02:00
timokoesters
469349a426
fix(render): figures without vel don't render
2019-10-04 21:02:44 +02:00
Pfauenauge90
e404ea0d4f
assets, rotation, offset changes
2019-10-04 21:02:42 +02:00
Pfauenauge90
39e5530d45
made bow available in char selection
2019-10-04 21:02:40 +02:00
Pfauenauge
b5180320fb
bow position
2019-10-04 21:02:40 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation
2019-10-04 21:02:39 +02:00
Monty Marz
4c1eba1f3e
Assets update, aesthetics, minor fixes
2019-10-04 18:27:12 +00:00
S Handley
810a7e5b5d
This is a re-commit of this feature from MR yarn run test where shandley had a catastrophic git cockup.
2019-10-04 09:58:58 +00:00
Justin Shipsey
27f3bebe40
Char overhaul and asset update
2019-10-02 10:05:17 +00:00
Monty Marz
11a022abb3
Better stepping sounds (and minor voxel model fixes)
2019-09-27 16:04:22 +00:00
Joshua Barretto
bef4f11536
Added sprite selection
2019-09-26 11:43:03 +01:00
Joshua Barretto
e22fe81a2f
Added velorite
2019-09-26 00:15:07 +01:00
Vechro
deec1e6bca
Remove player shadow on death
2019-09-26 00:15:07 +01:00
Joshua Barretto
f57c2ec453
Made consumable items have an effect, better damage animation
2019-09-26 00:15:07 +01:00
Joshua Barretto
b0a1619698
Fixed shadow distance culling
2019-09-26 00:15:07 +01:00
Joshua Barretto
499344ccab
Added entity shadows
2019-09-26 00:15:07 +01:00
Joshua Barretto
46fdc87014
Animated chunk loading
2019-09-26 00:15:07 +01:00
Joshua Barretto
8bcb3c44f7
Reminder about remesh for lighting updates
2019-09-26 00:15:07 +01: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
Joshua Barretto
933e48ac3b
Merge branch 'fix-jump-height' into 'master'
...
Fix jump height
See merge request veloren/veloren!485
2019-09-08 15:50:08 +00:00
scott-c
2b3749d2f4
Fix performance regression; simplify FigureKey
2019-09-08 19:52:57 +08:00
Andrew Pritchard
2e63152d90
Merge branch 'fix-jump-height' into 'fix-jump-height'
...
Fix jump height
See merge request veloren/veloren!477
2019-09-07 12:48:49 +00:00
haslersn
d99bef6803
voxygen: Make the Terrain struct generic
2019-09-06 15:43:31 +02: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
Joshua Barretto
66c58840ef
Merge branch 'scott-c/first-person-model' into 'master'
...
Add first person models
See merge request veloren/veloren!443
2019-09-06 13:02:03 +00:00
scott-c
37d9acedb0
cleanup comment
2019-09-06 20:22:17 +08:00
scott-c
fcdb0843fc
Cleanup unused import
2019-09-06 19:35:47 +08:00
scott-c
930e075ad1
half camera height when rolling
2019-09-06 19:29:52 +08:00
Joshua Barretto
f574b1748a
Merge branch 'desttinghim/sound-effects' into 'master'
...
Sound Effects
Closes #163 and #97
See merge request veloren/veloren!473
2019-09-06 11:19:32 +00:00
scott-c
645debe230
Hide player hands when rolling in first person
2019-09-06 19:12:46 +08:00
Louis Pearson
7f27385f95
Removed unescessary if statements
2019-09-06 05:02:29 -06:00
scott-c
836525c33a
Simplify model cache key, fixes performance issue
2019-09-06 18:59:05 +08:00
Louis Pearson
059d968499
Cargo fmt
2019-09-06 04:38:02 -06:00
Louis Pearson
675d72a3ce
Code cleanup
2019-09-06 04:36:42 -06:00
Louis Pearson
57fe89e5c8
Fix warnings
2019-09-06 04:25:17 -06:00
scott-c
bc1ccfc99b
Fix first person weapon visible while not wielding
2019-09-06 18:22:26 +08:00
Andrew Pritchard
b4c74279b7
Vec3 is apprently *not* Copy, Set near plane to 0.1 to prevent tirangle flickering
2019-09-06 13:24:42 +08:00
Monty Marz
943495c0c5
Pixel art for axe and flying rod, shadow for zone names and death message
2019-09-05 17:28:33 +00:00
Louis Pearson
65008f7d54
Adds proper 3d sound?
...
Looks like loading the footstep files every time a sound is played
becomes a problem rather quickly.
2019-09-05 03:08:09 -06:00
Louis Pearson
b5a979c82e
Change footstep rate
2019-09-05 03:08:09 -06:00
