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
15,694 Commits 151 Branches 18 Tags 2.1 GiB
6d33fcad24
Commit Graph

4895 Commits

Author SHA1 Message Date
Joshua Barretto
c33892e8af Made entity collisions z-dependent 2019-08-03 19:09:01 +01:00
Joshua Barretto
71bf09d3b7 Better orientation in the air 2019-08-03 18:30:48 +01:00
Joshua Barretto
e52250a193 Made orientation change with move_dir, added a small amount of knockback 2019-08-03 18:24:07 +01:00
Joshua Barretto
5e3e87f9c5 Made enemies sometimes roll 2019-08-03 13:31:40 +01:00
Joshua Barretto
51fa4f3cfc Merge branch 'animation-tweaks' into 'master' 
animation and movement tweaks

See merge request veloren/veloren!389
 2019-08-03 12:09:38 +00:00
Joshua Barretto
cab898a91f Made enemies actually attack 2019-08-03 13:01:54 +01:00
timokoesters
3a43150bc5 Make hostile npcs back away when too close 2019-08-03 12:53:39 +01:00
Pfauenauge90
c919b68346 changed angle of attack, changed z offset on hit 2019-08-03 12:46:07 +01:00
timokoesters
e39324a9d2 Remove knockback 2019-08-03 12:46:07 +01:00
Joshua Barretto
3063546a58 Added entity pushback 2019-08-03 12:26:05 +01:00
Joshua Barretto
e6fe07dd3d Shortened enemy sight distance 2019-08-02 21:35:03 +01:00
Joshua Barretto
8aa7af781e Fixed enemy combat 2019-08-02 20:52:46 +01:00
Joshua Barretto
23cfe50455 Better health accessors methods 2019-08-02 20:49:48 +01:00
Joshua Barretto
5e4f383952 Better enemy AI 2019-08-02 20:41:38 +01:00
Joshua Barretto
677c5781ba Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
timokoesters
55079c3d1e Fix hostile npcs new target selection 2019-08-02 20:44:56 +02:00
Marcel Märtens
e4a9721588 fixed #211 - host specs-idvs on gitlab.com 2019-08-02 10:16:55 +02:00
jshipsey
13310ab9ca improved animations and movement 2019-08-01 23:57:26 -04: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
Piotr Korgól
ec550620ad Add a health bonus for level ups, fix pets 2019-08-01 18:56:08 +02:00
Songtronix
52ffa02467 fmt 2019-08-01 17:07:42 +02:00
Joshua Barretto
9bc006dee1 Add a few extra items to the inventory by default 2019-08-01 09:13:34 +01: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
Joshua Barretto
995090d2d4 Added item drops 2019-08-01 09:12:00 +01:00
Joshua Barretto
b3cae2f3dd Added better item manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
fc49293874 Clickthrough on items 2019-08-01 09:09:26 +01:00
Joshua Barretto
31f8794c39 Started work on inventory manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
123a78552a Fixed block-hopping on edges, added correct inventory slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
5bb7998d5a Added inventory sync messages and InventoryUpdate component 2019-08-01 09:09:26 +01:00
Joshua Barretto
a7fc872f1c Added Default impl for Inventory 2019-08-01 09:08:59 +01:00
Joshua Barretto
fde6ec35cd Fixed Inventory::remove method 2019-08-01 09:08:59 +01:00
Acrimon
3f85f35084 Fix lockfile. 2019-07-31 11:45:23 +02:00
Acrimon
dadcf27098 Fixed missing import. 2019-07-31 11:41:29 +02:00
Acrimon
9fbf710cc9 Swapped some rarely use storages. 2019-07-31 11:41:29 +02:00
Acrimon
8be62be980 Formatted code. 2019-07-31 11:40:58 +02:00
Acrimon
03253d3cc0 Switch everything to IDVStorage (No tuning yet.) 2019-07-31 11:40:58 +02:00
timokoesters
b695a63e98 Send different physics components individually 2019-07-30 13:35:16 +02:00
timokoesters
c6034bf450 Use Last<C> to check if a physics component changed 2019-07-30 08:32:03 +02:00
Monty Marz
5cfc60da50 Small chat fixes 2019-07-29 14:40:46 +00:00
Acrimon
ee49ebe807 Update rand, log and scan_fmt 2019-07-29 13:42:26 +00:00
timokoesters
5aa864ee58
Update most dependencies 2019-07-28 22:47:23 +02: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
Piotr Korgól
5c84508015 Get EXP for killing NPCs and Players, properly show EXP bar 2019-07-26 20:51:40 +02:00
Piotr Korgól
b1aace0110 Add Level and Exp component 2019-07-26 16:44:59 +02:00
tommy
95b5f4acfb Added private, broadcast, and game_state messages 2019-07-26 07:29:37 -04:00
tommy
ea0bbe7e47 Rebase fixes 2019-07-26 07:29:37 -04:00
tommy
cc6aa6f33d Adds colour to tells in chat box #194 2019-07-26 07:29:37 -04:00
Nero
53086cb3b2 Nero/light offsets 2019-07-25 20:51:20 +00: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
Pfauenauge90
870229cd1c chests, human female head changes 2019-07-24 02:50:19 +02:00
Pfauenauge90
3559926a02 MOAR Pumpkins! 2019-07-24 02:50:19 +02:00
Pfauenauge90
495311de2d added lanterns and potions 2019-07-24 02:50:18 +02:00
Vechro
e37ca1d1f3 formatting 2019-07-24 02:50:18 +02:00
Vechro
6478c4ec69 Add campfire 2019-07-24 02:50:18 +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
dd84c6698b Fixed infinite NPC jumping 2019-07-21 19:22:49 +01:00
Joshua Barretto
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Songtronix
de2dbcef45 add global git hash constant 2019-07-21 17:45:31 +00:00
Joshua Barretto
d4821b8de8 Better fog 2019-07-21 00:32:36 +01:00
Joshua Barretto
1d21359337 Removed warning on OoB block modification 2019-07-20 19:08:28 +01:00
Joshua Barretto
ce327445a7 Send block diffs instead of entire chunks on block change 2019-07-20 16:41:03 +01:00
Songtronix
ed0d842e57 Mark InvalidAlias Message as to be done 2019-07-17 18:32:01 +02:00
Songtronix
b41508f025 generalise errors based on zests suggestion 2019-07-17 18:32:01 +02:00
Songtronix
b6c8bdc223 add configurable max player count 2019-07-17 18:32:01 +02:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
Joshua Barretto
e7dd151833 Added fruit trees 2019-07-09 17:08:43 +01:00
Joshua Barretto
bbd7f579d2 Fix for clipping 2019-07-09 15:07:53 +01:00
Joshua Barretto
9f6f9cb25f Fixed block snapping at lower framerates 2019-07-09 14:04:30 +01:00
Joshua Barretto
0f0f28284c Added 'perfect' collisions 2019-07-09 13:37:51 +01:00
Joshua Barretto
6bb48760d7 Fixed jittering collision bug 2019-07-09 11:51:00 +01:00
Joshua Barretto
879789ecc4 Fixed acacia colours 2019-07-08 20:28:48 +01:00
Joshua Barretto
c2a11ed6b2 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Justin Shipsey
1c10ff756f Holding weapon while running/jumping/standing 2019-07-06 19:00:05 +00:00
Piotr Korgól
04d3c077d0 Remove printlns 2019-07-03 22:38:28 +02:00
timokoesters
a702f7258a Fix building 2019-07-03 21:28:07 +02:00
Piotr Korgól
7f08377001 Sync CanBuild component, fix /build messages 2019-07-03 21:28:07 +02:00
Piotr Korgól
bf748ae742 Add CanBuild component, Block placing client messages and build mode command 2019-07-03 21:28:07 +02:00
Sheldon Knuth
6d624e96a6 fix the missing set_playing(true) in AudioPlayer::load() to prevent infinity thread loop & adopt std::sync::{Mutex, Condvar} for accurate thread blocking. 2019-07-03 17:23:24 +00:00
Imbris
4a821446b8 Fix common::asset doc test 2019-07-03 05:17:46 -04:00
Imbris
d2f8c47361 Pass BufReader to Asset::load() 2019-07-03 05:02:01 -04:00
Songtronix
0c3d693561 clean warnings from voxygen/hud 2019-07-02 21:25:07 +00:00
timokoesters
f5da167ce5
Fix warnings and clippy recommendations in common 2019-07-02 15:48:25 +02:00
Joshua Barretto
a72c54011a Fixed relative path of current_dir 2019-07-02 13:52:51 +01:00
Joshua Barretto
107f5caa34 Revamped asset directory search system 2019-07-02 13:52:51 +01:00
Sheldon Knuth
cdda20a1e8 hotfix on assets_folder issue by increasing the depth to 3. 2019-07-02 19:43:38 +08:00
Sheldon Knuth
d75d632279 Add mpmc support to audio-base. 2019-07-02 11:29:00 +08:00
Piotr Korgól
a66dc9a24f Add /health command 2019-07-01 20:07:30 +00: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
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
2ce5c5881e combat run/jump/idle animation states 2019-06-30 18:53:44 -04:00
Joshua Barretto
e4dc145f17 Merge branch 'zesterer/small-fixes' into 'master' 
More small fixes

See merge request veloren/veloren!271
 2019-06-30 22:52:21 +00:00
Joshua Barretto
0de505b74c fmt 2019-06-30 23:46:55 +01:00
Joshua Barretto
14d9071670 Fixed minor physics bugs 2019-06-30 23:46:46 +01:00
timokoesters
370e7db1ee
Fix death 2019-06-30 22:29:00 +02:00
Joshua Barretto
b35832c37d Prevent movement in unloaded chunks 2019-06-30 19:54:13 +01:00
Joshua Barretto
2985f94751 Prevented stalling when jumping before a block-hopping 2019-06-30 19:54:13 +01:00
timokoesters
7fec42ce2c
Fix controls 2019-06-30 19:48:38 +02:00
timokoesters
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02:00
Joshua Barretto
af755c0964 fmt 2019-06-29 22:47:24 +01:00
Joshua Barretto
f2df3a9d18 Block-hopping fix, better dusk shaders 2019-06-29 22:47:24 +01:00
Joshua Barretto
f1ba97ae7a Merge branch 'timo-rolling-fix' into 'master' 
Rolling bugs + NPC bugs + "Impossible" bug

See merge request veloren/veloren!265
 2019-06-29 21:47:05 +00:00
timokoesters
ccbacabd2f
Make agents use controller correctly 2019-06-29 22:51:22 +02:00
timokoesters
d235374d8e
Fix npc and death bug 2019-06-29 22:43:44 +02:00
timokoesters
5fcf6ededa
magnitude_squared everywhere, actionstate everywhere, constant for moving 2019-06-29 22:11:21 +02:00
timokoesters
610c86a3b9
Animation fixes 2019-06-29 21:01:27 +02:00
timokoesters
9f83533741
Fix invisible characters 2019-06-29 20:24:07 +02:00
timokoesters
c80351f6ca
Fix double roll bug 2019-06-29 19:49:51 +02:00
Joshua Barretto
324de39bfe fmt 2019-06-29 16:48:43 +01:00
Joshua Barretto
0c918c835f Prevented invalid username usage 2019-06-29 16:48:43 +01:00
Joshua Barretto
905b3d6f45 Prevented block-hopping when not on ground 2019-06-29 16:48:43 +01:00
timokoesters
b0ea959f67
Remove animation syncing (does not fix any known bug) 2019-06-29 17:09:38 +02:00
timokoesters
5a41a58c0a
End roll when going too slow 2019-06-29 14:10:52 +02:00
timokoesters
fe6f627d42
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00
Mckol
5ffa79d07d Added the standard linux asset path and an enviroment variable for configuring it 
The variable is VELOREN_ASSETS
 2019-06-28 19:50:11 +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
acb184e15d Made physics cheaper still 2019-06-27 15:37:33 +01:00
Joshua Barretto
6444ba1933 Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling 2019-06-27 15:21:41 +01:00
Joshua Barretto
cdb405d7b8 Made physics fps-independent 2019-06-26 22:43:47 +01:00
Joshua Barretto
46fce696a2 Better path noise, better shadows 2019-06-26 19:14:12 +01:00
Joshua Barretto
b987bda9ce Stronger shadows, fewer cliffs in oceans 2019-06-26 19:14:12 +01:00
Joshua Barretto
d0b38e9875 Worldgen performance improvements, better sun 2019-06-26 19:14:12 +01:00
Joshua Barretto
9279611d6d Added longer day/night cycle, /time command 2019-06-26 19:14:12 +01:00
Joshua Barretto
7b7d843d0f Comments and fmt 2019-06-26 11:53:43 +01:00
Joshua Barretto
4a340f69b5 Camera clipping and block-hop fix 2019-06-26 11:53:43 +01:00
Joshua Barretto
5decd48db6 Used velocity bias for collision correction 2019-06-26 11:53:43 +01:00
Joshua Barretto
6258035a4d Added attempts counter to prevent infinite collision loops 2019-06-26 11:53:43 +01:00
Joshua Barretto
44f4031e58 Resolved collision bugs with prioritised collision system 2019-06-26 11:53:43 +01:00
Joshua Barretto
ae168711d7 Added configurable details 2019-06-26 11:53:43 +01:00
Joshua Barretto
0d984a5671 Fixed collision bugs 2019-06-26 11:53:43 +01:00
Joshua Barretto
af432ec510 Calculate delta time properly, fix low fps collision issues by decreasing max dt 2019-06-26 11:53:43 +01:00
Joshua Barretto
2c24ba7776 Fixed block-hopping, block-snapping, added interpolation to figures 2019-06-26 11:52:36 +01:00
Joshua Barretto
7a1359961c Removed block-hopping, fixed collisions 2019-06-26 11:52:36 +01:00
Joshua Barretto
285cf2f973 Added proper 3D collisions 2019-06-26 11:52:36 +01:00
Joshua Barretto
62f148b46f Network fix for 32-bit 2019-06-16 22:59:25 +01:00
Joshua Barretto
9ad2feb037 Ignore ForcedUpdate insertion 2019-06-16 20:53:10 +01:00
timokoesters
eb10389eb6
cargo fmt 2019-06-16 19:59:16 +02:00
timokoesters
f0e6e76423
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +02:00
jshipsey
8e019cdbec
lowered roll duration 2019-06-16 19:59:14 +02:00
timokoesters
14ff033770
Fix glider 2019-06-16 19:59:14 +02:00
timokoesters
2afc45617d
More input validation 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
timokoesters
ae081b8f67
Make roll timed 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
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
955c20fa61
Remove crun and cidle components and inputs 2019-06-16 19:57:04 +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
Cody
1f6c1188bc
Removes input sys, moves code to combat and phys 2019-06-16 19:57:03 +02:00
timokoesters
b947d78dac
Improve organization of controls 2019-06-16 19:57:03 +02:00
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
132d1a67a6 Merge branch 'zesterer-worldgen-stuff' into 'master' 
Worldgen stuff

See merge request veloren/veloren!217
 2019-06-16 10:46:59 +00:00
liids
f726d755b7 fix formatting 2019-06-15 13:48:14 +02:00
Joshua Barretto
a9d30bbfb6 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
liids
c859371ddb Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Joshua Barretto
30b668d0cc Added dynamic tree colours 2019-06-13 11:59:05 +01:00
Joshua Barretto
9fed2c1534 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Joshua Barretto
c445e76afa Fixed usize size issue for 32-bit platforms 2019-06-13 11:59:05 +01:00
Joshua Barretto
cf193a97c4 Set default case for block type opacity 2019-06-13 11:59:05 +01:00
Imbris
8dcf030bd8 Use Instant and running compensation in clock 2019-06-09 14:14:02 -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
afd983f6f8 Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
1b5d2d468b Made idx_for use idx_for_unchecked internally 2019-06-06 07:42:59 +01:00
Joshua Barretto
9da2d82197 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
9a8552d5fb Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
06201c7353 fmt 2019-06-05 20:52:51 +01:00
Joshua Barretto
92f2d36b0c Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Louis Pearson
4cf13cc588 Integrate forces *after* velocity is applied 2019-06-04 12:14:10 -06:00
Louis Pearson
84ac965240 Normalize move_dir only if the magnitude is greater than one 2019-06-04 10:13:40 -06:00
Louis Pearson
52764376ae Use constants and normalized move direction 2019-06-04 10:09:34 -06:00
Louis Pearson
82aabf242a Add a function for integrating forces 2019-06-04 09:42:31 -06:00
Louis Pearson
c7a2ecd1f2 Adjust gliding speed 
Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1
 2019-06-04 07:57:12 -06:00
Louis Pearson
e2d96cc7e0 Add CollisionShape, move friction calculations to phys 
Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030
 2019-06-04 07:57:12 -06:00
Louis Pearson
afc5199b63 Remove z < 0 hack 
Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0
 2019-06-04 07:55:49 -06:00
Ahmed Ihsan Tawfeeq
e98eff613b Fixed bug in loading JSON assets 2019-06-04 12:39:46 +00:00
Forest Anderson
4548ec3bf9 Merge branch 'randomized-npc-names' into 'master' 
Added randomized NPC names veloren/veloren#133

Closes #133

See merge request veloren/veloren!207
 2019-06-04 05:23:25 +00:00
scorpion9979
b66fbce99d Cleaned code 2019-06-04 01:10:59 -04:00
scorpion9979
7bfd9464c9 Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
7919442d3d Implemented asset system for caching json data 2019-06-04 01:10:59 -04:00
scorpion9979
29f230d23e Cleaned code 
Refactored code for readability
 2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq
eb80459872 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -04:00
Joshua Barretto
3a1221068f Merge branch 'voxel-shadows' into 'master' 
Shadows, deserts, snow, caves

See merge request veloren/veloren!198
 2019-06-03 22:13:10 +00:00
Joshua Barretto
e2182b1a68 Added basic light 2019-06-03 22:50:47 +01:00
Cody
692b216651 Fixes a bug where animals continually jumped after their target was any height above them, even once the target was no longer above them. 2019-06-03 20:09:18 +00:00
Timo Koesters
930bc91174 Merge branch 'fix-server-info' into 'master' 
Add server info and player list to client

See merge request veloren/veloren!197
 2019-06-02 14:45:41 +00:00
Cody
04d4dc1da5
Reverts one erroneous change, further corrects another comment. 2019-06-01 00:52:20 -04:00
Cody
8562a09595
cargo fmt 2019-05-31 16:36:24 -04: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
6c76667356
Addresses more naming schemes and typos. 2019-05-31 16:36:24 -04:00
timokoesters
c10a43f541 Add server info 
Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710
 2019-05-28 22:25:46 +02:00
Forest Anderson
2fc4e9a2f8 Merge branch 'enemies' into 'master' 
Enemies

See merge request veloren/veloren!186

Former-commit-id: f920608508868119aad286cbe45599342dc1942b
 2019-05-28 19:08:02 +00:00
Joshua Barretto
8407908af2 fmt 
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
 2019-05-28 19:59:32 +01:00
timokoesters
5c48330460 Fix moving after death (again) 
Former-commit-id: 1c46fed1f5d9a74bcf926354b3b4efd442f5b5bc
 2019-05-28 18:37:49 +02:00
Marcel
b5b61462ee Merge branch 'event-chat-messages' into 'master' 
Event chat messages

See merge request veloren/veloren!188

Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7
 2019-05-28 10:45:24 +00:00
jshipsey
6cb1a75b93 speed tweak 
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
 2019-05-27 19:48:44 -04:00
Joshua Barretto
bfc70f4d78 Sort of fixed enemy freezes 
Former-commit-id: 30933b3ff7d16428a107ade6163cb83562668b66
 2019-05-28 00:04:25 +01: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
timokoesters
2008400169 Implement killer name in chat 
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
 2019-05-27 21:47:19 +02:00
timokoesters
a6439984be Add connect, disconnect and kill messages 
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
 2019-05-27 19:45:43 +02:00
Joshua Barretto
baf740a289 Added enemies 
Former-commit-id: 2c07c9e52a7cbfb85508e7098c528bddd9b12997
 2019-05-27 12:18:14 +01:00
Imbris
de4d1a0e06 Fix pet spawning leading to NaN move_dir 
Former-commit-id: ac68702bfdb482f32967d96e4b1da2b0ffc4e4c4
 2019-05-26 11:24:26 -04:00
jshipsey
7aab509701 rebase with combat merge 
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
 2019-05-26 11:02:01 -04:00
jshipsey
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
timokoesters
64b00f41f4 Fix invisible chars 
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
 2019-05-26 16:04:44 +02:00
timokoesters
746e286b5b Fixes 
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
 2019-05-26 00:00:38 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more 
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
 2019-05-25 23:46:56 +02:00
timokoesters
f4434013db Fix clear_terrain not changing Changes 
Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa
 2019-05-25 23:21:40 +02:00
timokoesters
73f29e3716 More comments 
Former-commit-id: 762d6437fa341a33ee80088e2c5dbbdf96387df0
 2019-05-25 23:21:40 +02:00
timokoesters
15d1a789d6 Better formatting 
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
 2019-05-25 23:21:39 +02:00
timokoesters
3697c47e33 Change client_state_pending to ClientState::Pending 
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
 2019-05-25 23:21:39 +02:00
timokoesters
1dbca8b994 Fix respawn position 
Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9
 2019-05-25 23:21:39 +02:00
timokoesters
1826a2b4f9 Implement fast respawn 
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
 2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8 Implement hit time delay 
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
 2019-05-25 23:21:39 +02:00
timokoesters
ad3b8dffa1 Limit attack direction 
Former-commit-id: b132f01f86814d2f8dd10d6d1454b6e2a95595f8
 2019-05-25 23:21:39 +02:00
timokoesters
f5751d65b1 Fix terrain not loading 
Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8
 2019-05-25 23:21:39 +02:00
timokoesters
30bf1cde10 Add knockback 
Former-commit-id: a703eb937ef7094a085548ca3197a575059855a0
 2019-05-25 23:21:38 +02:00
timokoesters
a0918d11b6 Fix red effect 
Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7
 2019-05-25 23:21:38 +02:00
timokoesters
ad5dcb4158 Make use of states in char-selection 
Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04
 2019-05-25 23:21:38 +02:00
timokoesters
fc39356cde Use correct time 
Former-commit-id: df33e802ee46f9ebe190be705ff8d81f856024e0
 2019-05-25 23:21:38 +02:00
timokoesters
8af3ca5317 Fix animations 
Former-commit-id: 20285b42be6f1858105cc4287e357ea254a8ce35
 2019-05-25 23:21:37 +02:00
timokoesters
b3e4ca0a5d Implement killing 
Change animation history to animation
Add attack input event
Implement killing with ecs systems for damage and death
Sync attack properly
Sync deaths


Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e
 2019-05-25 23:21:37 +02:00
Joshua Barretto
0bb217d53f Added docs to assets::load_map 
Former-commit-id: 50397d3c5d8c30ea392b784d9309d0e2ecb28f73
 2019-05-25 09:38:30 +01:00
Joshua Barretto
92391883a9 fmt 
Former-commit-id: 689464ed1009ebfd74769fa113fc7b433ea62bbd
 2019-05-25 06:54:47 +01:00
Joshua Barretto
c8ba5d9f89 Basic pine tree spawning 
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
 2019-05-25 05:51:45 +01:00
Joshua Barretto
4d73f38e6d Refactored worldgen sampling, added cache layer 
Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5
 2019-05-25 05:51:45 +01:00
Joshua Barretto
86bb277116 Added snow to mountains, fixed hash sub-chunk allocation failure 
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
 2019-05-25 05:51:45 +01:00
Joshua Barretto
cafbb45e52 Small worldgen fixes and hash chunk optimisation 
Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c
 2019-05-25 05:51:45 +01:00
jshipsey
f94a8b636d restored previous animations with new bone setup 
Former-commit-id: e507dba772d931e3ddebd0c4ecc8e038521a2e3e
 2019-05-24 18:51:33 -04:00
jshipsey
5049b9a2ae attack state 
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
 2019-05-24 18:33:55 -04:00
Joshua Barretto
fc25dc8c7f fmt 
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
 2019-05-21 23:31:38 +01:00
Joshua Barretto
0c78264ebc Added spawn point 
Former-commit-id: 04ea38df61d3610d679368166de220243ef1bfba
 2019-05-21 23:04:39 +01:00
Joshua Barretto
feece604be Restarted worldgen 
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
 2019-05-21 22:51:41 +01:00
Joshua Barretto
a0dfa3fddc Added basic mountain/valley worldgen 
Former-commit-id: 5a45f18fcdf523841ee8433ba2ff0b8765eadf3a
 2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen 
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
 2019-05-21 22:51:41 +01:00
Joshua Barretto
b48b9f0141 Attempted fix of deltatime bug 
Former-commit-id: d287bbf541dd318a7034f1e3ad4d9a167ac3c344
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen 
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
 2019-05-21 22:51:41 +01:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01:00
Louis Pearson
d55e803ab5 Use PathBuf to load files 
Former-commit-id: b72084fab1b8faeabc47eee927654f963643bb78
 2019-05-18 13:30:52 -06:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Piotr Korgól
0e2b09a5f8 Create a skeleton for the Inventory system and Item system 
Former-commit-id: 2579b70257ee9faa6d8614c33677ad0fc3c77a0d
 2019-05-18 16:46:14 +00:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
5a2c7a7813 Removed accidental println 
Former-commit-id: a203e8105cd42463b9a72245e1623dde68874571
 2019-05-17 22:55:50 +01:00
Joshua Barretto
7174830279 fmt 
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
 2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7 Added chonks 
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
 2019-05-17 18:44:30 +01:00
Joshua Barretto
fa052a22b7 More lenient max deltatime to avoid physics lag 
Former-commit-id: bdd4a9d634f9aa1e52ab3885e5b8a49348011760
 2019-05-17 13:39:40 +01:00
Joshua Barretto
3940e73b31 Stopped syncing time 
Former-commit-id: 8453a8f1c2361b1e6b5bb7f11470c33f2c0f910b
 2019-05-17 00:26:18 +01:00
Joshua Barretto
db4be8e492 Updated sphynx 
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
 2019-05-17 00:05:46 +01:00
Joshua Barretto
7b09070fc8 fmt 
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
 2019-05-16 20:23:45 +01:00
Joshua Barretto
a0e685c03f Improved falling glider physics 
Former-commit-id: 752c1291c7d38282312446c5391c2fb4fa7cbf6e
 2019-05-16 14:13:28 +01:00
Joshua Barretto
bb95f5bf78 Added correct gliding animation calculation 
Former-commit-id: 625310820c9cf7a1d37401875db43b5b597eb590
 2019-05-16 12:04:42 +01: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
Joshua Barretto
7ac973623f Fixed friction 
Former-commit-id: d9ac7fa7fb98c2ac829470fa8deeb314cc0f15f6
 2019-05-15 13:26:14 +01:00
Joshua Barretto
5c57568d31 Fixed physics 
Former-commit-id: b4b208754e38aba2150efe99d319638910f64904
 2019-05-15 13:26:14 +01:00
Joshua Barretto
8ef8c178d7 Added test gliding 
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
 2019-05-15 13:26:14 +01:00
Joshua Barretto
e8b6e120dc Fixed pet spawning bug 
Former-commit-id: 78dcd034940a4de1ce7d66a79d9134be6ee281f2
 2019-05-15 13:26:14 +01:00
Joshua Barretto
1209f0393d Added figure colour to shader and health component 
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
 2019-05-15 13:26:14 +01:00
Louis Pearson
85e97e16d3 Change vec<u8> to BufReader 
Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155
 2019-05-15 13:24:32 +01: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
Joshua Barretto
0b1ea359fa Adjustments to VolMap 
Former-commit-id: 53ba7185102e7ff17825891d02bd0e26e5fe1076
 2019-05-13 11:06:59 +01:00
Joshua Barretto
edfd2290eb Massively sped up VolMap offset calculations 
Former-commit-id: 8f3cdf57a77691ca60c0921bc86a79c8cfe36539
 2019-05-13 11:06:58 +01:00
Joshua Barretto
216819ca92 fmt 
Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a
 2019-05-13 11:06:58 +01:00
Joshua Barretto
761c6e9cf8 Switched to actor system 
Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc
 2019-05-13 11:06:58 +01:00
sxv20_
f600eca072 start fixing chunk rendering, noticed stack overflow crash 
Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf
 2019-05-13 11:03:47 +01:00
sxv20_
e20c2a1e00 Move VolMap to HashMap<_, Arc<Chunk>> 
Former-commit-id: e209891596acbb1705876a1cb7ccce3ac2fe2d45
 2019-05-13 11:03:47 +01:00
sxv20_
a23f9d90ea cache a chunk while cloning to increase performance (?) 
Former-commit-id: 69c1fa67b13a8de49f2c73e9526f548779e988c1
 2019-05-13 11:03:47 +01:00
jshipsey
98380df9b2 pipeline fix 
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
 2019-05-12 22:39:16 -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
Forest Anderson
413b67e6ad Merge branch 'master' into 'master' 
Fixes match pattern code that rendered an actionable branch unreachable.

See merge request veloren/veloren!120

Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d
 2019-05-12 20:40:09 +00:00
Forest
3d14d791cf Cleaned code 
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
 2019-05-12 15:57:39 -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
Joshua Barretto
fc0f2f0801 Added option to not stop raycasting on error 
Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2
 2019-05-12 14:03:08 +01:00
Joshua Barretto
266101c90d Added basic pets 
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
 2019-05-12 14:03:08 +01:00
timokoesters
bdf241bf24 Add TODO comment 
Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e
 2019-05-11 21:48:05 +02:00
timokoesters
4ce1f9ee54 Temporary fix for falling into void 
Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76
 2019-05-11 21:38:05 +02:00
MidgeOnGithub
bbe971de7f Fixes match pattern code that rendered an actionable branch unreachable. 
Former-commit-id: 69f562bf54307ab7402dabe52e07a7a46ea4c4b1
 2019-05-10 23:38:19 -04: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
cf4e02252a Smartened up terrain generation 
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
 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
Joshua Barretto
3705f9a871 Added anim_time to animations 
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
 2019-05-09 18:57:47 +01:00
Joshua Barretto
e6a40bbda2 Added jumping and Jump animation state 
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
 2019-05-09 18:57:47 +01:00
Joshua Barretto
9ebe3c3e6f Added a delta time cap to avoid missing important physics events 
Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
 2019-05-09 18:57:47 +01:00
Joshua Barretto
342ea6aa65 Significantly upped view distances 
Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f
 2019-05-09 18:57:47 +01:00
Joshua Barretto
3cd48ba468 Added lz4 compression to networking 
Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
 2019-05-09 18:57:47 +01:00
Joshua Barretto
33e93ef25f Added basic byte XOR checksum 
Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
 2019-05-09 18:57:47 +01:00
Forest Anderson
8b4d998943 Merge branch 'fix-doc-test' into 'master' 
Fix doc test

See merge request veloren/veloren!112

Former-commit-id: 7330a2022ac892a60a7c9df7ac42d7b054622301
 2019-05-08 23:06:07 +00:00
Imbris
470e63a691 Remove or uncomment commented code 
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
 2019-05-07 21:59:35 -04:00
timokoesters
24161d4521 Fix doc test 
Former-commit-id: e08cb9fdfca5b3d12a34220ef4af042d6fb913e6
 2019-05-07 20:59:06 +02:00
timokoesters
7132cfdf5b Fix doc test 
Former-commit-id: e347ad79dd229d72f70820189e6ae6011868c5ef
 2019-05-07 20:36:07 +02:00
Imbris
81c5a070c5 move conrod font out of common 
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
 2019-05-07 02:25:26 -04:00
Imbris
eb3d8310f8 rustfmt 
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
 2019-05-07 01:40:03 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style 
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
 2019-05-07 01:08:27 -04:00
timokoesters
53a78e1c2f Remove unnecessary debug from try_open_with_path 
Former-commit-id: 891d24c247d15f406ebd24ca923b62e6f43bf9ea
 2019-05-07 01:00:48 -04:00
Imbris
cb507ebfa0 small comment 
Former-commit-id: 13e443edbb52e1c1423446168235c986b8999de0
 2019-05-07 00:59:06 -04:00
Imbris
8232ffbd33 add load_expect, change error reporting 
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
 2019-05-07 00:59:05 -04:00
Imbris
33fbcd1e93 formatting tweaks 
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
 2019-05-07 00:48:39 -04:00
Imbris
990b42a6b0 remove poison err & Segment Asset impl, cleanup 
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
 2019-05-07 00:47:22 -04:00
Imbris
1d5020634d revamp asset system with a global singleton cache 
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
 2019-05-07 00:44:44 -04:00
timokoesters
c7dd3e96cc Start work on image_ids! and asset loading 
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
 2019-05-07 00:28:05 -04:00
robojumper
b2c2d89447 Run cargo fmt 
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
 2019-05-05 17:54:08 +02:00
robojumper
647d1dcc9c Smoother and terrain-aware camera 
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
 2019-05-05 17:44:56 +02:00
Imbris
7a192a9466 add nightly feature back for specs -> shred 
Former-commit-id: b483f75c10cc47faa66ab8063f7747e654068634
 2019-05-01 14:46:06 -04:00
Imbris
f0b0b83cc8 Store thread pool in State, Remove unnecessary dep 
Former-commit-id: cbce09915267f264801c174817b97ed3528715fd
 2019-05-01 14:10:43 -04:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs 
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
 2019-04-29 20:43:04 +02:00
Joshua Barretto
e4d6d96afc Remove post debugging 
Former-commit-id: 4a82bf8b6178fb88d5a6ea93706fb4e97ac2256d
 2019-04-25 20:25:22 +01:00
Joshua Barretto
5e38eee8d4 Added chunk deletion 
Former-commit-id: 63c29e43c4dc28097aaf4e0ff72977c7db5cc28f
 2019-04-25 20:08:26 +01:00
Joshua Barretto
f136a63f69 Adjusted terrain loading and meshing performance 
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
 2019-04-25 17:52:11 +01:00
Joshua Barretto
0b0c71592c Fixed orientation issue 
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
 2019-04-25 17:52:11 +01:00
Joshua Barretto
fc8b7e9750 Worked on improving networking and terrain 
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
 2019-04-25 17:52:11 +01:00
timokoesters
927f3a12ba Fix ray issue after max_iteration 
Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
 2019-04-25 17:52:11 +01:00
timokoesters
c37db43580 Fix ray position 
Former-commit-id: 772d5652d44c9467d22c9c93547ac154ce3110b3
 2019-04-25 17:52:11 +01:00
Joshua Barretto
9105bf0811 Added better terrain collisions 
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df Added raycasting (needs testing) and basic character terrain collision 
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f9f434a1c2 Started work on worldgen 
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
 2019-04-25 17:52:11 +01:00
timokoesters
701755a8e2 Add disconnect handling 
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
 2019-04-23 14:01:16 +02:00
timokoesters
3bf09f9f9c Handle errors with error_state instead of disconnect 
Former-commit-id: cad5bbf9a5bb22dc6adf81d248d85d6a5d6aa140
 2019-04-22 23:00:25 +02:00
timokoesters
06693136b6 Fixed names, debug and notify 
Former-commit-id: f58dedf7c4eb9b284982588fc6b19bbe3edb0391
 2019-04-22 23:00:24 +02:00
timokoesters
e9027c6433 Split connecting from registering 
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
 2019-04-22 23:00:24 +02:00
timokoesters
9a48e2fd42 Rename ClientState Connected -> Registered, Visitor -> Connected 
Former-commit-id: 34f6726203b7d20b42937a02f48d8920ca3f1d7a
 2019-04-22 23:00:23 +02:00
timokoesters
07a2aab8a3 Rename Disconnected to Visitor 
Former-commit-id: aeb729a933cda380c03efe346347fc4dc0648dfb
 2019-04-22 23:00:23 +02:00
timokoesters
fc2e6c3624 Clean up client state code 
Former-commit-id: 2469a49abd23038838f6176b7f5cf0b303e8bee5
 2019-04-22 23:00:22 +02:00
timokoesters
794b9cafad Implement ClientStates 
Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2
 2019-04-22 23:00:22 +02:00
timokoesters
802c484a38 Make character model more variable 
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
 2019-04-22 23:00:21 +02:00
Joshua Barretto
779d50b6de Fixed clock 
Former-commit-id: 585000319073e06f6511b3ef2c3db1135167d9d4
 2019-04-22 17:50:18 +01:00
Joshua Barretto
247ba6621a Made NPC movement smoother 
Former-commit-id: 105908cf0118113408acd5ad7dce191fe405f88f
 2019-04-22 17:50:18 +01:00
timokoesters
91057edfac Remove .internal and .internal_mut 
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
 2019-04-22 10:24:27 +02:00
Imbris
1143c58e37 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -04:00
timokoesters
86898c26a0 Rename lastAnimation to last_animation 
Former-commit-id: 7eabea72ad5ee2cfed20b3927a828eb55fae8e33
 2019-04-17 22:44:10 +02:00
timokoesters
ec16153164 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
Joshua Barretto
6693d22ecd Fixed animation copypasta bug 
Former-commit-id: e4b06e4e7c50214c7d7d9cc618ea7f117dc78ccc
 2019-04-17 10:07:02 +01:00
Joshua Barretto
8029edde0b Moved animation determination to Control ECS system 
Former-commit-id: 6650bc4d882d3f6779f99afea2e05155ad008282
 2019-04-17 09:59:38 +01:00
Joshua Barretto
2c650f9cff Added basic agent AI 
Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05
 2019-04-17 01:39:39 +01:00
Piotr
ddb32eec30 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Joshua Barretto
c98d841890 Fixed physics sync 
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
 2019-04-15 00:29:28 +01:00
Joshua Barretto
f69ad40bd5 Fixed aspect on scene start, added more information to post errors 
Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1
 2019-04-14 16:05:51 +01:00
Joshua Barretto
7fc923f2a7 Rebased 
Former-commit-id: 017002bca2078f48998ecb412480492556082491
 2019-04-14 14:23:43 +01:00
Joshua Barretto
a444826f0b Fixed zombie network worker threads 
Former-commit-id: a8e74a9a8e42a0d5e1a79d87a1daf398e6294c73
 2019-04-14 14:23:43 +01:00
Joshua Barretto
413bdf44e5 Extended timeout on huge transfer test to avoid failure on debug 
Former-commit-id: 7fa49db2ce310ff83b0c7ba2c4525771f16e7842
 2019-04-14 14:23:43 +01:00
Joshua Barretto
9f5aab3564 Prevented postal workers spinning for too long 
Former-commit-id: e535f5745c817b7fd5f109711aaa65e6c78d6ecc
 2019-04-14 14:23:43 +01:00
Joshua Barretto
f4260706e6 Updated package versions 
Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
3112486005 Added partial chunk loading, package section to workspace Cargo.toml 
Former-commit-id: 4164daf4ccbe6695f664a44d0fce0ee10df39b8d
 2019-04-14 14:23:43 +01:00
Joshua Barretto
507c47e771 Rewrote netcode, added basic chunk synching 
Former-commit-id: e9f76f7fa9dbe0c81cd4c998bf0f0b3eec9235cb
 2019-04-14 14:23:43 +01:00
Joshua Barretto
f27b5fa975 Added server-side chunk generation 
Former-commit-id: 72e02f8ec711ec4fac3111b591c4b08086dee4e3
 2019-04-14 14:23:43 +01:00
Joshua Barretto
3d9f8105e6 Started work on server-side chunks 
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
 2019-04-14 14:23:43 +01:00
Joshua Barretto
62b91eb01b Integrated Sphynx 
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
 2019-04-14 14:23:43 +01:00
Imbris
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02:00
Marcel Märtens
251cccffe5 add simple interface to get assets from various locations 
Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a
 2019-04-13 03:40:59 +02:00
Pfauenauge
8ecb849970 Char Window, Mana, Health, Exp-Bar 
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
 2019-04-06 00:36:04 +02:00
Pfauenauge90
6ebff7ce2c Merged with UI-Input 
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
 2019-04-04 16:45:57 +02:00
Imbris
48d5c70b2a minor fixes 
Former-commit-id: 56d6b123d6def65b3f7660eea6490277597813b0
 2019-03-29 01:56:08 -04:00
Pfauenauge90
60df735e3b accessories tab 
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
 2019-03-28 23:03:39 -04:00
Joshua Barretto
3214164070 Working with upstream 
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
 2019-03-19 14:12:42 +00:00
Joshua Barretto
c75625f179 Physics update adjustment 
Former-commit-id: 10a8828b1ac496c7419672b88049fbda848d9d9d
 2019-03-19 11:35:38 +00:00
Joshua Barretto
ffc4e6ebd4 Improved State API design 
Former-commit-id: a32ab93409b1044fe2838f684d30ca2b963d4eb2
 2019-03-19 11:35:38 +00:00
Joshua Barretto
99bd0630b7 Added post refactor unit tests 
Former-commit-id: 66ea368de32dc6dfe22fc752476b71856e0588a0
 2019-03-19 11:35:38 +00:00
Joshua Barretto
664f28a972 Patched in netcode refactor 
Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386
 2019-03-19 11:35:38 +00: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
bb93f29522 Fixed client/server comms bug 
Former-commit-id: fffc9cbf59784e7e2c9c2d9a60b8f2520b6f41fb
 2019-03-19 11:35:38 +00:00
Tanner Donovan
d9f179b980 update Duration method calls 
Former-commit-id: 4343e30583f74094a73365465a1d1ca912b693e6
 2019-03-18 16:46:37 -07:00
Joshua Barretto
2e613178a0 Component sync + UID system 
Former-commit-id: 5ecddc0e1f9c1a15f99dd167b825178c972da062
 2019-03-04 19:58:58 +00:00
Joshua Barretto
ef333877ae Added Uid marker component 
Former-commit-id: b0aae7a8e6dd075996f3bee6cc7be29763f6cdaa
 2019-03-04 19:58:58 +00:00
Joshua Barretto
dbbcc1e80e Added basic networked communications, chat communication 
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
 2019-03-04 19:58:58 +00:00
Joshua Barretto
72e0cacfef Merge branch 'physics' into 'master' 
Player movement with basic physics ecs system

See merge request veloren/fresh!9

Former-commit-id: 87ca6d878c32b7fae9de9994ab2771129d76c747
 2019-03-02 19:51:37 +00:00
Imbris
33b8922aa4 move/name velocity constant, rename move_vec, simplify cam rotate_by() 
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
 2019-03-02 14:43:51 -05:00
Imberflur
6f5f80f749 add player movement with basic physics ecs system 
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
 2019-03-01 22:48:30 -05:00
Joshua Barretto
3f5782e993 Netcode usability improvements 
Former-commit-id: a0e0d0b6fd503b4de9c60d2fcb02562def98c75e
 2019-02-25 16:45:54 +00:00
Maciej Ćwięka
d011256542 Moved PostBox and PostOffice to separate files, finished implementing PostBox, started implementing PostOffice, fixups all over the place 
Former-commit-id: 7a891b8937498b534ad611d7ede29de01ba88ea7
 2019-02-19 16:59:50 +00:00
Joshua Barretto
8a37662cf0 Cleaned up codebase, added cursor grab toggle 2019-01-23 22:21:47 +00: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
8184bc6fc0 Added figures, segments, test .vox files, basic animation test 2019-01-13 20:53:55 +00:00
Joshua Barretto
b37a6b67f9 Added time of day, tick time, basic skybox shader and client to voxygen 2019-01-12 15:57:19 +00:00
Joshua Barretto
523db9f054 Started work on adding terrain 2019-01-02 19:22:01 +00:00
Joshua Barretto
819af1594f Initial structure 2019-01-02 17:23:31 +00:00