Pfauenauge90
fd3ffdf28b
pizza sprite
2020-04-23 18:19:40 +01:00
Pfauenauge
67f27ef970
ember sprite
2020-04-23 18:19:40 +01:00
Joshua Barretto
3d4a294b83
Smoothed camera motion, gentler orientation lerping
2020-04-23 18:19:40 +01:00
Joshua Barretto
5f2d0021a3
Reversed water draw order
2020-04-23 18:19:40 +01:00
Joshua Barretto
0021bd6452
Added new settlement generation to world, basic rendering
2020-04-23 18:19:40 +01:00
Joshua Barretto
944a37b848
Initial settlement generation work
2020-04-23 18:19:40 +01:00
Imbris
2c4c006396
Lantern tweaks, remove unused bones
2020-04-12 18:41:07 +02:00
Imbris
c1c09dce1b
Enable unequipping as well as equipping to specific slots
2020-04-12 18:41:06 +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
Pfauenauge90
f5a768dccf
more armour types
2020-04-12 18:40:56 +02:00
Pfauenauge90
7f97fbac0b
cape item
2020-04-12 18:40:56 +02:00
Pfauenauge90
771baaaae5
cape item
2020-04-12 18:40:55 +02:00
Capucho
b6078d832a
Fixed the player being rendered after dying
2020-04-08 21:28:33 +01:00
Capucho
8f6686adc1
Fix the problems of players walking over water with dithering
2020-04-07 22:50:01 +00:00
Capucho
a21ae27a77
Add player transparency and silhouette
2020-04-04 19:36:55 +00:00
Imbris
831d7c77a6
Make Asset impls avoid panics when parsing fails
2020-04-01 20:06:15 -04:00
AdamWhitehurst
dcc9d44b1c
remove unused timed_combo
2020-03-29 13:40:03 -07:00
Imbris
d3b5b1e637
Remove None variant fromm armor types
2020-03-28 03:51:24 -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
8fd774f21a
Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat
2020-03-27 23:59:45 -04:00
jshipsey
49ba196671
proper bow animation
2020-03-27 23:59:05 -04:00
Imbris
ba3fa16c33
Create Dir type for better enforcement of non NaN, normalized representations of directions
2020-03-27 22:02:07 -04:00
Pfauenauge90
0b3fb2dd3c
fire bolt visuals
2020-03-27 18:31:45 +01: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
175fea98ef
more cleanup, WIP fake swimming
2020-03-26 01:35:25 -04:00
Imbris
3889ec7292
climbing tweaks, fix triple strike overflow, fix Last<CharacterState>
...
not registered
2020-03-25 02:05:28 -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
timokoesters
58585e0810
Better climbing, fireball impl
2020-03-24 20:09:23 +01:00
jshipsey
7a4f0fa9ac
climb fix, const tweak update, trying equip anims
2020-03-24 00:24:31 -04:00
jshipsey
9cbbe0311f
rewrote the whole stupid skeleton to work much smarter
2020-03-22 16:06:53 -04:00
jshipsey
3baa0471ec
Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat
2020-03-22 11:55:35 -04:00
jshipsey
0773524031
wield idle, wield run
2020-03-22 11:55:28 -04:00
Pfauenauge90
662f5b1037
removed warnings and item test values
2020-03-22 14:55:08 +01:00
Adam Whitehurst
db8d89a4d9
* rename CharacterState equals() -> same_variant()
2020-03-22 05:46:09 -07:00
Imbris
41c424ac13
Optimized uses of emitters, cleanup
2020-03-22 00:49:46 -04:00
Imbris
f399085974
Flip models for hands, shoulders, and feet of humanoids
2020-03-21 18:48:21 -04:00
Adam Whitehurst
c5378b7065
Better triple_strike handling
2020-03-21 14:55:04 -07:00
jshipsey
221f675217
spin attack
2020-03-21 14:54:29 -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
514d65eb7c
Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat
2020-03-20 18:54:54 -04:00
jshipsey
a0785e693a
shooting anim state, cast anim, small tweaks
2020-03-20 18:54:27 -04:00
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
