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
6,840 Commits 151 Branches 18 Tags 2.1 GiB
8214c9df82
Commit Graph

2147 Commits

Author SHA1 Message Date
Joshua Barretto
717bbbf23e Better static light propagation between translucent objects 2021-03-07 14:25:01 +00:00
Joshua Barretto
6af0e77efd Better stairs 2021-03-07 14:25:01 +00:00
Joshua Barretto
0c302bb020 Lanterns in trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
6fc7d2a906 Faster More interesting giant trees, better oaks, hives on branches 2021-03-07 14:25:01 +00:00
Joshua Barretto
185b1c3053 Specialised giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
e30c625d81 More tree variety, denser forests 2021-03-07 14:25:01 +00:00
Joshua Barretto
68b0aa5c50 sync 2021-03-07 14:25:00 +00:00
Joshua Barretto
9cf13ac3b2 Simple coral 2021-03-07 14:25:00 +00:00
Joshua Barretto
6dd0f73c2d Fixed clipping issues, faster generation 2021-03-07 14:25:00 +00:00
Joshua Barretto
23f0dfb078 Began work on new sites 2021-03-07 14:25:00 +00:00
Avi Weinstock
22fcc6417c Make fireworks recursively shoot more fireworks (95% average replication). 2021-03-06 14:05:51 -05:00
Marcel
875bdd8d71 Merge branch 'sam/asset-validation-tests' into 'master' 
Added Item Validation Test

See merge request veloren/veloren!1849
 2021-03-04 15:46:12 +00:00
Joshua Yanovski
2dd7089e52 Bring vek up to date so we can bump rustc (hopefully). 2021-03-04 05:46:59 +01:00
Sam
39a580b5ee Added test that all items are properly formatted and valid. Fixed items that were broken. 2021-03-03 16:45:36 -05:00
James Melkonian
018d51b1a0 Move agent data into structs 2021-03-02 15:51:43 -08:00
James Melkonian
0c25896b2c Fix fleeing and combat a little 2021-03-02 15:51:40 -08:00
James Melkonian
29c5ae5af9 Fix interaction and clean up, broken fleeing 2021-03-02 15:51:38 -08:00
James Melkonian
045ec011c9 Behavior tree minus interacting 2021-03-02 15:51:32 -08:00
James Melkonian
8bdadc47b5 Initial behavior tree refactoring 2021-03-02 15:49:58 -08:00
ccgauche
7f4411ba1f Merge branch 'master' into 'ccgauche/plugin-player-join-event' 
# Conflicts:
#   CHANGELOG.md
 2021-03-02 09:45:15 +00:00
Sam
d02c61ad8a Item use is now goes through a control action rather than a control event. 2021-03-01 20:51:08 -05:00
Justin Shipsey
9ad8804b60 Merge branch 'armor-org' into 'master' 
armor org

See merge request veloren/veloren!1835
 2021-03-02 01:29:46 +00:00
Ben Wallis
0f7ff21c20 Merge branch 'item-stacking-and-splitting' into 'master' 
Implement stacking and splitting

Closes #904

See merge request veloren/veloren!1802
 2021-03-02 00:08:47 +00:00
Jesus Bracho
c0573cca44 Implement stacking and splitting 2021-03-02 00:08:46 +00:00
ccgauche
db9991ce6d Adressed all comments 2021-03-01 22:24:02 +01:00
heydabop
bfc82f7236 Fixes #974 - convert tool/weapon equip time to floating point seconds 2021-03-01 15:06:39 -06:00
ccgauche
9628dfaf99 Fixed comments 2021-03-01 21:29:18 +01:00
ccgauche
dbd4d70b79 Lots of improvement in pointer management (switched from i32 to u64) + New event implemented 2021-03-01 19:00:44 +01:00
Sam
f304fe0f10 Fix a few asset paths for armors. 2021-03-01 00:58:43 -05:00
Samuel Keiffer
0497a437a4 Merge branch 'sam/invulnerability-buff' into 'master' 
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
 2021-03-01 05:46:46 +00:00
Sam
7e34f1225f Migration for armor re-organization. 2021-03-01 00:42:35 -05:00
jshipsey
8944115f8e more asset organization 2021-02-28 22:18:43 -05:00
Samuel Keiffer
537efdd47e Merge branch 'aweinstock/trade-requestitem' into 'master' 
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
 2021-03-01 02:39:36 +00:00
Sam
d09baadab2 Added command: '/safezone' 2021-02-28 18:14:59 -05:00
Sam
a88ad7b971 Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command. 2021-02-28 15:02:03 -05:00
Samuel Keiffer
7a62cbbafc Merge branch 'sam/fix-roll-combo' into 'master' 
Fixes being stuck in roll when interrupting combo melee.

See merge request veloren/veloren!1831
 2021-02-28 18:02:01 +00:00
Avi Weinstock
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
Sam
d818ea2f1d Fixes being stuck in roll when interrupting combo melee. 2021-02-28 08:50:33 -05:00
Sam
50c47ce84d Made changes to fix torvus 2021-02-27 22:42:11 -05:00
Samuel Keiffer
cb267ac3ee Merge branch 'sam/combo-comp' into 'master' 
Combo now persists as a compnent, rather than a field on a state

See merge request veloren/veloren!1828
 2021-02-28 02:42:40 +00:00
Joshua Barretto
b9b36e0bf5 Merge branch 'zesterer-master-patch-28400' into 'master' 
Fix jump routes not being pathed

See merge request veloren/veloren!1706
 2021-02-28 00:41:38 +00:00
Sam
b25a376995 Re-allowed for what stage you were on to persist through a roll 2021-02-27 19:24:18 -05:00
Sam
404c7f0905 Combo melee now checks combo 2021-02-27 18:24:28 -05:00
Joshua Barretto
6051c06462 fmt 2021-02-27 23:21:01 +00:00
Sam
f24433c8cf Added combo component 2021-02-27 14:55:06 -05:00
Sam
238fcaf5f1 Particle rebase fixes 2021-02-27 01:42:47 -05:00
jshipsey
8d316aac8c feedback adjustments 2021-02-27 01:42:47 -05:00
jshipsey
0a353576dc address comments 2021-02-27 01:42:47 -05:00
Snowram
17112926e7 Adds harvester npc 2021-02-27 01:42:47 -05:00