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
4,570 Commits 151 Branches 18 Tags 2.1 GiB
62005e9031
Commit Graph

4570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unknown
0de4b6b7f9 Makes anim hotload work for quadlow 2020-07-05 09:38:14 -04:00
Snowram
b1f4e4b9c1 Add new tusk ram model 2020-07-05 09:38:13 -04:00
Snowram
c22d543dd2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
1be42a8f85 Add tortoise mob 2020-07-05 09:38:13 -04:00
Snowram
016b05cf38 Add new grolgar model 2020-07-05 09:38:13 -04:00
Snowram
c7df12d2ea Set new lion model offsets, fix some jaws 2020-07-05 09:38:13 -04:00
unknown
4b493b196c Add asp mob 2020-07-05 09:38:13 -04:00
jshipsey
59777ee688 more quadmed run work 2020-07-05 09:38:13 -04:00
jshipsey
e362749fc7 more progress on on quad_med run 2020-07-05 09:38:13 -04:00
jshipsey
7d7ee11eef manifest, vox files 2020-07-05 09:38:13 -04:00
jshipsey
9f45d5525d tarasque work 2020-07-05 09:38:12 -04:00
Snowram
1ffefde739 Run anim progress 2020-07-05 09:38:12 -04:00
Snowram
1f5e0216c4 Tiger offsets, lion new model 2020-07-05 09:38:12 -04:00
jshipsey
967343ced6 finished quadlow run, positioning work on quadmed 2020-07-05 09:38:12 -04:00
Snowram
390f516e13 Homogenizes quadmed bones names 2020-07-05 09:38:12 -04:00
Snowram
9fec5f3d14 Add tiger mob 2020-07-05 09:38:12 -04:00
jshipsey
76354aa3cf small placement tweaks 2020-07-05 09:38:12 -04:00
jshipsey
6d9356d269 starting run anim 2020-07-05 09:38:12 -04:00
jshipsey
ccf939b4fd manifests, skeleton, basic placement 2020-07-05 09:38:12 -04:00
Snowram
c527484597 Add alligator, salamander and monitor npcs 2020-07-05 09:38:12 -04:00
Snowram
00b3301d6a Remove quad_low mobs from quad_medium 2020-07-05 09:38:12 -04:00
Snowram
fe1656931c Add legs to quadruped_medium 2020-07-05 09:38:12 -04:00
Snowram
72eb03ceb5 Add quadruped_low skeleton 2020-07-05 09:38:11 -04:00
Marcel
2a7a8b05e6 Merge branch 'network-lockless' into 'master' 
Network lockless

See merge request veloren/veloren!1153
 2020-07-05 09:17:29 +00:00
Forest Anderson
7ac5876743 Merge branch 'xvar/skills' into 'master' 
Initial implementation of skills and skill groups

See merge request veloren/veloren!1135
 2020-07-05 00:33:11 +00:00
Forest Anderson
3e830aa0ca Merge branch 'angel/add-spawn-training-dummy' into 'master' 
Added spawning test dummy

See merge request veloren/veloren!1142
 2020-07-04 19:24:02 +00:00
Forest Anderson
2d12f7c45d Added tests and documentation to skills.rs 2020-07-04 14:32:24 -04:00
Joshua Barretto
acd6690cb0 Merge branch 'qutrin/loot-table-fix' into 'master' 
Correctly load the loot table

See merge request veloren/veloren!1154
 2020-07-04 17:53:26 +00:00
Piotr Korgól
27440e16c4 Correctly load the loot table 2020-07-04 18:40:23 +02:00
Joshua Barretto
518edcb85c Merge branch 'qutrin/loot-table' into 'master' 
Implement a Lottery system

See merge request veloren/veloren!1147
 2020-07-04 15:53:37 +00:00
Ben Wallis
538598eb08 Refactored Skills/SkillGroups structure and implemented JSON persistence 2020-07-04 15:25:21 +01:00
Ben Wallis
60871461ea Moved skills stuff to new skills.rs file 2020-07-04 15:25:20 +01:00
Ben Wallis
4b0e2e45ab Added Skills and Skill Groups for characters 2020-07-04 15:25:04 +01:00
Piotr Korgól
aefa7e2f11 Make chests and enemies use the basic loot table 2020-07-04 14:07:10 +02:00
unknown
9968398ea8 Added stuff to loot table 2020-07-04 12:40:28 +02:00
Piotr Korgól
d101d7f132 Implemented a lottery system 2020-07-04 12:40:27 +02:00
Marcel Märtens
fe47b11345 instead of trying to connect for 80 minutes, just try 4 mins, added Changelog 2020-07-04 12:37:50 +02:00
Marcel Märtens
e7195b57ad extend network with better Error codes for Network 2020-07-04 12:32:52 +02:00
Marcel Märtens
cbfd398035 remove Mutex in server as Stream is now 'Sync' 2020-07-04 12:31:59 +02:00
Marcel
e05c9267a7 Merge branch 'xMAC94x/small-fixes' into 'master' 
make crash -> error for now

See merge request veloren/veloren!1152
 2020-07-04 10:15:24 +00:00
Marcel Märtens
6de2eadeb0 make crash -> error for now 2020-07-04 10:32:52 +02:00
Forest Anderson
c7ffe3dbeb Merge branch 'nancok/fix-es-translations' into 'master' 
Update es_la.ron

See merge request veloren/veloren!1151
 2020-07-04 03:54:55 +00:00
Marcel
37b5bcbb47 Merge branch 'xMAC94x/small-fixes' into 'master' 
fixing various smaller network party from issue 657

See merge request veloren/veloren!1149
 2020-07-04 01:37:21 +00:00
Marcel Märtens
1da6f15a43 fixing various smaller network party from issue 657 2020-07-04 02:04:33 +02:00
Forest Anderson
aaaff6a9c7 Merge branch 'revert-05d4dd05' into 'master' 
Revert "Merge branch 'angel/add-git-lfs-config-file' into 'master'"

See merge request veloren/veloren!1148
 2020-07-03 22:09:42 +00:00
Forest Anderson
316f702ef1 Revert "Merge branch 'angel/add-git-lfs-config-file' into 'master'" 
This reverts merge request !1146
 2020-07-03 22:03:17 +00:00
Marcel
c590bf7b65 Merge branch 'xMAC94x/net-improve' into 'master' 
crossbeam-channel and log spam

See merge request veloren/veloren!1145
 2020-07-03 21:06:04 +00:00
Forest Anderson
954a4857c4 Added proper training dummy model 2020-07-03 16:53:04 -04:00
Forest Anderson
c525358637 Prevent xp gain from training dummy kill 2020-07-03 16:53:04 -04:00
Forest Anderson
6140555e43 Fixed clippy issues 2020-07-03 16:53:04 -04:00