Commit Graph

1939 Commits

Author SHA1 Message Date
Ben Wallis
4e4725d1ac initial imgui implementation 2020-07-25 18:08:35 +01:00
Monty Marz
31cfc05123 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
Justin Shipsey
24f968d813 Merge branch 'quickfixes' into 'master'
small fixes

See merge request veloren/veloren!1221
2020-07-21 13:36:10 +00:00
T-Dark0
fd9ec8fbd0 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
5b76ed23f4 small fixes 2020-07-20 21:37:13 -04:00
Monty Marz
e353bd3cfc Fix cut off chat 2020-07-18 21:56:45 +00:00
Imbris
d46bf03e27 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
14d500abbc Only screenshot and toggle fullscreen once per frame 2020-07-18 12:21:22 -04:00
Imbris
d53ad7eb43 Fix color depth selection 2020-07-18 08:17:42 -04:00
Imbris
2a9785a40c 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
c8133ded43 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
953773e1d3 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
0275cc9523 Tweak pausing code to reduce duplication 2020-07-17 21:26:21 -04:00
Imbris
2f5c8fa3f3 Fixes for Alt key related issues 2020-07-17 21:26:21 -04:00
Imbris
27bfc74928 small fix and refactor stop auto walk to a method 2020-07-17 21:26:21 -04:00
Imbris
9bfb1b5f00 Fix rebase mistake 2020-07-17 21:26:21 -04:00
Imbris
97364d49ed Increment glutin version in Cargo.toml file 2020-07-17 21:26:20 -04:00
Imbris
a0d88e0774 Fix mistake with event processing 2020-07-17 21:26:20 -04:00
Imbris
f0d4ec32f5 clippy fixes 2020-07-17 21:26:20 -04:00
Imbris
8cd2207495 Proper fix for winit / cpal conflict 2020-07-17 21:26:20 -04:00
Imbris
29c877cff3 Winit 0.22 released 2020-07-17 21:26:16 -04:00
Imbris
61983b1b06 poll twice 2020-07-17 21:24:29 -04:00
Imbris
28e00a0f6e Fix singleplayer feature and rebase related stuff 2020-07-17 21:24:28 -04:00
Imbris
7dfb24d4a5 Clean comments, fix mistake, change dep source now that compatible version is available on crates.io 2020-07-17 21:24:28 -04:00
Imbris
5e8d74e00e fix Window::logical_size 2020-07-17 21:24:28 -04:00
Imbris
70eba0c30a Update changelog 2020-07-17 21:24:28 -04:00
Imbris
db91ebe9b5 fix a few minor bugs 2020-07-17 21:24:28 -04:00
Imbris
21a1382850 Update to winit 0.21.0 2020-07-17 21:24:28 -04:00
Imbris
d1b635efa4 Rearrange PlayState system to work without loop control 2020-07-17 21:24:28 -04:00
Imbris
515dbc30a7 Switch to updated gfx_window_glutin 2020-07-17 21:24:28 -04:00
Joshua Barretto
807a27328c Updated to winit 20 2020-07-17 21:24:27 -04:00
Samuel Keiffer
6cce09be85 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
lausek
05cc6f222b avoid comparing to own entity when mounting; fix coding style 2020-07-15 15:31:42 +02:00
lausek
a3326b5744 fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Marcel
d5bfae886e Merge branch 'xMAC94x/net-improve' into 'master'
xMac94x/net improve

See merge request veloren/veloren!1162
2020-07-14 14:09:43 +00:00
Joshua Barretto
446923f7d8 Merge branch 'zesterer/small-fixes' into 'master'
Zesterer/small fixes

See merge request veloren/veloren!1190
2020-07-14 09:54:17 +00:00
Joshua Barretto
3e5c3de2ac Neater compass 2020-07-13 23:23:44 +01:00
Marcel Märtens
c74e5e4b47 Changes requested in rewiew 2020-07-13 23:41:32 +02:00
Ben Wallis
a9be045cb8 Fixed suppressed clippy warnings for #587 - useless_conversion 2020-07-13 20:57:13 +01:00
Marcel Märtens
9d32e3f884 proper voxygen connect and code cleanups:
- voxygen abort when the server has a invalid veloren_network handshake, e.g. by outdated version instead of try again
- rename Network `Address` to `ProtocolAddr` as sugested by zest as it's a combination of Protocol and std::io::Addr
- remove the manual byte arrays in `protocols.rs` with something more nice
2020-07-13 13:03:20 +02:00
Marcel
2b13b7d952 Merge branch 'yusdacra/fix-i18n-test' into 'master'
Fix localization test and add translation status percentage

See merge request veloren/veloren!1196
2020-07-13 10:02:00 +00:00
Marcel
2414d5ae5e Merge branch 'gSpera/no_autowalk_after_die' into 'master'
Stopping auto-walk after death: Fixes #607

Closes #607

See merge request veloren/veloren!1197
2020-07-13 08:39:39 +00:00
Marcel Märtens
5d60fb2e1d move i18n test to i18n file to reduce compile time && merge gitlab jobs to only have 1 cargo test job 2020-07-13 09:50:55 +02:00
Yusuf Bera Ertan
730a54dad5
localization test: add per file data to overall status, better alignments 2020-07-13 00:40:43 +03:00
Kai
8e523364ac Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls. 2020-07-12 11:59:55 -07:00
Yusuf Bera Ertan
95fd89b4f9
add more error messages, add percentage calculation for each i18n file and an overall percentage result 2020-07-12 14:54:03 +03:00
Yusuf Bera Ertan
72ec565678
fix localization test 2020-07-12 05:38:11 +03:00
Kai
6b771b8dca Add a clientside check to only allow freefly camera for admins 2020-07-11 13:59:47 -07:00
Kai
738fa34534 Add freefly camera mode and cycle camera mode keybind 2020-07-11 11:39:04 -07:00