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

5925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
b9abb9d443 Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Samuel Keiffer
e33fcf03d8 Merge branch 'sam/biped-weapon-fix' into 'master' 
Fix weapon assignment loadout issues

See merge request veloren/veloren!1546
 2020-11-24 04:48:35 +00:00
Sam
74a47f447d Changed default main and secondary tool from Some(empty) to None. 2020-11-23 21:54:12 -06:00
Samuel Keiffer
78dd5711a5 Merge branch 'sam/rt-loadout-fix' into 'master' 
Fixes loadout for RT NPCs

See merge request veloren/veloren!1545
 2020-11-24 01:34:18 +00:00
Sam
6b6d3b3f1a Restructures loadout builder function to better support weapons being passed in. 2020-11-23 18:22:24 -06:00
Joshua Barretto
b46e37bf56 Merge branch 'christof/cave_in_maps' into 'master' 
Show cave entries in the map

See merge request veloren/veloren!1540
 2020-11-23 23:42:00 +00:00
Christof Petig
5000c9872c use iter once.chain(once).flatten trick to deduplicate SiteInfo generation 2020-11-23 23:28:21 +01:00
Christof Petig
147638a5f7 Remove the last remnants of the site circle and cave map drawing code 2020-11-23 19:54:56 +01:00
Christof Petig
138bcc59d6 fix clippy: One argument is no longer needed 2020-11-23 19:17:19 +01:00
Christof Petig
3371b03798 remove cave lines from the map, also remove remnants of the colored site circles 2020-11-23 19:07:11 +01:00
Christof Petig
347d3e9b69 Display names for caves (identical on both ends) 2020-11-23 19:05:43 +01:00
Christof Petig
338a8ab18b Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
093bea2e7f Merge branch 'zesterer/worldsim' into 'master' 
Rtsim, HDR rendering, various worldgen improvements, map improvements

See merge request veloren/veloren!1533
 2020-11-23 16:59:31 +00:00
Joshua Barretto
e9110f27f2 Merge branch 'zesterer/fix-entity-despawning' into 'master' 
Allow entities to despawn without a home chunk

See merge request veloren/veloren!1544
 2020-11-23 16:14:13 +00:00
Joshua Barretto
e4564f28d5 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Joshua Barretto
dfeae0f6fc Allow entities to despawn without a home chunk 2020-11-23 15:16:07 +00:00
Snowram
8dc966831f Temp loot tables 2020-11-23 10:58:22 +00:00
Joshua Barretto
a5196e4ea6 Better town colour 2020-11-23 10:58:22 +00:00
Treeco
3667443f0a Make zooming in then back out return to the previous zoom level 2020-11-23 10:58:22 +00:00
Joshua Barretto
17efce6dad Prevent wildlife spawning in towns 2020-11-23 10:58:22 +00:00
Joshua Barretto
64b53377a9 Iteration order fix x2 2020-11-23 10:58:22 +00:00
Imbris
84430cacb5 Show indicator over site icons 2020-11-23 10:58:22 +00:00
Joshua Barretto
64260b1394 Switched light map iteration order, fire bowls in dungeons 2020-11-23 10:58:21 +00:00
Treeco
7cd7e0f6b5 Fixed map screens for rectangular worlds 2020-11-23 10:58:21 +00:00
Snowram
8bd0cee2e5 Add basic guards to towns 2020-11-23 10:58:21 +00:00
Monty Marz
8612ad60d6 street lamp particles, ground fire bowl, misc fixes 2020-11-23 10:58:21 +00:00
Snowram
193f776268 Adds (mini)bosses spawns 2020-11-23 10:58:21 +00:00
Imbris
25fcd27108 Demystify map site icon placement calculations 2020-11-23 10:58:21 +00:00
Joshua Barretto
fe9a634d69 Make chimneys glow 2020-11-23 10:58:21 +00:00
Joshua Barretto
d294a5926a Fewer trees near obstacles 2020-11-23 10:58:21 +00:00
Joshua Barretto
3d2265322f More lights, minimised light and glow map data 2020-11-23 10:58:21 +00:00
Snowram
c22c668f51 Dungeon tweaks 2020-11-23 10:58:21 +00:00
Joshua Barretto
57e533c8cd Updated changelog 2020-11-23 10:58:20 +00:00
Joshua Barretto
bfeb740722 Switched to pure iterator space search 2020-11-23 10:57:57 +00:00
Joshua Barretto
70b6b1fe27 Addressed review comments 2020-11-23 10:57:57 +00:00
Snowram
a7c6d409d3 Adds new cultist armors, defines loadouts for dungeons 2020-11-23 10:57:57 +00:00
Joshua Barretto
c3b9ceb2c6 Addressed review comments 2020-11-23 10:57:57 +00:00
Joshua Barretto
906428d373 Light/glow temporal interpolation hack 2020-11-23 10:57:57 +00:00
Monty Marz
25040e1934 Update street_lamp.vox 2020-11-23 10:57:57 +00:00
Joshua Barretto
795c99d285 Fixed glow AO 2020-11-23 10:57:57 +00:00
Joshua Barretto
e99e7f2775 Added glow tint 2020-11-23 10:57:57 +00:00
Joshua Barretto
b17f44cdef Added light/glow map sample interpolation for entities 2020-11-23 10:57:56 +00:00
Joshua Barretto
b1bda38446 Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be 2020-11-23 10:57:56 +00:00
Joshua Barretto
a394d065e2 Added glow 2020-11-23 10:57:56 +00:00
Snowram
b8d82428eb Assigns spawned npcs loadout with new method 2020-11-23 10:57:56 +00:00
Monty Marz
9831fd2be9 added enum for different dungeon enemies 2020-11-23 10:57:56 +00:00
Joshua Barretto
663efca174 Fixed close cloud sampling issue 2020-11-23 10:57:56 +00:00
Sam
30fbb64ac0 Added LoadoutConfig to better specify loadouts. 2020-11-23 10:57:56 +00:00
Monty Marz
1f6e2014eb remove level 6 dungeons 2020-11-23 10:57:56 +00:00
Monty Marz
22d9a7dcd2 translations, fixes 2020-11-23 10:57:56 +00:00