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
11,043 Commits 151 Branches 18 Tags 2.1 GiB
c7ce2b773c
Commit Graph

11043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
507b5d371c Merge branch 'fix_plazas_in_site2_towns' into 'master' 
fix plazas in site2 towns spawning on top of each other

See merge request veloren/veloren!3191
 2022-02-09 23:19:01 +00:00
Joshua Barretto
8252151195 Merge branch 'enable_flattening_for_site2_towns_Refactor' into 'master' 
enable flattening for site2 towns in civ/mod.rs

See merge request veloren/veloren!3189
 2022-02-09 23:05:07 +00:00
Joshua Barretto
e98f9aab63 Slight ambience at night 2022-02-09 22:47:58 +00:00
floppy
80490580a4 fix plazas in site2 towns spawning on top of each other 2022-02-09 23:44:27 +01:00
floppy
680a6e477e enable flattening for site2 towns in civ/mod.rs, 
to avoid mountain towns spawning underground
 2022-02-09 23:28:56 +01:00
Samuel Keiffer
e772fd9218 Merge branch 'phoenix13032005/dungeon-tweaks' into 'master' 
Dungeon difficulty on map.rs tweaks and minor changes to loot tables and entity names

See merge request veloren/veloren!3075
 2022-02-09 16:29:28 +00:00
Joshua Barretto
17d5a9e222 Bare minimum water shaders 2022-02-09 14:41:44 +00:00
Joshua Barretto
0facac68b4 Bad fake lighting in caves 2022-02-09 13:28:07 +00:00
Joshua Barretto
8888190eb4 Added BareMinimum shader effect 2022-02-09 12:56:21 +00:00
phoenix13032005
7a1f0d9fa1 Balance update 
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
 2022-02-09 12:13:42 +02:00
floppy
03cb885af4 - add more custom bricks for biomes 
- update biome and site names
 2022-02-09 08:14:13 +01:00
Imbris
81c18d34ef Merge branch 'flock-behavior' into 'master' 
Make friendly creatures defend each other.

See merge request veloren/veloren!3172
 2022-02-08 23:12:35 +00:00
Tormod G. Hellen
a00121bedf Make entities protect owned bodies. 2022-02-08 22:53:00 +01:00
Tormod G. Hellen
82273f0f36 Make friendly creatures defend each other. 2022-02-08 22:32:25 +01:00
Samuel Keiffer
c946e945cf Merge branch 'juliancoffee/new_travelers' into 'master' 
New travelers

See merge request veloren/veloren!3180
 2022-02-08 20:52:45 +00:00
Marcel
93e9e795e7 Merge branch 'desert_music_timing' into 'master' 
Fiesta Del Pueblo relocation

See merge request veloren/veloren!3185
 2022-02-08 07:51:31 +00:00
Youssef Fahmy
4213585058 Fiesta Del Pueblo relocation 2022-02-08 07:51:31 +00:00
Marcel
00e9711429 Merge branch 'tygyh/doctests' into 'master' 
Add documentation to Agent functions

See merge request veloren/veloren!2997
 2022-02-07 23:56:03 +00:00
Jonathan Berglin
3bdc7b1bb9 Add documentation to Agent functions 2022-02-07 23:56:03 +00:00
juliancoffee
78b2a7b3a3 Add new travelers to changelog 2022-02-08 01:39:32 +02:00
juliancoffee
c1a9e1a1b6 Add rare lanterns 2022-02-08 01:39:32 +02:00
juliancoffee
995b10c247 Add all Travelers 2022-02-08 01:39:26 +02:00
juliancoffee
d9726e5b90 Define 4 traveler kinds in RtSim 2022-02-08 01:35:54 +02:00
juliancoffee
bb99f7e3b6 Add Traveler0 2022-02-08 01:35:54 +02:00
juliancoffee
ffac9f1b9c Smol RtSim refactor 
- Remove traveler branch from adhoc_loadout
- Rename RtSimEntityKind::Random to RtSimEntityKind::Wanderer, which
  encompasses all wandering stuff like birds that travel from site to
  site, humanoid travelers, ships, etc.
 2022-02-08 01:35:54 +02:00
juliancoffee
79e5a20960 Add stub implementation in RtSim 2022-02-08 01:35:54 +02:00
Joshua Barretto
d713083dfe Merge branch 'crow/town-song' into 'master' 
added night town song (Warmth of the Hearth)

See merge request veloren/veloren!3184
 2022-02-07 17:01:42 +00:00
Crow
969f744223 added night town song 2022-02-06 18:48:12 -06:00
Marcel
6ea205fcc0 Merge branch 'protheory8/change-gameserver-addr-to-be-an-array-of-tuples' into 'master' 
Remove gameserver_address setting and add protocols_and_addresses setting

See merge request veloren/veloren!2925
 2022-02-06 17:45:00 +00:00
floppy
422be1b451 - add generate_gnarling and generate_town in namegen.rs 
- enable generate_town for site2 towns in site2/mod.rs
 2022-02-05 13:32:45 +01:00
Marcel Märtens
97a58f0e14 clean up socket2 networkwork code to do more on the socket2 before convertig it. 2022-02-05 13:08:46 +01:00
Marcel Märtens
2528afafdd deactivate tests in CI, as they have often no IPv6 configured and would fail in that case 2022-02-05 13:04:16 +01:00
Marcel Märtens
dcfde616d0 In case of IPv6 and NON Windows make sure to not listen on dualstack, 
for that we need to create a socket2 socket and set_only_v6 to true.
We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
 2022-02-05 13:04:16 +01:00
Marcel Märtens
e9bee485ae Add a test for the new gameserver IPv6 IPv4 behavior 2022-02-05 13:04:16 +01:00
Marcel Märtens
7ba45fa7e5 adjust tracing and remove unused coding 2022-02-05 13:04:16 +01:00
protheory8
7148737252 Remove quic_files server setting 
(cherry picked from commit 38339d90ceb87008bbb0ce31ad4e28350213a401)
 2022-02-05 13:04:16 +01:00
protheory8
89580eba8c Remove gameserver_address setting and add protocols_and_addresses setting 
(cherry picked from commit a5e4575ad349aacb1f41a7e93e3d5ff9eeafc6ae)
 2022-02-05 13:04:16 +01:00
floppy
bd862b3dd1 tweak generate_danari in namegen.rs 2022-02-05 11:21:19 +01:00
Marcel
d785e97ae1 Merge branch 'chara_selection' into 'master' 
New icons in diary general combat section

See merge request veloren/veloren!3176
 2022-02-04 20:37:41 +00:00
Zughy
d26906724c New icons in diary general combat section 2022-02-04 20:37:41 +00:00
floppy
33dae9b3b1 -adjust size-threshold for Jungle to fix Jungles not being named. 
-set size-threshold for anticipated Swamp sizes
 2022-02-04 17:14:38 +01:00
floppy
b85a384d38 -adjust size-threshold for Jungle to fix Jungles not being named. 2022-02-04 16:54:42 +01:00
floppy
b5dfe74d41 -add more biome specific namegen functions 
-introduce random choice between engl and custom naming
-add namegen section for site/theme based naming
 2022-02-04 15:45:11 +01:00
Joshua Barretto
b0667f2664 Merge branch 'james/airships-not-ships' into 'master' 
Restrict RtSim ships to airships

See merge request veloren/veloren!3179
 2022-02-04 12:05:44 +00:00
James Melkonian
f21e0f31fb Restrict RtSim ships to airships 2022-02-03 21:41:20 -08:00
Dominik Broński
19c764dde6 Merge branch 'christof/econfix' into 'master' 
Small economy cleanup

See merge request veloren/veloren!3164
 2022-02-03 21:48:01 +00:00
Joshua Barretto
ac13d07443 Merge branch 'crafting_stations_in_site2_towns' into 'master' 
add crafting stations to workshop in site2 towns

See merge request veloren/veloren!3174
 2022-02-03 17:16:30 +00:00
floppy
74bf89077f use const CARDINALS to generate spawn positions for crafting_stations. 2022-02-03 17:40:26 +01:00
Samuel Keiffer
924dd2993c Merge branch 'juliancoffee/fix_husks' into 'master' 
Add weapons to Husk loadout

See merge request veloren/veloren!3177
 2022-02-03 16:36:09 +00:00
juliancoffee
0682bfbe14 Add weapons to Husk loadout 2022-02-03 18:02:51 +02:00