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

4591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
4885407e90 Merge branch 'imbris/resize-fix' into 'master' 
Fix filtering out resize events in the ui

See merge request veloren/veloren!1232
 2020-07-26 23:27:53 +00:00
Imbris
97e602ef68 Fix filtering out resize events in the ui 2020-07-26 18:21:20 -04:00
Imbris
3fd81a73eb Merge branch 'sam/arrow-charged-shot' into 'master' 
Bow charged shot attack

See merge request veloren/veloren!1226
 2020-07-26 03:06:53 +00:00
Samuel Keiffer
b41fff299f Bow charged shot attack 2020-07-26 03:06:53 +00:00
Imbris
d1097bace0 Merge branch 'sam/armor-fixes' into 'master' 
Armor fixes

See merge request veloren/veloren!1222
 2020-07-25 23:57:04 +00:00
Samuel Keiffer
527453c54a Armor fixes 2020-07-25 23:57:04 +00:00
Imbris
4f31b33556 Merge branch 'imbris/fix' into 'master' 
Make video mode selection slightly better

See merge request veloren/veloren!1227
 2020-07-25 22:25:30 +00:00
Imbris
ed3cea411c Make video mode selection slightly better 2020-07-25 17:07:50 -04:00
Marcel
3ad3d0ec29 Merge branch 'lausek/admin-joining' into 'master' 
fix #660; Admins should join even if they aren't on whitelist

Closes #660

See merge request veloren/veloren!1219
 2020-07-23 17:16:52 +00:00
lausek
b870b16c87 fix #660; Admins should join even if they aren't on whitelist 2020-07-23 17:16:52 +00:00
Monty Marz
dfff951eaf Merge branch 'hotfix_filepath' into 'master' 
Hotfix filepath

See merge request veloren/veloren!1225
 2020-07-23 14:02:22 +00:00
Monty Marz
5ac2d63d96 Update terrain.rs 2020-07-23 15:01:39 +02:00
Monty Marz
6ff3b7200d Merge branch 'pfau/loading_tips' into 'master' 
Loading Screen tips

See merge request veloren/veloren!1224
 2020-07-23 12:10:14 +00:00
Monty Marz
6d3f0f2e29 lots of things 
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
 2020-07-23 12:10:13 +00:00
Marcel
b1b69636fa Merge branch 'xMAC94x/netfix2' into 'master' 
Participant closure was immeatiatly, even in case a new participant was...

See merge request veloren/veloren!1223
 2020-07-23 08:39:33 +00:00
Marcel Märtens
21007429cc fixed !688 2020-07-22 09:50:26 +02:00
Marcel Märtens
c58ed4a027 Participant closure was immeatiatly, even in case a new participant was connected, send a MSG and then dropped immeadiatly. 
The remote site should see it connect, be open for 1 single stream and read the message before it's notified that the participant is closed actually.

This caused the faulure in one of our API tests (in lib, with client and server). Where it was possible that all messages were send and one side was dropped before the other side asked for the opened stream

Also introduce better error detection in participant(and scheduler) by removing the std_async::Result and intruduce `Result<(),ParticipantError>` instead
 2020-07-22 09:18:15 +02:00
Justin Shipsey
4a5837397d Merge branch 'quickfixes' into 'master' 
small fixes

See merge request veloren/veloren!1221
 2020-07-21 13:36:10 +00:00
Marcel
b53ebcf599 Merge branch 'T-Dark-char-alias-slur-check-hotfix' into 'master' 
T dark char alias slur check hotfix

See merge request veloren/veloren!1215
 2020-07-21 09:59:00 +00:00
T-Dark0
d8c6f82d6b Voxygen and server-cli no longer panic if server creation returns error 
The process just exists instead
 2020-07-21 09:59:00 +00:00
jshipsey
ae79ffc68d small fixes 2020-07-20 21:37:13 -04:00
Forest Anderson
cbc6facbd0 Merge branch 'sharp/fix-corrupted-inventory' into 'master' 
Fix corrupted character inventories by adding protection.

See merge request veloren/veloren!1220
 2020-07-20 01:34:48 +00:00
Joshua Yanovski
c891721f92 Fix corrupted character inventories by adding protection. 
This is a temporary bandaid until we move to our new schema, but it
should at least allow people to log in with old characters.
 2020-07-20 02:34:43 +02:00
Monty Marz
3729c08d3e Merge branch 'pfau/fix_chat_cutting' into 'master' 
Fix cut off chat

See merge request veloren/veloren!1218
 2020-07-18 21:56:45 +00:00
Monty Marz
87079b3bba Fix cut off chat 2020-07-18 21:56:45 +00:00
Imbris
e5ebc3238a Merge branch 'imbris/screenshot-tweak' into 'master' 
Only screenshot and toggle fullscreen once per frame

See merge request veloren/veloren!1217
 2020-07-18 19:08:42 +00:00
Imbris
f4e286c087 Merge branch 'treeco/fix-spawn-damage' into 'master' 
Reset rather than accumulate velocity when stuck or in unloaded chunks

See merge request veloren/veloren!1185
 2020-07-18 19:08:40 +00:00
Imbris
3647c2303f Only screenshot and toggle fullscreen once per frame 2020-07-18 12:21:22 -04:00
Imbris
85dd14e05d Merge branch 'imbris/colorfix' into 'master' 
Fix color depth selection

See merge request veloren/veloren!1216
 2020-07-18 14:10:10 +00:00
Imbris
fae00c19ea Fix color depth selection 2020-07-18 08:17:42 -04:00
Imbris
6f5f799321 Remove gravity rather than reset velocity in unloaded chunks 2020-07-18 07:13:30 -04:00
Imbris
d6e96b3f49 Merge branch 'zesterer/winit-20' into 'master' 
Upgrade winit to 0.22.2

See merge request veloren/veloren!788
 2020-07-18 03:26:59 +00:00
Imbris
3a1f63cb4f Merge branch 'Menko/utility_items_fix_issue_612' into 'master' 
#612 Fixed utility items not being removed from inventory/hotbar

See merge request veloren/veloren!1123
 2020-07-18 02:41:45 +00:00
Nemanja
c3dce91088 #612 Fixed utility items not being removed from inventory/hotbar 2020-07-18 02:41:45 +00:00
Imbris
c3563cd9ba Remove supplement_events from Window, fix suppresed clippy lint, actually use exlusive fullscreen instead of a borderless window 2020-07-17 22:18:43 -04:00
Imbris
3f36dfd644 Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes 2020-07-17 21:26:21 -04:00
Imbris
9319ea75a0 Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend 2020-07-17 21:26:21 -04:00
Imbris
001e00c455 Tweak pausing code to reduce duplication 2020-07-17 21:26:21 -04:00
Imbris
1db52fdce3 Fixes for Alt key related issues 2020-07-17 21:26:21 -04:00
Imbris
ce8194c7a6 small fix and refactor stop auto walk to a method 2020-07-17 21:26:21 -04:00
Imbris
7e317e4212 Get misc conrod fixes onto winit-20 branch, add diagnostic printlns 2020-07-17 21:26:21 -04:00
Imbris
2ad0d9268d Fix rebase mistake 2020-07-17 21:26:21 -04:00
Imbris
68917587dc Increment glutin version in Cargo.toml file 2020-07-17 21:26:20 -04:00
Imbris
77b1c5621e Windows cpal conflict fix not released yet so we need to use the git version 2020-07-17 21:26:20 -04:00
Imbris
1d632c6e62 Fix mistake with event processing 2020-07-17 21:26:20 -04:00
Imbris
83c397f7be clippy fixes 2020-07-17 21:26:20 -04:00
Imbris
3f6d9a4f44 Proper fix for winit / cpal conflict 2020-07-17 21:26:20 -04:00
Imbris
231ba6bc00 Winit 0.22 released 2020-07-17 21:26:16 -04:00
Imbris
527c761c47 poll twice 2020-07-17 21:24:29 -04:00
Imbris
c7f4d87c59 Fix singleplayer feature and rebase related stuff 2020-07-17 21:24:28 -04:00