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,020 Commits 151 Branches 18 Tags 2.1 GiB
3a65f89e81
Commit Graph

11020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
3a65f89e81 Merge branch 'xvar/add-mac-m1-ci-job' into 'master' 
Added CI support for MacOS M1 builds

See merge request veloren/veloren!3186
 2022-02-14 17:57:44 +00:00
Marcel
e9487afa06 Merge branch 'imbris/profiling-tweaks' into 'master' 
Some changes to help with profiling and cleaning up in .cargo/config

See merge request veloren/veloren!3201
 2022-02-14 08:22:59 +00:00
Imbris
5df3d60e95 Some changes to help with profiling and cleaning up aliases in .cargo/config. Removed incremental override since incremental is no longer turned off by default in rustc. Remove -Zuntable-options from several aliases because the --profile option is now stable. Added shader-from-source feature to aliases for voxygen that turn off the default features 2022-02-13 22:58:24 -05:00
Imbris
46c35f3376 Merge branch 'unvariant/render_item_drops' into 'master' 
Render item drops instead of placeholder textures

See merge request veloren/veloren!3175
 2022-02-14 02:09:45 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
Marcel
1aed60ed19 Merge branch 'ibrahimbeladi/kickstart-ar-lang' into 'master' 
kick start Arabic language (i18n)

See merge request veloren/veloren!2971
 2022-02-13 23:44:52 +00:00
Ibrahim Beladi
17d8baa3d9 kick start Arabic language (i18n) 2022-02-13 23:44:52 +00:00
Marcel
75e88c2fb8 Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3199
 2022-02-13 20:39:55 +00:00
Jonathan Berglin
dfb8d37a38 Update swedish translations 2022-02-13 20:39:54 +00:00
Imbris
ddcee8448b Merge branch 'persist_debug_checkbox' into 'master' 
Persist interface debug checkbox across sessions

See merge request veloren/veloren!3147
 2022-02-13 19:43:51 +00:00
Marcel
8c2f251220 Merge branch 'crow/new-dungeon-song' into 'master' 
Added Dungeon Song

See merge request veloren/veloren!3197
 2022-02-12 12:38:11 +00:00
Crow (Austin Bowers)
78ec15981d Added Dungeon Song 2022-02-12 12:38:10 +00:00
Joshua Barretto
44d16ce441 Merge branch 'site2/path_color' into 'master' 
Change Path colors

See merge request veloren/veloren!3192
 2022-02-11 17:05:10 +00:00
InfRandomness
090ac9030c Change Path colors 2022-02-11 17:05:10 +00:00
Ben Wallis
6d309c2fd9 * Added macos-aarch64 builds to gitlab CI config 
* Disabled incremental compilation for macos builds
* Removed cache for macos builds
* Renamed release-nightly-tmp-fix-airshipper to release-scheduled
* Renamed build-nightly to build-scheduled
 2022-02-11 11:18:36 +00:00
Joshua Barretto
31192c80bc Merge branch 'biome_name_update_and_site&theme_based_naming' into 'master' 
biome_name_update_and_site&theme_based_naming

See merge request veloren/veloren!3187
 2022-02-10 09:35:47 +00:00
floppy
996488ca7e remove unnecessary, vec!s from namgen bricks 2022-02-10 09:58:14 +01:00
ninefox
2e902c1c5c swapped show.debug for interface.toggle_debug 2022-02-09 18:31:46 -08:00
Joshua Barretto
6263942041 Merge branch 'slipped/site2' into 'master' 
new entities, frostpines

See merge request veloren/veloren!3193
 2022-02-10 01:59:20 +00:00
Justin Shipsey
88999068b2 Merge branch 'slipped/animtweaks' into 'master' 
wallrun

See merge request veloren/veloren!3181
 2022-02-10 01:13:24 +00:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
jshipsey
72f2b2eee8 clippy 2022-02-09 19:35:05 -05:00
jshipsey
7ae85aef50 tweaks 2022-02-09 19:34:24 -05:00
jshipsey
6d34a6b544 wallrunning 2022-02-09 19:34:23 -05:00
jshipsey
6f8cadc847 wall contact, run anim tweaks 2022-02-09 19:34:22 -05:00
Joshua Barretto
b2d6b06e2e Merge branch 'zesterer/bare-minimum' into 'master' 
Added BareMinimum shader effect

See merge request veloren/veloren!3188
 2022-02-09 23:29:17 +00:00
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