Commit Graph

217 Commits

Author SHA1 Message Date
Imbris
968c064874 Restore slot interaction functionality 2020-04-12 18:40:52 +02:00
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Imbris
97148cb6bb Merge branch 'master' into 'combat'
# Conflicts:
#   CHANGELOG.md
2020-04-01 20:42:27 +00:00
Marli Frost
3806f08eb0
feat: configure audio output using an enum 2020-03-31 22:29:30 +01:00
Imbris
ba3fa16c33 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
Capucho
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
Imbris
6ba158b7e1 Input handling changes 2020-03-25 01:38:37 -04:00
Adam Whitehurst
37ec191021 update controller tick fn 2020-03-25 01:38:25 -04:00
timokoesters
99e7e1f785 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
timokoesters
fb16106960 Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
Adam Whitehurst
819c2767bc * move swap loadout to handle_swap_loadout util fn
* impl From<JoinData> for StateUpdate
2020-03-21 14:16:26 -07:00
Adam Whitehurst
3ae2b8de2e Remove excess code 2020-03-21 10:32:32 -07:00
Adam Whitehurst
180ec89060 add SwapLoadout 2020-03-21 10:26:38 -07:00
timokoesters
44ec09a8e7 Go to idle state when picking items up 2020-03-20 20:23:04 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
Shane Handley
4e5d200b70 Fix: Make the dropped item collection range match the world item range limit. 2020-03-12 11:54:23 +09:00
Shane Handley
434dd96cd6 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Acrimon
406767ae31 Merge branch 'capucho/voxygen-logout-timeout' into 'master'
FIX #513 logout timeout

See merge request veloren/veloren!837
2020-03-10 22:12:29 +00:00
Mckol
c3f1afdf2b Merge branch 'controller' into 'master'
Controller support

Closes #20

See merge request veloren/veloren!750
2020-03-10 21:00:13 +00:00
Mckol
8838682f0b Added Controller support 2020-03-10 21:00:13 +00:00
S Handley
b2312a0487 Check that a targeted collectible is within a certain pickup range of the character before highlighting it 2020-03-10 20:50:04 +00:00
Capucho
16e4214a52 Switch states instead of popping 2020-03-10 20:34:50 +00:00
Capucho
9d805a745e Proper fix to the logout timeout problem using Disconnect ACK 2020-03-10 20:34:50 +00:00
Capucho
d8ba63ffdc Janky fix of the logout timeout problem 2020-03-10 20:34:50 +00:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
Imbris
4a0c474be1 Remove Client dependency from Scene types and audio managers, add an
example for using voxygen as a library to renderer images of characters
2020-03-05 23:12:51 -05:00
Capucho
6f6b8986b6 Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
f13314e3da Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
af21d19ff3 Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00
Capucho
a97b694dfe Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
timokoesters
2fa902270e fix: block 2020-02-24 18:10:42 +01:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
2020-02-16 16:02:38 +01:00
S Handley
b739623579 Split the audio channels into SFX and music channels. This makes the
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
2020-02-15 21:30:44 +00:00
Imbris
f8283116a8 Fix highlighting non-collectibles 2020-02-06 17:06:49 -05:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
S Handley
b7ce91fead Move music under audio
Also add some blank time after each track so that we get some silence
between tracks.
2020-02-03 11:55:32 +00:00
Marcel Märtens
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Rémy PHELIPOT
f60a68d96d Improve i18n "get" performances by returning a &str 2020-01-27 19:59:17 +01:00
Imbris
e5d841e62f Adds fullscreen and window size settings and coverage based pixel art
scaling
2020-01-24 23:14:59 -05:00
timokoesters
7b558b4542 refactor: combine actionstate and movestate 2020-01-21 23:54:59 +01:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
2020-01-20 21:07:25 +01:00
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
AdamWhitehurst
de36e75264 Fix imports, update matches 2020-01-08 11:31:42 -08:00