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
Joshua Yanovski
ffe0f5928c
Fix some issues with underwater rendering.
2020-07-04 21:21:12 +02: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
Joshua Yanovski
bfda6da42f
Fix some minor display issues.
2020-07-04 19:17:59 +02:00
Piotr Korgól
27440e16c4
Correctly load the loot table
2020-07-04 18:40:23 +02:00
Joshua Yanovski
0ed752e087
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-07-04 18:14:21 +02:00
Joshua Yanovski
ccc6a06a8d
Some minor changes.
2020-07-04 18:04:34 +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
Joshua Yanovski
4e02024670
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-04 16:17:40 +02:00
Piotr Korgól
aefa7e2f11
Make chests and enemies use the basic loot table
2020-07-04 14:07:10 +02:00
Joshua Yanovski
50a64d927e
Fix far plane.
2020-07-04 13:07:03 +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
Forest Anderson
e73ec7a4d2
Added spawning test dummy
2020-07-03 16:53:04 -04:00
Forest Anderson
05d4dd0556
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
c8f895a0ee
Added lfsconfig file
2020-07-03 16:40:28 -04:00
Marcel Märtens
f9895a7800
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
1f05446ce6
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
209834d782
Merge branch 'sam/hammerheavyattack' into 'master'
...
Secondary attack for hammer
See merge request veloren/veloren!1140
2020-07-03 15:40:12 +00:00
Samuel Keiffer
85d1d4b3ff
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
Marcel Märtens
15ff58cd6a
simple fmt in order to make the replacement commit as simple as possible
2020-07-03 13:11:44 +02:00
Marcel Märtens
4e92c0160e
network layer switch, doing the stuff that might confict.
...
- mostly its the message handling put now in a async wrapper
- add some fixes to pass without warnings and make clippy happy
- some network error handling is ignored, this can be improved but is no blocker
2020-07-03 13:11:38 +02:00
Marcel Märtens
77c90b2c7c
doing a simple 1:1 swap out network coding
...
this is the part which prob has less Merge conflics and is easy to rebase
the next commit will have prob alot of merge conflics
followed by a fmt commit
2020-07-03 13:11:31 +02:00
Monty Marz
3473fd215b
Merge branch 'pfau/fix_hud_artifacts' into 'master'
...
Fix UI artifacts
See merge request veloren/veloren!1143
2020-07-03 11:10:30 +00:00
Monty Marz
95a799cf85
fix artifacts, cleanup
2020-07-03 12:17:55 +02:00
Joshua Yanovski
7dd06da34c
Add shadows.glsl.
2020-07-02 22:25:35 +02:00
