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
6,463 Commits 151 Branches 18 Tags 2.1 GiB
8eebcdfcd2
Commit Graph

957 Commits

Author SHA1 Message Date
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
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
bc1ccfc99b Fix first person weapon visible while not wielding 2019-09-06 18:22:26 +08:00
Imbris
52d84248ec Remove all warnings 2019-09-04 19:03:49 -04:00
Imbris
fc9c87878e Fix some warnings, cleanup comment 2019-09-03 23:09:29 -04:00
Imbris
8a994ada8e Remove derpy eyes :( , fix undead eye indices, fmt 2019-09-03 23:06:15 -04:00
jshipsey
ca4da22c7d fixing eyes, cleanup on offsets 2019-09-03 23:06:13 -04:00
jshipsey
178657c871 tweaked hair colors, head offsets, skin colors 2019-09-03 23:06:11 -04:00
Imbris
0ffc534df2 Add separate eye color lists for each race 2019-09-03 23:06:02 -04:00
Pfauenauge90
bdb95be5cc hair and skin colours 2019-09-03 23:05:59 -04:00
Imbris
c4999f5e9d adjust how figure head coloring is done 2019-09-03 23:05:58 -04:00
Imbris
7bebffb2af Add ron file for head offsets, segment unionizer 2019-09-03 23:05:52 -04:00
timokoesters
ecbf7cad5b Remove old code 2019-08-31 09:00:20 +02:00
timokoesters
9a832dd56b Move std::mem::discriminant into new method 2019-08-30 22:51:46 -04:00
timokoesters
77a48c61a1 Fix rolling for the player 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
15978d216b
Rename controller main, alt to primary, secondary 2019-08-31 00:13:45 +02:00
timokoesters
a95893e43b
Remove inventory::swap and improve inventory::insert 2019-08-31 00:09:25 +02:00
timokoesters
5d02d32ec6
Make inventory::get return a reference 2019-08-30 22:42:43 +02:00
timokoesters
082ccd7c46
Avoid right-ward shift 2019-08-30 22:32:47 +02:00
timokoesters
7e66fe792d
Return the item again if slot was not wrong 2019-08-30 21:03:49 +02:00
timokoesters
512d2d9a8e
Rename Teleport to Boost 2019-08-29 19:44:30 +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
yashaslokesh
be71aea20b Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types 
Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>
 2019-08-27 22:33:14 +00:00
timokoesters
869535e5a2
Rename tool strength/damage to power 2019-08-26 20:05:13 +02:00
timokoesters
e90f95bc75
Look in the direction of the camera 2019-08-26 13:12:38 +02:00
jshipsey
39bd888a7c
idle block animation 2019-08-26 13:12:38 +02:00
timokoesters
e7c61c30cc
Block when pressing right click while looking at the attacker 2019-08-26 13:12:37 +02:00
timokoesters
e42ffb362a
Remove unnecessary components 2019-08-26 13:12:37 +02:00
timokoesters
5d5ccd7b99
Move from state components to single CharaterState struct 
This makes split animations easy and improves overall code quality
 2019-08-26 13:12:34 +02:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Piotr Korgól
586bf5faff Add adminify command to temporarily give admin perms 2019-08-17 23:35:01 +02:00
Piotr Korgól
0221de484e Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
Piotr Korgól
6882170d6f Add Admins field to the settings file 2019-08-14 17:30:36 +02:00
Piotr Korgól
98c0692260 Add AdminPerms component, make some commands require it 2019-08-14 17:30:36 +02:00
telastrus
e4f2c73b85 undo unnecessary pub mod 
fixed comments

fixed other comment
 2019-08-06 22:46:25 -04:00
telastrus
0eafd42c0f fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Joshua Barretto
c7d2fbc20e Made humanoids glide when chasing 2019-08-04 09:21:29 +01:00
timokoesters
7365dbe9e6 Give xp depending on max hp and lvl of entity killed 2019-08-03 21:30:01 +02:00
Joshua Barretto
23cfe50455 Better health accessors methods 2019-08-02 20:49:48 +01:00
Joshua Barretto
677c5781ba Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01: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
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
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
c6034bf450 Use Last<C> to check if a physics component changed 2019-07-30 08:32:03 +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
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
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Songtronix
ed0d842e57 Mark InvalidAlias Message as to be done 2019-07-17 18:32:01 +02:00
Justin Shipsey
1c10ff756f Holding weapon while running/jumping/standing 2019-07-06 19:00:05 +00: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
timokoesters
f5da167ce5
Fix warnings and clippy recommendations in common 2019-07-02 15:48:25 +02:00
Piotr Korgól
a66dc9a24f Add /health command 2019-07-01 20:07:30 +00:00
jshipsey
cc548eb669 glider animation fix 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
370e7db1ee
Fix death 2019-06-30 22:29:00 +02:00
timokoesters
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02: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
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
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
timokoesters
f0e6e76423
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +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
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
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
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
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
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
15d1a789d6 Better formatting 
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
 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
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
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
jshipsey
5049b9a2ae attack state 
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
 2019-05-24 18:33:55 -04:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01: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
7b09070fc8 fmt 
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
 2019-05-16 20:23:45 +01:00
jshipsey
50fa3cf098 glide anim 
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
 2019-05-16 00:40:35 -04:00
Joshua Barretto
8ef8c178d7 Added test gliding 
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
 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
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
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
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
3d14d791cf Cleaned code 
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
 2019-05-12 15:57:39 -04:00
Joshua Barretto
266101c90d Added basic pets 
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
 2019-05-12 14:03:08 +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
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
timokoesters
802c484a38 Make character model more variable 
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
 2019-04-22 23:00:21 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02: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
62b91eb01b Integrated Sphynx 
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
 2019-04-14 14:23:43 +01: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
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
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
8184bc6fc0 Added figures, segments, test .vox files, basic animation test 2019-01-13 20:53:55 +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