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
2,276 Commits 151 Branches 18 Tags 2.1 GiB
11a022abb3
Commit Graph

333 Commits

Author SHA1 Message Date
Joshua Barretto
cc214982bf Fixed warnings 2019-08-31 11:44:52 +01:00
Joshua Barretto
17a61e0b7c Fixed terrain sprite transparency issue 2019-08-31 11:44:52 +01:00
Joshua Barretto
27c208d1a5 Fixed terrain sprite transparency layering 2019-08-31 11:44:52 +01:00
jshipsey
bb71bdd4a2 removing to make gitlab compiler happy 2019-08-30 23:18:56 -04:00
jshipsey
3c473d6d6c rebase 2019-08-30 23:01:29 -04:00
jshipsey
b81cd6a8f9 combine character.action movement blocks 2019-08-30 22:51:46 -04:00
timokoesters
9a832dd56b Move std::mem::discriminant into new method 2019-08-30 22:51:46 -04:00
timokoesters
d822356161 Remove warning 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
timokoesters
b99bac87db Make npcs roll correctly 2019-08-30 22:50:53 -04:00
timokoesters
77a48c61a1 Fix rolling for the player 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
timokoesters
cd3e340647 Use movement anim as base and action anim as overwrite 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
637b4642d8 Split animations 2019-08-30 22:50:53 -04:00
timokoesters
952ec35857
Remove warnings 2019-08-29 19:54:53 +02:00
Pfauenauge90
12365ee381
Axe offset 2019-08-29 19:44:29 +02:00
Pfauenauge90
50c4764588
changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
timokoesters
6e1c78e5d5
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
timokoesters
155605841b
Use comp::Stats to store Equipment, make char weapon selection work 2019-08-29 19:44:28 +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
Monty Marz
fade04d44e Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Joshua Barretto
0fcb3a174d Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
75e1ee3cd7 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Barretto
590ce1a987 Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
Joshua Barretto
4ed21a2e59 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
Joshua Barretto
5f09ab3a4f Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7960e6ea6d Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
b31cca4bb3 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Monty Marz
7168850f05 Fix low fps 2019-08-19 08:03:19 +00:00
Joshua Barretto
f0e52e6002 Better reflections and water fog 2019-08-18 10:33:18 +01:00
Joshua Barretto
42237a84e4 Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
jshipsey
2ca81323d5 added shoulder movement and fixed placement 2019-08-18 02:35:27 -04:00
Joshua Barretto
e9fc2789d1 Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' 
Scott c/cull entities outside viewport

Closes #207

See merge request veloren/veloren!442
 2019-08-16 16:47:02 +00:00
scott-c
fce74c6218 cargo fmt 2019-08-17 00:11:06 +08:00
scott-c
2fabdfe0eb unwrap_or instead of map_or 2019-08-17 00:08:09 +08:00
scott-c
dc73e4ffb7 use entity scale as hitbox for frustrum culling 2019-08-16 23:39:07 +08:00
scott-c
f312299e62 Replace view distance culling with frustum culling 2019-08-16 21:45:10 +08:00
Acrimon
fda47fc322 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Geno
a9f20148a4 added first person switch 2019-08-13 17:54:13 +00:00
Acrimon
0bbef0d851 Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Joshua Barretto
73a44d0fb1 Collision fixes, better camera in build mode 2019-08-06 16:00:14 +01:00
Marcel
86be3fccfc Merge branch 'timo-cleanup' into 'master' 
Implement specifier syntax and cleanup

See merge request veloren/veloren!413
 2019-08-06 06:52:24 +00:00
timokoesters
1227596406 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
telastrus
4dcb53bdb8 reverted some unnecessary changes 
corrected typo

ran cargo fmt
 2019-08-05 19:41:31 -04:00
telastrus
c098a5efd7 Added adjustable FOV slider 2019-08-05 12:37:52 -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
timokoesters
6f598681fb Fix combat animations for non humanoids 2019-08-03 12:53:39 +01:00
Joshua Barretto
677c5781ba Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
Dominik Broński
f644b6ab89 Revert "Merge branch 'imbris/upgrade_specs' into 'master'" 
This reverts merge request !375
 2019-08-01 23:32:33 +00:00
Imbris
5f56657f6c Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
Joshua Barretto
39fc1d6b71 Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00
Joshua Barretto
331b6c8b3a Altered Item structure 2019-08-01 09:12:00 +01:00
Monty Marz
33565b9480 added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself 2019-07-28 09:21:17 +00:00
Nero
53086cb3b2 Nero/light offsets 2019-07-25 20:51:20 +00:00
Piotr Korgól
46f19c8f64 Fix build mode inaccuracy 2019-07-25 15:00:17 +02:00
Piotr Korgól
4f73cc921b Properly hide the player character 2019-07-24 16:45:27 +02:00
Piotr Korgól
fd841cdd33 An attempt at hiding the player in first person mode 2019-07-24 16:09:16 +02:00
Piotr Korgól
e33deac740 Change FP Mode distance to 0.1 to fix building 2019-07-24 15:04:12 +02:00
Piotr Korgól
00f490c3bf Zoom out the camera when entering third person mode 2019-07-24 15:04:12 +02:00
Piotr Korgól
36948890a3 Add camera modes 2019-07-24 15:04:12 +02:00
Pfauenauge90
7aef8b10cd offsets 2019-07-24 03:01:35 +02:00
Pfauenauge90
7a141ad111 More objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
9fd2849c6c chat warning for unknown objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
85281e7e54 spawn objects by name 2019-07-24 02:50:19 +02:00
Vechro
f3c5ece983 Add tent 2019-07-24 02:50:19 +02:00
Vechro
81f66457de Add cauldron 2019-07-24 02:50:19 +02:00
Monty Marz
ae4c569fc9 Static entities: Per model offsets, more models 2019-07-21 23:54:31 +00:00
Joshua Barretto
5cdfb26e0d Added LightEmitter component 2019-07-21 19:22:49 +01:00
Joshua Barretto
16c8ecec66 Fixed light cap 2019-07-21 19:22:49 +01:00
Joshua Barretto
b34d22565e Added point lights 2019-07-21 19:22:49 +01:00
Joshua Barretto
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Joshua Barretto
ce327445a7 Send block diffs instead of entire chunks on block change 2019-07-20 16:41:03 +01:00
Monty Marz
ff6a72bc40 New orc head models 2019-07-14 14:34:47 +00:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
jshipsey
5cd1bfb3d2 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Pfauenauge90
de1cf1371c colour and camera corrections 2019-07-07 16:19:19 +02:00
Pfauenauge90
d4a6f0c202 camera changes and nametag colour 2019-07-07 16:19:18 +02:00
Joshua Barretto
d2ccbafe59 Made mesh scheduling fairer 2019-07-06 20:00:17 +01:00
Joshua Barretto
0c9843999b fmt 2019-07-06 20:00:17 +01:00
Joshua Barretto
51ad1f1995 Improved remeshing performance 2019-07-06 20:00:17 +01:00
Joshua Barretto
ef973faadf Throttled mesh scheduling to improve remesh performance 2019-07-06 20:00:17 +01:00
Joshua Barretto
6fc2096dae Reenabled towns, lighter days 2019-07-06 20:00:17 +01:00
Joshua Barretto
1641c4f788 Added mesh worker queue limit to prevent throttling of meshing queue 2019-07-06 20:00:17 +01:00
timokoesters
d7c159a4e1
Fix warnings all around voxygen 2019-07-04 14:08:01 +02:00
Joshua Barretto
631df59083 Merge branch 'zesterer/small-fixes' into 'master' 
Fixed chonk memory usage bug, added block manipulation

See merge request veloren/veloren!278
 2019-07-01 15:22:04 +00:00
Joshua Barretto
489f5f6b2a fmt 2019-07-01 14:38:45 +01:00
Joshua Barretto
586b62ea28 Fixed remesh data race 2019-07-01 14:38:38 +01:00
Joshua Barretto
90566243ca Removed debug printing 2019-07-01 14:37:32 +01:00
Joshua Barretto
c8a2e4722c Fixed chonk memory usage bug, added block manipulation 2019-07-01 14:36:45 +01:00
jshipsey
cc548eb669 glider animation fix 2019-06-30 18:53:45 -04:00
jshipsey
e9bbe0e800 rebase 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
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02:00
timokoesters
d235374d8e
Fix npc and death bug 2019-06-29 22:43:44 +02:00
timokoesters
fe6f627d42
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00