Joshua Barretto
|
1209f0393d
|
Added figure colour to shader and health component
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
|
2019-05-15 13:26:14 +01:00 |
|
jshipsey
|
efc019f7a4
|
idle, run, jump animations
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
|
2019-05-15 00:24:36 -04:00 |
|
Joshua Barretto
|
49cc422dfa
|
Fixed quadruped animation selection
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
|
2019-05-14 12:37:05 +01:00 |
|
jshipsey
|
2a2b873f56
|
added skeleton, needs animation fix
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
|
2019-05-13 22:24:34 -04:00 |
|
Joshua Barretto
|
cf487589e2
|
Made model cache handle non-humanoids
Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1
|
2019-05-14 01:02:37 +01:00 |
|
jshipsey
|
732c43ce11
|
first quadruped changes
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
|
2019-05-13 19:43:10 -04:00 |
|
Joshua Barretto
|
67241fec31
|
Massively increased efficiency of terrain meshing, chunks generate from centre
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
|
2019-05-13 13:08:17 +01:00 |
|
Joshua Barretto
|
ee380782fb
|
fmt
Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2
|
2019-05-13 11:29:35 +01:00 |
|
Joshua Barretto
|
4f53be633e
|
sync
Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170
|
2019-05-13 11:15:03 +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_
|
592477752e
|
move sample() to returning VolMap, incomplete VolMap meshing code
Former-commit-id: 77d3db6c3bf28364089647802f83d2d00f3a152d
|
2019-05-13 11:03:47 +01:00 |
|
sxv20_
|
a5db1fd0a6
|
fix TODO (unnecessary mpsc clone)
Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89
|
2019-05-13 11:03:47 +01:00 |
|
sxv20_
|
c2a806910b
|
fix chunks not getting rendered once unloaded and reloaded, remove weightings
Former-commit-id: d98d1e9bb767d80173c531e8914163c1cc23d7fc
|
2019-05-13 11:03:47 +01:00 |
|
sxv20_
|
38da6af3c6
|
change remeshing queue from LinkedList to HashMap, add remesh weightings
Former-commit-id: 28f0826501539848ca97721aff5057ccb4599736
|
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
|
3d14d791cf
|
Cleaned code
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
|
2019-05-12 15:57:39 -04:00 |
|
Joshua Barretto
|
d8f6025b68
|
Added rendering to character selection menu
Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51
|
2019-05-12 14:03:08 +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 |
|
Joshua Barretto
|
54cc9e137a
|
fmt
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
|
2019-05-09 18:58:16 +01:00 |
|
Joshua Barretto
|
94fd0b1a22
|
Fixed running animation, changed movement physics
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
|
2019-05-09 18:57:47 +01:00 |
|
jshipsey
|
ac78d322d6
|
animation orientation fix, first jump
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
e5db851f30
|
Added FXAA to post-processing shader
Former-commit-id: 9cfdb3762b63688d1b59d65066c90355c7209c62
|
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 |
|
Imbris
|
eb3d8310f8
|
rustfmt
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
|
2019-05-07 01:40:03 -04:00 |
|
Imbris
|
99d6c92c8d
|
rebase
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
|
2019-05-07 01:39:32 -04:00 |
|
Imbris
|
8232ffbd33
|
add load_expect, change error reporting
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
|
2019-05-07 00:59:05 -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 |
|
robojumper
|
821ab80c5b
|
Add post-process pipeline
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
|
2019-05-06 10:22:47 +02: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 |
|
Forest
|
75f8a638f7
|
Ran clean code
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
|
2019-05-03 09:49:05 -04:00 |
|
Pfauenauge
|
c188affb4e
|
rebase
Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2
|
2019-05-03 13:48:53 +02:00 |
|
Forest Anderson
|
993388e56a
|
Ran fmt on codebase
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
|
2019-04-29 20:37:19 +00:00 |
|
timokoesters
|
fb0b0f682a
|
Fix duplicated code
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
|
2019-04-25 22:59:11 +02: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
|
f210de09df
|
Added raycasting (needs testing) and basic character terrain collision
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
|
2019-04-25 17:52:11 +01:00 |
|
Joshua Barretto
|
61afb98869
|
Foobar
Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22
|
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 |
|
jshipsey
|
bc5074a2b8
|
velocity tilt
Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753
|
2019-04-24 23:31:18 -04:00 |
|
jshipsey
|
9c15fa08a8
|
run animation incremental tweaks
Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318
|
2019-04-24 23:28:51 -04:00 |
|
jshipsey
|
9510edd148
|
velocity tilt
Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6
|
2019-04-24 23:26:22 -04:00 |
|
jshipsey
|
4d0660affb
|
run animation incremental tweaks
Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55
|
2019-04-24 23:25:05 -04:00 |
|
jshipsey
|
df39bcb2dc
|
velocity tilt
Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8
|
2019-04-24 23:25:05 -04:00 |
|
timokoesters
|
7baecff1f0
|
Clean up figure cache models when necessary
Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e
|
2019-04-23 13:59:16 +02:00 |
|
timokoesters
|
3bb7de61ef
|
Fix .internal()
Former-commit-id: 63207ee9bdc1fa31dcff0c5ad93c6a71857fe165
|
2019-04-22 23:00:25 +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 |
|
timokoesters
|
91057edfac
|
Remove .internal and .internal_mut
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
|
2019-04-22 10:24:27 +02:00 |
|
jshipsey
|
7778546b69
|
more rebasing
Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf
|
2019-04-20 19:34:40 -04:00 |
|
jshipsey
|
0137a83dd8
|
animattion tweaks
Former-commit-id: ea560ba0f06432d2d4f9d4f1906f77451a7f5ef7
|
2019-04-20 19:18:42 -04:00 |
|
jshipsey
|
78d7cfd89d
|
animation adjustments
Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6
|
2019-04-20 19:18:42 -04:00 |
|
Imbris
|
7fa37e0c2a
|
update asset loading to not use env
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
|
2019-04-20 18:02:48 -04: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
|
db527e64df
|
Improved camera attributes and focus
Former-commit-id: 223f85c884c063c5cbb7d6c9f9f5c4a8c62a7ffd
|
2019-04-16 20:22:04 +01:00 |
|
timokoesters
|
713b59aeff
|
Implement animation smoothing
Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df
|
2019-04-16 20:26:24 +02: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
|
824fb8a6c0
|
Fixed 1-frame animation bug
Former-commit-id: fc591de5026e35cab1ef72ce250b19cbe2fcec0e
|
2019-04-14 14:23:43 +01:00 |
|
Joshua Barretto
|
11630877e3
|
Moved figure rendering to a better place
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
|
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 |
|
Yeedo
|
b88dc1bbde
|
Updated mouse wheel zooming to use WindowEvent
Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe
|
2019-04-11 23:12:42 +01:00 |
|
Pfauenauge90
|
3f2a938735
|
Key Command Changes, Char Window
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
|
2019-04-09 18:30:13 +02:00 |
|
Pfauenauge
|
51e41ade07
|
Filepath fixes
Former-commit-id: b3134806904d8fb0b7fb1ee4dc05ea96af1474e8
|
2019-03-29 22:36:15 +01:00 |
|
Joshua Barretto
|
3214164070
|
Working with upstream
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
|
2019-03-19 14:12:42 +00:00 |
|
Joshua Barretto
|
e2f75c118e
|
Figure changes
Former-commit-id: c4cfb35c950f938cb8c7f8169518333db6364ad2
|
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
|
dbbcc1e80e
|
Added basic networked communications, chat communication
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
|
2019-03-04 19:58:58 +00:00 |
|
jshipsey
|
966fcc1709
|
quadruped testing
Former-commit-id: eb863aa33671032799b70833619ebb3d4d77c58a
|
2019-03-04 19:58:58 +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
|
c16a257ae3
|
Added server-cli, UI tests
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
|
2019-01-30 12:11:34 +00:00 |
|
Joshua Barretto
|
a1617e7b5c
|
Added window resize handling
|
2019-01-23 22:39:31 +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
|
c5a506dad2
|
Moved client to session type
|
2019-01-14 15:47:57 +00:00 |
|
Joshua Barretto
|
0a122431db
|
Restructured animation code
|
2019-01-14 14:40:22 +00:00 |
|
Joshua Barretto
|
86e70751e0
|
Moved to Skeleton and Animation traits
|
2019-01-14 14:18: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
|
b37a6b67f9
|
Added time of day, tick time, basic skybox shader and client to voxygen
|
2019-01-12 15:57:19 +00:00 |
|
Joshua Barretto
|
979f47420d
|
Added camera panning and cursor trapping
|
2019-01-12 13:56:34 +00:00 |
|
Joshua Barretto
|
45d5a0a396
|
Added cursor trapping, more documentation
|
2019-01-12 01:14:58 +00:00 |
|
Joshua Barretto
|
c9d877de7a
|
Added session, documented, improved structure
|
2019-01-11 23:18:34 +00:00 |
|