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
5,611 Commits 151 Branches 18 Tags 2.1 GiB
a7458c099c
Commit Graph

191 Commits

Author SHA1 Message Date
Pfauenauge90
509615c15b npc armour 2020-03-18 23:09:58 +01:00
Pfauenauge90
4d9327cef5 2 weapons 2020-03-18 21:05:20 +01:00
Pfauenauge90
d752501db1 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-17 19:04:11 +01:00
Pfauenauge90
c9d09b8cdd more slots 2020-03-17 19:04:06 +01:00
timokoesters
4741e41230 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
timokoesters
1279f70184 Add shield item 2020-03-16 13:40:14 +01:00
timokoesters
1e9f081f10 include chest models 2020-03-15 19:53:58 +01:00
timokoesters
1f78344d6f Move equipment from loadout into body 2020-03-15 19:44:47 +01:00
Pfauenauge90
6e2015957a plate armour 2020-03-15 16:51:55 +01:00
Joshua Barretto
98e8c79b1c Added armour items and equipping of armour 2020-03-15 16:51:54 +01:00
Pfauenauge90
3738fe45f7 better item desc 2020-03-15 16:42:09 +01:00
Pfauenauge90
bf1c46d596 item images 2020-03-15 16:42:09 +01:00
Pfauenauge90
913393963a plate armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
6cb68fabea more assa armour parts 2020-03-15 16:42:09 +01:00
Pfauenauge90
aa36082eed more armour 2020-03-15 16:42:09 +01:00
Joshua Barretto
e20feeeb0c Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
timokoesters
447617dc69 Make durations and damage depend on weapon type 2020-03-15 14:34:17 +01:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
timokoesters
31f3aae75c fix: make climbing cost stamina 2020-02-24 19:18:06 +01:00
Joshua Barretto
31449db578 Add a new name (to force the repo to update this file) 2020-02-16 15:11:34 +00:00
Joshua Yanovski
8a9d4012fa Allow spawning individual species with /spawn. 
To get the old behavior, you now need to refer to the internal keywords
(like "bird_medium" or "quadruped_small") rather than the old friendly
names (like "duck" or "pig"), as the latter generate single species now.
 2020-02-14 03:12:37 +01:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
Joshua Barretto
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Joshua Yanovski
3fa21b3dc7 Per-speces NPC names! 
Is also able to refactor some of the uglier code and introduces a
framework that (suitably extended) could be useful in removing
boilerplate elsewhere.
 2020-01-29 04:41:32 +01:00
Justin Shipsey
64690279af new mobs 
alligators
 2020-01-26 00:22:48 +00:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Adam Whitehurst
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Adam Whitehurst
8bf35a197b Update weapon .ron 2020-01-05 11:26:22 -08:00
AdamWhitehurst
ba7ca785f6 Successful build 2019-12-30 05:56:42 -08:00
Monty Marz
8aff5faa83 assets update 
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
 2019-12-30 12:16:35 +00:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
Monty Marz
c38447a264 assets update 
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
 2019-11-09 13:42:42 +00:00
Monty Marz
a0a8011d7e Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
timokoesters
20248a4818
feat: store items as RON files 
When a new item is created, a ron file will be used as a template
 2019-10-24 23:47:26 +02:00
Monty Marz
3a0131306f Character assets Part 1 2019-09-18 16:46:12 +00:00
scorpion9979
7bfd9464c9 Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
7919442d3d Implemented asset system for caching json data 2019-06-04 01:10:59 -04:00