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,600 Commits 151 Branches 18 Tags
Commit Graph

4600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Samuel Keiffer
c745b3abfd 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
a0c4ffcda1 simple fmt in order to make the replacement commit as simple as possible 2020-07-03 13:11:44 +02:00
Marcel Märtens
c877fbe41b 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
7ba36f6d42 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
c2cf0c4627 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
2152737f18 fix artifacts, cleanup 2020-07-03 12:17:55 +02:00
Forest Anderson
b4ab5f7754 Merge branch 'angel/add-tokei-ignore' into 'master' 
Added tokeignore for Cargo.nix

See merge request veloren/veloren!1141
 2020-07-02 16:25:50 +00:00
Forest Anderson
a673352ab9 Added tokeignore for Cargo.nix 2020-07-02 12:14:01 -04:00
Monty Marz
cf7edf0f9d Merge branch 'pfau/loot_chat_icon' into 'master' 
Loot ChatType, Update german translation, map zooming

See merge request veloren/veloren!1138
 2020-07-01 19:05:44 +00:00
Monty Marz
72d5013a54 Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
Marcel
3342e5293b Merge branch 'scott-c/daggers' into 'master' 
Scott-c/1h-wielding #185

See merge request veloren/veloren!1095
 2020-07-01 12:07:35 +00:00
Marcel
dbd54c0a58 Merge branch 'clippy-fixup' into 'master' 
fix various clippy issues

See merge request veloren/veloren!1137
 2020-07-01 11:38:23 +00:00
scott-c
3d6a4ae462 Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Marcel Märtens
e9e8d48a6e fix clippy issues in tests and add it to CI 2020-07-01 00:37:15 +02:00