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

7488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
b767256d65 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master' 
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
 2021-04-05 21:40:24 +00:00
Marcel
d1a0f0469f Merge branch 'desttinghim/depot-improvements' into 'master' 
Depot fix and default world AABB

See merge request veloren/veloren!2067
 2021-04-05 19:11:14 +00:00
Marcel
3ca26c7332 Merge branch '1b15-master-patch-98134' into 'master' 
fixed auth server URL

See merge request veloren/veloren!2068
 2021-04-05 16:36:10 +00:00
Monty Marz
33db5cdd45 Merge branch 'pfau/lactose-intolerance' into 'master' 
More cheese is less cheese

See merge request veloren/veloren!2066
 2021-04-05 15:47:12 +00:00
Hunter Parks
7dd7c29c53 Change cursor lock location to be center of screen 
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
 2021-04-05 16:48:22 +02:00
Hunter Parks
d9c862a083 Fixes #520 and #840 - locks cursor to screen when menu is not open 
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
 2021-04-05 16:37:40 +02:00
1b15
c81e650af9 fixed auth server URL 2021-04-05 14:15:57 +00:00
Louis Pearson
a2fda31449 Add default world build AABB 2021-04-05 07:39:09 -06:00
Marcel
ea0188a6cc Merge branch 'japanese' into 'master' 
Add Japanese message translation

See merge request veloren/veloren!2049
 2021-04-05 13:38:30 +00:00
Louis Pearson
07341cc67f Return none from depot get if stale id used 2021-04-05 06:16:23 -06:00
Monty
a8b619bbef More cheese is less cheese 
Update CHANGELOG.md
fmt
Update crafting.rs
 2021-04-05 13:40:12 +02:00
Marcel
d7ed57ca7e Merge branch 'login-trim-username' into 'master' 
login trim username, improve validation, social ordering #1040

Closes #1040

See merge request veloren/veloren!2042
 2021-04-04 22:09:16 +00:00
Marcel
5043cdb20e Merge branch 'christof/economy_graph' into 'master' 
create economy tree graph

See merge request veloren/veloren!2052
 2021-04-04 20:21:19 +00:00
Marcel
70db31eb7f Merge branch 'aweinstock/cheese-counter' into 'master' 
Add a cheese counter in the bag display.

See merge request veloren/veloren!2061
 2021-04-04 19:24:35 +00:00
Marcel
81994622be Merge branch 'christof/stats_per_price' into 'master' 
output stats per value for all categories in the trade pricing test

See merge request veloren/veloren!2057
 2021-04-04 18:35:39 +00:00
Avi Weinstock
2b3aa57b72 Add a cheese counter in the bag display. 2021-04-04 11:14:25 -04:00
Monty Marz
51ad963c20 Merge branch 'pfau/ui-and-assets' into 'master' 
Crafting Tabs and more item tags

See merge request veloren/veloren!2058
 2021-04-04 13:02:27 +00:00
Monty Marz
c0b7952eb9 Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
Justin Shipsey
5c2af6d8c8 Merge branch 'DaforLynx/combat-sfx' into 'master' 
Adds on-hit combat sfx

See merge request veloren/veloren!2048
 2021-04-04 03:04:03 +00:00
DaforLynx
5ee9108e0d Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Joshua Yanovski
ad768d767a Merge branch 'sam/hashset-touch-entities' into 'master' 
Changed touch_entities from a vec to a hashset.

See merge request veloren/veloren!2056
 2021-04-03 22:06:05 +00:00
Christof Petig
329db14f39 output stats per value for all categories in the trade pricing test 2021-04-03 23:22:34 +02:00
Joshua Yanovski
82a7194985 Merge branch 'sam/use-lottery-result' into 'master' 
Handled error in setting stack size for item quantity in lottery.

See merge request veloren/veloren!2055
 2021-04-03 20:11:12 +00:00
Marcel
d19286b923 Merge branch 'xMAC94x/netpanic' into 'master' 
make a panic a error! and improve logging

See merge request veloren/veloren!2054
 2021-04-03 19:20:27 +00:00
Sam
4750aaa79e Changed touch_entities from a vec to a hashset. 2021-04-03 15:13:04 -04:00
Marcel Märtens
7010a06823 make a panic a error! and improve logging 2021-04-03 19:58:36 +02:00
Samuel Keiffer
0f31bc6da0 Merge branch 'sam/combat-ratings' into 'master' 
Tweaks to Combat Rating Calculation

See merge request veloren/veloren!2051
 2021-04-03 17:33:34 +00:00
Sam
c3fc8bcf83 Handled error in setting stack size for item quantity in lottery. 2021-04-03 11:37:57 -04:00
Sam
21ed2885c9 Actually committed bone staff fix. 2021-04-03 10:26:32 -04:00
Justin Shipsey
6855961fe7 Merge branch 'vfoulon80/refine-item-icons' into 'master' 
Refine some item icons

See merge request veloren/veloren!2045
 2021-04-03 11:19:36 +00:00
Christof Petig
85d07526a0 as usual clippy is right (and helpful) 2021-04-03 10:54:42 +02:00
Samuel Keiffer
7ea1573db8 Merge branch 'sam/loot-table-features' into 'master' 
Loot Table Rework

See merge request veloren/veloren!2046
 2021-04-03 08:45:53 +00:00
Justin Shipsey
e493067826 Merge branch 'refactor-cell' into 'master' 
refactor Cell back to 4 byte size #993

Closes #993

See merge request veloren/veloren!1997
 2021-04-03 07:56:06 +00:00
Snowram
9cc6ff3711 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Sam
76a28c6be1 Factored out weapons into their own rating. 2021-04-03 00:08:40 -04:00
Sam
33503bd9c2 Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Sam
ed5cb2b5f0 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
0306c6398d Added unit test to validate contents of loot tables. 2021-04-02 23:04:35 -04:00
Sam
9c0f75f580 Made item prices sane. 2021-04-02 23:04:34 -04:00
Sam
5d0249e350 Re-created item_price_calculation with new loot tables. 2021-04-02 23:04:34 -04:00
Sam
e83a2eef3d Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
8d1700b882 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
01296ac816 Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
e72a382620 Staff weapon tiering shuffle. 2021-04-02 23:04:30 -04:00
Sam
9b6c311373 Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres. 2021-04-02 23:04:30 -04:00
Sam
a773d53b3a Created weapon loot tables. 2021-04-02 23:04:29 -04:00
Sam
0a29d93164 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
25034a6a0b Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
f88fd5f349 Fixed trading 2021-04-02 23:04:26 -04:00
Sam
fa7d1d85a9 Fixed csv tools 2021-04-02 23:04:26 -04:00