unknown
02b6a57063
Add asp mob
2020-07-05 09:38:13 -04:00
jshipsey
c0c86a74dc
more quadmed run work
2020-07-05 09:38:13 -04:00
jshipsey
549793faef
more progress on on quad_med run
2020-07-05 09:38:13 -04:00
jshipsey
08368da07b
manifest, vox files
2020-07-05 09:38:13 -04:00
jshipsey
8c43c958a7
tarasque work
2020-07-05 09:38:12 -04:00
Snowram
b7b209627c
Run anim progress
2020-07-05 09:38:12 -04:00
Snowram
1548b3a167
Tiger offsets, lion new model
2020-07-05 09:38:12 -04:00
jshipsey
657c477eea
finished quadlow run, positioning work on quadmed
2020-07-05 09:38:12 -04:00
Snowram
bcaea3a52f
Homogenizes quadmed bones names
2020-07-05 09:38:12 -04:00
Snowram
12ca502a1d
Add tiger mob
2020-07-05 09:38:12 -04:00
jshipsey
5e2aa81aba
small placement tweaks
2020-07-05 09:38:12 -04:00
jshipsey
3d936e6872
starting run anim
2020-07-05 09:38:12 -04:00
jshipsey
cdb91e95c1
manifests, skeleton, basic placement
2020-07-05 09:38:12 -04:00
Snowram
955e348a53
Add alligator, salamander and monitor npcs
2020-07-05 09:38:12 -04:00
Snowram
6e0e3d094f
Remove quad_low mobs from quad_medium
2020-07-05 09:38:12 -04:00
Snowram
e08e9b8a9a
Add legs to quadruped_medium
2020-07-05 09:38:12 -04:00
Snowram
6b6e9d5c8d
Add quadruped_low skeleton
2020-07-05 09:38:11 -04:00
Marcel
79f5d3189c
Merge branch 'network-lockless' into 'master'
...
Network lockless
See merge request veloren/veloren!1153
2020-07-05 09:17:29 +00:00
Forest Anderson
b2528b01f6
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
4bc5fe9cf9
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
4d1acf8fe1
Added tests and documentation to skills.rs
2020-07-04 14:32:24 -04:00
Joshua Barretto
11319e53a8
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
079a6094cb
Correctly load the loot table
2020-07-04 18:40:23 +02:00
Joshua Barretto
4e5277b3b0
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
aadaf83126
Refactored Skills/SkillGroups structure and implemented JSON persistence
2020-07-04 15:25:21 +01:00
Ben Wallis
7bf9182768
Moved skills stuff to new skills.rs file
2020-07-04 15:25:20 +01:00
Ben Wallis
a26c9c78f0
Added Skills and Skill Groups for characters
2020-07-04 15:25:04 +01:00
Piotr Korgól
3b7e75fde3
Make chests and enemies use the basic loot table
2020-07-04 14:07:10 +02:00
unknown
38f5b8e004
Added stuff to loot table
2020-07-04 12:40:28 +02:00
Piotr Korgól
61071c4654
Implemented a lottery system
2020-07-04 12:40:27 +02:00
Marcel Märtens
cb74e3822b
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
1d93b1d682
extend network with better Error codes for Network
2020-07-04 12:32:52 +02:00
Marcel Märtens
c40997622a
remove Mutex in server as Stream is now 'Sync'
2020-07-04 12:31:59 +02:00
Marcel
e34d385212
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
3c445078af
make crash -> error for now
2020-07-04 10:32:52 +02:00
Forest Anderson
9da07ca4a5
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
643d6b6f27
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
c5908dd5f7
fixing various smaller network party from issue 657
2020-07-04 02:04:33 +02:00
Forest Anderson
42299c1eff
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
8cc7ec8361
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
406e268ca7
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
30d8f03e7b
Added proper training dummy model
2020-07-03 16:53:04 -04:00
Forest Anderson
8e2006c27e
Prevent xp gain from training dummy kill
2020-07-03 16:53:04 -04:00
Forest Anderson
d2941fd54e
Fixed clippy issues
2020-07-03 16:53:04 -04:00
Forest Anderson
34e3cb5eb5
Added spawning test dummy
2020-07-03 16:53:04 -04:00
Forest Anderson
9ee1a69daf
Merge branch 'angel/add-git-lfs-config-file' into 'master'
...
Added lfsconfig file
See merge request veloren/veloren!1146
2020-07-03 20:41:22 +00:00
Forest Anderson
ce7e019d44
Added lfsconfig file
2020-07-03 16:40:28 -04:00
Marcel Märtens
6e0651b767
crossbeam-channel and log spam
...
- swap out std::mpsc with crossbeam-channel in networking crate
- remove log spam by only logging when populating a new cache entry and not on every get
2020-07-03 22:35:29 +02:00
Marcel
93bba77b2e
Merge branch 'xMAC94x/network-switch' into 'master'
...
xmac94x/network switch
See merge request veloren/veloren!1139
2020-07-03 17:13:58 +00:00
Justin Shipsey
d012eb68a2
Merge branch 'sam/hammerheavyattack' into 'master'
...
Secondary attack for hammer
See merge request veloren/veloren!1140
2020-07-03 15:40:12 +00:00
