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,482 Commits 151 Branches 18 Tags 2.1 GiB
9ac84c0a3a
Commit Graph

2739 Commits

Author SHA1 Message Date
DaforLynx
123fee2707 Fix swim sfx, fix glider sfx, add glide sfx 2022-03-13 05:44:07 +00:00
Isidor Nielsen
a5ab36e6b5 Map marker fixes 2022-03-07 12:16:04 +00:00
DaforLynx
32434ec840 Sorry Rarnage 2022-03-04 10:36:03 -08:00
Sam
89bf529a5e Addressed review comments 2022-03-03 01:12:40 -05:00
Sam
f5e0cb0045 Addressed review comments 2022-03-03 01:11:18 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Monty Marz
855733bdcb tiny tweak 2022-03-03 01:11:09 -05:00
Sam
0542e46e7d Lighting works now hackily 2022-03-03 01:11:01 -05:00
Monty Marz
82def16969 visuals 2022-03-03 01:11:00 -05:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Sam
f4abe4f275 More tweaks 2022-03-03 01:10:58 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
0794f980fe Mostly snaked through another rendering pipeline 2022-03-03 01:10:47 -05:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
Isidor Nielsen
bd8a7a0506 Better rocks 2022-03-02 16:28:04 +00:00
Imbris
4aa89fd6cc Merge branch 'unvariant/center_item_drops' into 'master' 
Center item drops

See merge request veloren/veloren!3232
 2022-02-27 02:07:30 +00:00
ninefox
329051c6df removed extra fields from item_drop_manifest.ron 
added TODO about applying non-random rotations in load.rs
 2022-02-26 10:13:04 -08:00
Imbris
08f67a335f Add experimental shader option that lowers glow strength for lights near the camera 2022-02-26 00:26:42 -05:00
Marcel
2a9f75340a Merge branch 'spanish_translation' into 'master' 
apply changes from MR!2904

See merge request veloren/veloren!3224
 2022-02-20 16:26:24 +00:00
Marcel
6506a97dcd Merge branch 'zesterer/enable-site2-towns' into 'master' 
Enabled site2 towns by default

See merge request veloren/veloren!3206
 2022-02-20 14:02:53 +00:00
Marcel
df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master' 
Shared and persistent waypoints

See merge request veloren/veloren!3162
 2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
Marcel Märtens
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
Marcel
d463b67ef4 Merge branch 'zesterer/release-map' into 'master' 
Added location system, switched to release map

See merge request veloren/veloren!3213
 2022-02-17 16:31:01 +00:00
Monty Marz
9ca1693ef8 New login-screen bg image 2022-02-17 16:08:37 +00:00
Joshua Barretto
b786570470 Added location system, switched to release map 2022-02-17 14:51:59 +00:00
Treeco
90fbadbd03 Fix ember z fighting, remove ember sway 2022-02-15 23:05:20 +00:00
Joshua Barretto
00b003a23c Enabled site2 towns by default 2022-02-15 19:01:43 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
Sam
f30e879cf5 Clippy fixes 2022-02-14 17:23:15 -05:00
Monty Marz
900fff7ba9 small UI fixes, new haste buff icon 2022-02-14 19:24:59 +01: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
Ibrahim Beladi
17d8baa3d9 kick start Arabic language (i18n) 2022-02-13 23:44:52 +00:00
Bingen Galartza Iparragirre
d2da5c18be Add initial Basque language translation 2022-02-13 22:00:53 +01:00
Jonathan Berglin
dfb8d37a38 Update swedish translations 2022-02-13 20:39:54 +00:00
UncomfySilence
a0d43cb21d further balance changes 2022-02-13 10:35:19 +01:00
Sam
2e6610314c Balance tweaks 2022-02-13 00:39:46 -05:00
Monty Marz
c7ce2b773c new icons 2022-02-12 22:46:34 +01:00
Crow (Austin Bowers)
78ec15981d Added Dungeon Song 2022-02-12 12:38:10 +00:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
bf7e84c6ae Initial particle work 2022-02-10 14:58:37 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
Sam
fcb0f8d8f0 Wood golem attacks and ai 2022-02-10 14:58:32 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
Sam
82c976919e Darts are now darts. 2022-02-10 14:58:29 -05:00
Sam
40bb74c42f Gnarling stalker AI 2022-02-10 14:58:28 -05:00
Sam
e1f164d099 Initial AI for gnarling logger/mugger. 2022-02-10 14:58:27 -05:00
James Melkonian
3a8a0d9c53 Cavern systems under gnarling fortifications 2022-02-10 14:58:24 -05:00
Sam
6c6caa7535 Enemy spawns in gnarling fortification. 2022-02-10 14:58:22 -05:00
Sam
643713d8b1 Huts now have doors. Added totems. 2022-02-10 14:58:18 -05:00
Sam
b28f6276dd Gnarling dungeons now only generate near forests. 2022-02-10 14:58:09 -05: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
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -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
e98f9aab63 Slight ambience at night 2022-02-09 22:47:58 +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
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
Youssef Fahmy
4213585058 Fiesta Del Pueblo relocation 2022-02-08 07:51:31 +00: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
bb99f7e3b6 Add Traveler0 2022-02-08 01:35:54 +02:00
Crow
969f744223 added night town song 2022-02-06 18:48:12 -06:00
Zughy
d26906724c New icons in diary general combat section 2022-02-04 20:37:41 +00: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
juliancoffee
0682bfbe14 Add weapons to Husk loadout 2022-02-03 18:02:51 +02:00
Imbris
18f6077321 Merge branch 'imbris/srgb-dither' into 'master' 
Dither in nonlinear srgb space and dithering related experimental shader options

See merge request veloren/veloren!3160
 2022-02-01 21:24:50 +00:00
Christof Petig
a98b9ad049 normalize loot tables before combining them, take current values for a start 2022-01-31 19:45:38 +01:00
Justin Shipsey
612f084831 Merge branch 'slipped/bipeds' into 'master' 
Slipped/bipeds

See merge request veloren/veloren!3163
 2022-01-31 17:08:01 +00:00
Sam
097d6cf07c Extend green 2022-01-30 18:50:18 -05:00
Sam
0c44a7d1ab More tweaking 2022-01-30 18:37:11 -05:00
Sam
bfa9c1ce3a Fixed lifesteal particles 2022-01-30 18:11:41 -05:00
jshipsey
7cac4b4001 myrmidon fix 2022-01-30 02:02:23 -05:00
jshipsey
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
Imbris
89edd18787 Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options 2022-01-28 22:55:59 -05:00
Joshua Barretto
d8c4284a32 Merge branch 'zesterer/worldgen' into 'master' 
Improvements to site2

See merge request veloren/veloren!3159
 2022-01-28 17:14:07 +00:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
juliancoffee
e004fba9da Adress review 2022-01-28 00:02:34 +02:00
juliancoffee
9a2fde557c Fix rebase 2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7 Loadout Update: Use 
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
 2022-01-28 00:02:34 +02:00
juliancoffee
7585c8dcc1 Migrate EntityConfig for Loadout update 2022-01-28 00:02:34 +02:00
Joshua Barretto
56eff72670 Fixed blue snow 2022-01-27 11:04:05 +00:00
floppy
2fe8cb965d change SeaCrocodile spawn 2022-01-27 11:34:59 +01:00
Joshua Barretto
39863e8727 Remove colour banding 2022-01-27 00:29:03 +00:00
Marcel
0ebff57a59 Merge branch 'Martin/remove-server-from-list' into 'master' 
Feature: Delete button in the servers menu

See merge request veloren/veloren!3144
 2022-01-26 10:20:15 +00:00
Dominik Broński
ca7b048184 Merge branch 'SeaCrocodile' into 'master' 
Sea crocodile

See merge request veloren/veloren!3146
 2022-01-26 01:26:38 +00:00
Martin
700f709664 added delete button in the settings window which deletes a server from the list 2022-01-25 19:48:58 +02:00
floppy
ea6f09ec88 change SeaCrocodile spawn 2022-01-25 10:27:25 +01:00
DaforLynx
361fd72bd1 Added biomes to ron 2022-01-24 12:14:38 -08:00
InfRandomness
df6a0002e9 Move alpha values calculation to CPU 2022-01-24 19:24:51 +00:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Imbris
fc3da4bfce Merge branch 'imbris/sobel' into 'master' 
Add experimental sobel filter

See merge request veloren/veloren!3113
 2022-01-24 02:42:54 +00:00