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
3,833 Commits 151 Branches 18 Tags 2.1 GiB
8d3463e2f1
Commit Graph

1646 Commits

Author SHA1 Message Date
Joshua Yanovski
14e4dfb53f Re-fix map orientation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
e91578ffdb Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
2b38927345 Fixes for nonstandard chunk and map sizes. 
Also fixes a longstanding map rendering issue.
 2020-01-23 18:18:11 +01:00
Joshua Yanovski
9520ef4f6d Implement sending world map across the network. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
72287f2041 Implement carving strategy for lake connections. 
Also fix mapgen slopes and make a much more pleasing world.
 2020-01-23 18:18:08 +01:00
Monty Marz
bfee0a6f9e Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
1365abae99 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
timokoesters
7b558b4542 refactor: combine actionstate and movestate 2020-01-21 23:54:59 +01:00
Monty Marz
e2707ff24a start menu text 2020-01-21 22:04:39 +00:00
Gilbert Röhrbein
c2b99f3a62 Fix panic in case no default audio device found when audio off 2020-01-21 18:09:37 +01:00
Joshua Barretto
8e7a8aa4f9 Shader optimisations 2020-01-21 12:58:20 +00:00
Joshua Barretto
8a0bd9220b Fixed button font 2020-01-20 22:54:51 +00:00
Joshua Barretto
4b5cc272ac sync 2020-01-20 22:51:55 +00:00
Joshua Barretto
397fa7777f Switched to enum-based char creation state 2020-01-20 22:29:14 +00: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
Joshua Barretto
0223a60a1e Merge branch 'zesterer/cs-char-saving' into 'master' 
Client-side character saving

See merge request veloren/veloren!737
 2020-01-20 18:03:28 +00:00
Joshua Barretto
6f26f2afb1 fmt 2020-01-20 17:45:28 +00:00
Pfauenauge
caa5abf183 updated info main menu info 2020-01-20 18:08:05 +01:00
S Handley
b44955ba30 Remove currently unused audio assets 
This clears out about 56MB of unused audio files.

There were also some unused methods in the audio modules which
referenced a file, which has also been removed.
 2020-01-20 15:07:30 +00:00
Joshua Barretto
fc1e66fb31 Solved character select body bug 2020-01-20 15:04:53 +00:00
Joshua Barretto
8f86e45a72 Enumerated Body type 2020-01-20 14:21:06 +00:00
Joshua Barretto
2c42aaf5f5 Added client-side character saving 2020-01-20 13:37:29 +00:00
Joshua Yanovski
898b5c6593 Fix benchmarks and profile overrides. 
This was necessary because Cargo recently deprecated the "overrides"
keyword in favor of "package", and Criterion changed its interface.

This commit also now lists more configurable keys, so if they aren't set
to their defaults the user will be able to find them.  This includes the
roll key, which wasn't listed earlier and is different on Windows and
Mac.  It does *not* include the respawn key because that key is already
shown when you die.
 2020-01-20 14:16:28 +01:00
Joshua Yanovski
355a1b204a Fixes for OS X machines. 
Handles scroll wheel events in pixels (enabling the scroll wheel) and
sets rolling and wall leaping to use left shift by default on OS X
(instead of middle mouse click, which is absent by default on Apple
trackpads).  Also updates the controls UI to show the actual assigned
keys for those controls which are configurable.
 2020-01-20 05:12:41 +01:00
Imbris
38c48317f7 Fix lighting calc bug, lower meshing bench sample size 2020-01-19 18:14:07 -05:00
Pfauenauge90
8a0efd3654 added TODO for energy numbers 2020-01-19 22:39:20 +01:00
Pfauenauge90
885e698e5a charge icon update 2020-01-19 22:39:19 +01:00
Pfauenauge90
6a32845e58 various fixes 2020-01-19 22:39:19 +01:00
Pfauenauge90
480b920fa3 skillbar background fix 2020-01-19 22:39:18 +01:00
Pfauenauge90
863e4c4962 darkened button for unavailabe charge 2020-01-19 22:39:18 +01:00
Imbris
94210070f7 fmt fix 2020-01-19 16:03:27 -05:00
Imbris
3c8d0a3bb9 fix typo, replace u32 with Vec3<u8> in light propagation queue 2020-01-19 16:03:27 -05:00
Imbris
4b01c1b082 add: capability to disable blending for particular BlockKinds 2020-01-19 16:03:27 -05:00
timokoesters
ae1fa5e4c4 improvement: fog doesn't go back and forth anymore 2020-01-19 16:03:27 -05:00
Imbris
b3cdde3ce9 fix: panic in terrain meshing 2020-01-19 16:03:27 -05:00
Imbris
5666f18ded Add terrain meshing benchmark 2020-01-19 16:02:12 -05:00
Imbris
6f6dc1b16b Cleanup 2020-01-19 16:02:12 -05:00
Imbris
aa48729376 Compress position used in propagation queue, decrease outer bounds to the area sunlight can reach the inner area from 2020-01-19 16:02:12 -05:00
Imbris
09239caf88 While copying terrain sample to flat array, keep track of highest and lowest positions with exposed faces in order to constrain further iteration 2020-01-19 16:02:12 -05:00
Imbris
3347438d51 Propagate light via queue to avoid block lookups 2020-01-19 16:02:12 -05:00
Imbris
211c076b8d Remove unnecessary sampling in meshing light calculations 2020-01-19 16:02:12 -05:00
Imbris
33993638fe Experiment with replacing hashmap in light calculations 2020-01-19 16:02:12 -05:00
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
S Handley
309834df1b fix: Prevent dispatching Run SFX if an entity is not moving 
This adds the entity's velocity as an argument when mapping the
movement state to an SFX event, and prevents the run SFX from being
returned if the velocity is below a threshold.

This will prevent hearing the run sfx when stuck in a corner, or running
into a surface where the character is not actually moving their feet.
 2020-01-18 18:49:17 +00:00
Gilbert Röhrbein
b2503397c9 Fix panic in case no default audio device found when audio off 2020-01-18 19:16:23 +01:00
Monty Marz
cb5976b9de create character button position change 2020-01-18 15:42:21 +00:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
AdamWhitehurst
976eface66 Update from MR comments 2020-01-17 08:39:21 -08:00
Adam Whitehurst
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Gilbert Röhrbein
28060e7b6e fixing #405 - Energy as its own component 2020-01-12 22:25:04 +01:00
Monty Marz
f6dfb74b3e fix 
slightly lower trigger velocity

slighty more transp map image
 2020-01-12 19:01:02 +00:00
S Handley
00c1493548 Play the Run SFX when a character lands after jumping or falling 
This is a small detail but makes a noticable difference.
 2020-01-12 16:35:20 +00:00
Piotr Korgól
e1adf40856 Improvement: Replace all '..=b' with '..b + 1' 2020-01-12 15:46:53 +01:00
Pfauenauge90
e0fc3ce425 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
Imbris
2b4d4aa480 Merge branch 'yusdacra/tweaks' into 'master' 
Fixes minor issues with frustum culling

See merge request veloren/veloren!712
 2020-01-11 16:36:51 +00:00
Songtronix
70eb2eed33 remove: discord rich presence 2020-01-10 17:01:50 +01:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
127f8fb72b Fix lpindex not being updated for culled objects, and don't 
recalculate frustum for every entity
 2020-01-09 22:22:06 +03:00
AdamWhitehurst
de36e75264 Fix imports, update matches 2020-01-08 11:31:42 -08:00
Yusuf Bera Ertan
4a0a2d5229 Cargo fmt 2020-01-08 20:09:54 +03:00
Yusuf Bera Ertan
71db9d6350 Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan
24013f1a32 Use treeculler crate 2020-01-07 19:40:06 +03:00
Adam Whitehurst
8648641362 Grooming 2020-01-07 07:49:08 -08:00
Yusuf Bera Ertan
0b67dad4a5 Fix figure visible value not updating 2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan
31d18b3381 Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum 2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan
c19c222a90 Use temporal coherence for chunk frustum culling 2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan
fd9cc76786 Reimplement #210 2020-01-07 18:40:45 +03:00
Pierce Brooks
43febb5bf3 fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow ) 2020-01-07 05:45:43 +00:00
Imbris
4fa05150a2 Merge branch 'imbris/char-screen-transition' into 'master' 
Fix issues regarding going back to the character selection screen

Closes #386

See merge request veloren/veloren!700
 2020-01-02 19:40:21 +00:00
Joshua Barretto
423e741cb6 Merge branch 'zesterer/better-rollin' into 'master' 
Made rolling less slippy, added tilt

See merge request veloren/veloren!699
 2020-01-02 18:35:27 +00:00
S Handley
2644e29484 Refactor and Rename for clarity 
Implements a potential structure for splitting the SFX event mapping
into smaller individual files for maintainability.

- Remove inventory events for now: For a later commit.
- No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.
 2020-01-01 02:55:48 +00:00
Imbris
06ea29bd4c Small connection error handling improvement 2019-12-31 16:38:13 -05:00
Imbris
ede05c47b0 fix(char screen induced ghosts): 
Adds removing extra components and deleting entities clientside when
going back to the character screen. Also, simplifies ClientState by
removing the Dead variant and removing ClientMsg::StateRequest in favor
of more specific ClientMsg variants.
 2019-12-31 16:38:13 -05:00
AdamWhitehurst
b67a4835f4 Update disabled state flags 2019-12-31 05:19:23 -08:00
Joshua Barretto
cfbf69ae89 Made rolling less slippy, added tilt 2019-12-30 15:16:21 +00:00
AdamWhitehurst
ba7ca785f6 Successful build 2019-12-30 05:56:42 -08:00
Monty Marz
8aff5faa83 assets update 
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
 2019-12-30 12:16:35 +00:00
Imbris
ec3e075020 fix(player list): Show players not in range on the player list 
fix(overflow): Stops including block updates that fail (since chunks
don't exist on the client) in `TerrainUpdates` (which would trigger
meshing of those nonexistent chunks). Furthermore, removes
remeshing of chunks with block updates if those chunks don't have all their
neighbours (since those wouldn't be meshed in the first place).
 2019-12-29 20:51:05 -05:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
AdamWhitehurst
ca44497258 Add movement_utils 2019-12-28 08:10:39 -08:00
AdamWhitehurst
8e0317e03d refactor states to handle update logic 2019-12-26 06:43:59 -08:00
AdamWhitehurst
c2ceabea0e finish movment states handle() fn logic 2019-12-22 08:08:48 -08:00
AdamWhitehurst
1ab09220b0 Rudimentary Stand State handle() move 2019-12-21 07:57:15 -08:00
Imbris
934c5d6846 Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc 2019-12-20 22:51:35 -05:00
Imbris
5813f626d1 cleanup 2019-12-20 22:48:14 -05:00
Imbris
d341073a44 Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Imbris
e49cafafbf Actually send deletion messages 2019-12-20 22:48:14 -05:00
Songtronix
f070c139e9 change(log): only print out log file errors, no panic 2019-12-20 15:59:50 +01:00
Songtronix
b03e4ac261 feat(log): configurable creation of log file 
additionally allows to ignore any errors with the log file

furthermore prints out full log file path to the user incase of a panic
 2019-12-20 15:45:30 +01:00
Songtronix
9141cc07d0 feat(env): configurable verbosity of log file via VOXYGEN_FILE_LOG environment variable 2019-12-20 15:45:30 +01:00
Songtronix
0d919a9dc6 improve(log): adjust verbosity of some logging 
fix: settings do not log due to logging being initialized to late
 2019-12-20 15:45:30 +01:00
S Handley
8c5320d20f Update title music and temporarily remove attack sfx 
- Updated title music with a version provided by aeronic which fades out
more gracefully
- Removed attack SFX as it was included in the movement processing, but
will return later as part of a similar chunk of code which processes
combat sfx independent of movement.
 2019-12-20 04:04:05 +00:00
S Handley
da2d36ed76 (fix) Set the music and sfx volumes immediately after initialising the 
audio frontend.

Fixes #373
 2019-12-10 14:02:51 +00:00
Adam Whitehurst
20575e0aab Update controller 2019-12-09 14:45:10 +00:00
S Handley
56f9c5d35f Fix the glider_close sfx event 
This was failing to trigger since we now have a MovementState::Fall, but
the sfx mapper was still trying to work this out itself based on
velocity. We no longer need to track velocity as a result and can use
the MovementState.

Also silenced warnings resulting from unused vars when running tests.
 2019-12-09 09:50:14 +00:00
Treeco
d88376f365 Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Adam Whitehurst
92d99af53c feat: weapon-type dependent wield and attack durations 
also some controller.rs cleanup
 2019-12-03 06:30:08 +00:00
Treeco
7c17c45f47 made first person camera follow race heights, minor zoom chances 2019-12-01 19:05:28 +00:00
Adam Whitehurst
4e574cb29a Inputs enhancements 2019-11-29 15:20:35 +00:00
Monty Marz
d0b7891a34 Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
040e1a7535 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
Monty Marz
b3eb0b270f Region name display fix 2019-11-24 16:45:13 +00:00
Songtronix
fa93e35861 upgrade(dep): msgbox 
Fix: FreeBSD compilation
 2019-11-24 08:49:14 +01:00
S Handley
ea2e0d17de SFX system 
This is an event based approach to SFX sounds. There is a specific
character sound event mapper which determines sfx to play based on
character or NPC state, as well as emitting sfx events for
non-character-triggers such as levelling up.
 2019-11-23 08:26:39 +00:00
Monty Marz
370e94b1ad Loading Screen with pulsating text, 2 new hairstyles 2019-11-23 00:51:18 +00:00
Songtronix
e885a78deb change(deps): enforce crossbeam version 2019-11-22 19:12:58 +01:00
Songtronix
2f93dd2c38 adjust logging level 2019-11-22 19:12:58 +01:00
Songtronix
bdcea57201 feat(log): add date to log file 2019-11-22 19:12:58 +01:00
Songtronix
bb64c8ed76 change(log): remove all spam from logging 2019-11-22 19:12:58 +01:00
Songtronix
7abf2a0fb9 change(log): switch to fern 2019-11-22 19:12:58 +01:00
Joshua Barretto
8745d0a3af Non-linear depth buffer 2019-11-20 09:59:27 +00:00
Joshua Barretto
9993a4c81a Smoother water at distance, fixed warnings 2019-11-19 19:22:56 +00:00
Joshua Barretto
28e625635f Split terrain rendering to avoid redrawing skybox 2019-11-19 19:09:22 +00:00
Joshua Barretto
5162256e45 Faster and more visually pleasing clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
aa111d34e5 Added clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
eb7b55d3ad Merge branch 'zesterer/better-water' into 'master' 
Better water

See merge request veloren/veloren!643
 2019-11-12 14:55:54 +00:00
Adam Whitehurst
59826a364a Remove unnecessary elided lifetimes 2019-11-11 08:26:44 -08:00
Adam Whitehurst
64a0d8d91f Make character anims conditional by Tool held 2019-11-10 15:36:47 -08:00
Monty Marz
a9a7b95037 Login desc 2019-11-09 23:19:41 +00:00
timokoesters
b6552556e7 fix: show error on client failure again 2019-11-07 09:42:03 +09:00
Shane Handley
0fabe70960
Ignore warning about variant never being constructed. It's being used 
elsewhere. Not sure why that isn't being picked up.
 2019-11-06 21:34:19 +01:00
Shane Handley
4330b33ce0
Hmm, alright have it your way rust. Not my change, so leaving it alone. 2019-11-06 21:34:18 +01:00
Shane Handley
fb3350c605
Removed error which is now handled by the ServerTimeout case 2019-11-06 21:34:18 +01:00
Shane Handley
15c725bfde
Address code review points: 
- Clarify caffeine fueled comment
- Be better at comparing Instant's, and catch the 0 seconds case to say
Goodbye to the user
- Switch println for 'info!'
 2019-11-06 21:34:18 +01:00
Shane Handley
b15c107f0b
Re-add the handling of error when the player loses connection on the character select screen. 2019-11-06 21:34:17 +01:00
Shane Handley
69b008e0e6
Fix issue with the timeout error showing when there is an intentional logout from the game. 2019-11-06 21:34:17 +01:00
Shane Handley
81f41e278e
Remove unused warn and fix dangling parameter. 2019-11-06 21:34:17 +01:00
timokoesters
4a65cddd15
improvement: remove wait because it now always retries 2019-11-06 21:34:16 +01:00
Shane Handley
26acd8b427
Bump up the timeout tie for booting the single player server 2019-11-06 21:34:16 +01:00
timokoesters
c733c95718
improvement: UI for connecting to singleplayer servers + threading fixes 2019-11-06 21:34:15 +01:00
timokoesters
21f126acd4
feat: show errors in main menu when client fails 
Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`
 2019-11-06 21:34:15 +01:00
Shane Handley
3b24af76ab
Formatting 2019-11-06 21:34:15 +01:00
Shane Handley
ef6f8b509a
Eeek, remove logging. 2019-11-06 21:34:14 +01:00
Shane Handley
fe9ad3fa19
Network timeout updates 
- Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire.

- Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.
 2019-11-06 21:34:14 +01:00
Joshua Barretto
671313a523 Overhauled water shaders 2019-11-05 15:45:01 +00:00
soruh
6dfa146484 Mitgated RUSTSEC-2019-0014 by updating noise and 
disabling its default features, specifically `image`,
which had the vulnerability.
 2019-11-05 11:14:39 +00:00
soruh
e3bd152d24 update toolchain to nightly-2019-11-04 2019-11-04 18:26:32 +01:00
Monty Marz
240b620c13 login info text 2019-11-01 20:53:52 +00:00
Acrimon
5beea76624 Remove heaptrack as it is now deprecated. 2019-10-29 06:55:45 +00:00
Monty Marz
a0a8011d7e Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
jshipsey
12f83cf270 rebase, small fixes 2019-10-25 22:20:38 -04:00
jshipsey
c5942dfcc9 purged references to npckind from anim files, removed warnings 2019-10-25 21:50:14 -04:00
jshipsey
2b5fd372c5 streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally. 2019-10-25 21:50:14 -04:00
jshipsey
ada6142c1f added large bipeds, small birbs, small fish skeletons 2019-10-25 21:47:23 -04:00
jshipsey
4f5f7402f0 added dragon skeleton 2019-10-25 21:44:33 -04:00
jshipsey
e858c31b4c fish_medium and bird_medium skelingtons 2019-10-25 21:39:06 -04:00
jshipsey
574f070758 added large bipeds, small birbs, small fish skeletons 2019-10-25 21:34:29 -04:00
jshipsey
644939810f added dragon skeleton 2019-10-25 21:33:59 -04:00
jshipsey
54fc712076 fish_medium and bird_medium skelingtons 2019-10-25 21:33:02 -04:00
Marcel
ee915671ef Merge branch 'songtronix/set-voxygen-config-via-env' into 'master' 
customizable config file location via environment variable

See merge request veloren/veloren!617
 2019-10-25 18:52:38 +00:00
Timo Koesters
0ae15bb251 Merge branch 'timo-items-as-ron' into 'master' 
feat: store items as RON files

See merge request veloren/veloren!618
 2019-10-25 08:57:39 +00:00
Imbris
c18fe8042b Merge branch 'imbris/mesh-speed' into 'master' 
Speed up terrain meshing ~20%

See merge request veloren/veloren!625
 2019-10-25 02:22:03 +00:00
Imbris
4bcc55ad34 improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks 2019-10-24 20:02:29 -04:00
timokoesters
f1b728b89b
improvement: load_cloned returns a result 2019-10-24 23:55:24 +02:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
timokoesters
20248a4818
feat: store items as RON files 
When a new item is created, a ron file will be used as a template
 2019-10-24 23:47:26 +02:00
Monty Marz
f4ba68c60d .floating(true) for help window background to make it layer above every recent and future widget 2019-10-24 18:21:17 +00:00
Joshua Barretto
7d86a360d6 Merge branch 'soruh/fix-welcome-window-depth' into 'master' 
fix the welcome window not being closeable, due to it being obscured by the chat

See merge request veloren/veloren!623
 2019-10-24 12:49:20 +00:00
Imbris
2fad65c749 Merge branch 'imbris/graphic-cache' into 'master' 
Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures.

See merge request veloren/veloren!609
 2019-10-24 05:27:09 +00:00
Imbris
a200dafd45 Fix possess bug, remove commented code, drain controller events 2019-10-24 00:00:00 -04:00
Imbris
966b2bfbff Integrate new systems with metrics 2019-10-23 23:50:06 -04:00
Imbris
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
soruh
f186aac2ea fix the welcome window not being closeable 
due to the chat being in front of it,
by giving the welcome window a depth of -1.0.
The value of -1.0 is very arbitrary, but has some effect on
further development*, so there should be consideration concerning it.

* if something is supposed to be over/under the welcome window and
over/under something else with a different depth at the same time,
the resulting depth could become really ugly.
Of course it's always possible to change depths afterwards, but this often
breaks things, so the general scope of depths should
imo be considered, before this becomes a problem.
 2019-10-24 00:46:40 +02:00
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Songtronix
e8a077a5d6 feat(env): customizable config file location 2019-10-22 17:15:10 +02:00
Isaac Freund
355c7666b9 Allow dropping items 
Items can now be dropped by clicking to select the item then clicking
outside of the bag.
 2019-10-22 01:40:58 +02:00
Imbris
8bb54976eb Rework GraphicCache to use multiple texture atlases and put large images in their own textures. 2019-10-19 21:28:30 -04:00
Songtronix
fffffff536 fix(crash): overflowing the stack 2019-10-18 14:19:02 +02:00
Songtronix
fe4a61354a change(menu): display version with hash and date 2019-10-18 15:51:07 +02:00
Imbris
39656e92be Merge branch '276-hotloading-armor' into 'master' 
Resolve "Enable hotloading of different offsets for armors/weapons"

Closes #276

See merge request veloren/veloren!545
 2019-10-18 00:29:09 +00:00
Adam Fogle
c41627d75f Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00
Monty Marz
fdfab6a807 refactor: create_projectile doesn't take a light 
It returns a builder so the caller can just do it
 2019-10-17 20:59:36 +00:00
Joshua Barretto
1f39659a54 Merge branch 'zesterer/small-fixes' into 'master' 
Performance Improvements

See merge request veloren/veloren!597
 2019-10-17 20:56:37 +00:00
Joshua Barretto
04c64dc122 Better (and faster) water shaders 2019-10-17 17:11:55 +01:00
Shane Handley
ab59d1f262 Title music fix (fixes #342) 
Fix issue with title music restarting and playing in multiple channels
when the player chooses a play state but then returns to the main menu.
 2019-10-17 16:14:16 +09:00
Joshua Barretto
c01e19fc05 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
Adam Fogle
3a4c307d38 Code cleanup, formatting changes, and fixed the cloth belt's offset. 2019-10-16 00:42:57 -04:00
Joshua Barretto
707b79f2c8 Smoother movement, Space for climbing 2019-10-14 11:22:48 +01:00
Joshua Barretto
4bbc340f52 Faster meshing, better dusk 2019-10-14 10:48:40 +01:00
jshipsey
deadd665c8 tweaks animations to better align with true positions 2019-10-12 14:19:55 -04:00
Adam Fogle
8f7b4afafd Manifest file is now used to load armor. 
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
 2019-10-12 08:31:42 -04:00
Adam Fogle
a5db28113f Redid the mainfest files to remove race/gender. 
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
 2019-10-12 08:31:42 -04:00
Adam Fogle
a2b2d0d493 Created Spec structs for each armor type. 
Moved mesh creating code for each armor type
into matching struct.
Each Spec struct now loads the matching manifest file.
Manifest file is NOT used yet.
Warning thrown due to adding new parameter to the mesh function
for use reading the manifest file.
 2019-10-12 08:31:42 -04:00
Adam Fogle
da54cf76bc Armor names now end with left/right. 
Armor names no longer include their armor part.
This should be inferred from their folder.
 2019-10-12 08:31:42 -04:00
Marcel Märtens
30c9fcc911 Fix bug that metrics took a random port always introduced in !584 
also removed the duplicate port from the server creation process, using the server settings struct now
 2019-10-11 14:19:55 +02:00
Acrimon
a70f3cfd68 Merge branch 'overclockx64/near-plane-increase' into 'master' 
Increased near plane value, fixing character flickering on macOS

See merge request veloren/veloren!575
 2019-10-10 22:45:06 +00:00
Imbris
2651cb9179 Adjust far plane and bring near plane back in a bit 2019-10-10 22:24:24 +00:00
Marcel Märtens
20c520a044 Change the version number to 0.4 2019-10-10 15:48:01 +02:00
Luc Fauvel
b3697e1ea7 Increased near plane value 2019-10-09 22:23:09 -04:00
Forest Anderson
e7b97e0c66 md5sum assets 2019-10-09 22:42:39 +00:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
889fd678c6 More opaque water surface 2019-10-08 12:21:05 +01:00
Wu Yu Wei
75df4600bd Switch portpicker dependemcy to git 
A pull request to fix has been created on original repository. But
since 0.4 is coming out pretty soon, let's swithc to this fork
temporary.
 2019-10-07 15:35:20 +00:00
Joshua Barretto
1a9408c397 Merge branch 'timo-arrowheight' into 'master' 
timo arrow spawn height

See merge request veloren/veloren!558
 2019-10-06 20:19:01 +00:00
timokoesters
25cc1f0103
fix: orientation now supports z rotation 2019-10-06 22:03:29 +02:00
Monty Marz
b3862278af Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Brian Lewis
86619d4192 Fix crashing due to error in Alsa. 
This uses a more recent version of cpal (a dependency of rodio hence the
rodio change) which seems to have fixed a crash due to
'device not available: "Invalid argument"' coming from Alsa.

The change in cpal also made some functions now return `Result` instead
of a bare type which I dealt with by using `expect` to minimize how far
these changes fan out into the code but maybe this isn't ideal.

Fixing https://gitlab.com/veloren/veloren/issues/280 - Crash with ALSA
 2019-10-06 11:24:42 +02:00
Forest Anderson
b13f9f37f7 Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" 
This reverts merge request !547
 2019-10-06 01:31:47 +00:00
Forest Anderson
0304b51159 Chanced to ignore msvc instead of windows 
Change server to ignore msvc
 2019-10-05 17:57:29 -04:00
Forest Anderson
e1bab6afe0 Added jemalloc for Linux systems 2019-10-05 17:57:29 -04:00
Forest Anderson
9ef98ce1a5 Remove heaptrack 2019-10-05 17:57:29 -04:00
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
4a99e5bc1e refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00
Piotr Korgól
152efaee3b Make nametags display levels 2019-10-05 17:37:09 +02:00
Songtronix
43cae5ea64 Fix discord rich presence 2019-10-05 15:35:59 +00:00
Wu Yu Wei
193ff105e2 Update client-side password hashing to argon2 2019-10-05 13:12:20 +00:00
jshipsey
66e8f4c4bc
added bow wielding animations 2019-10-04 21:02:45 +02:00
timokoesters
469349a426
fix(render): figures without vel don't render 2019-10-04 21:02:44 +02:00
Pfauenauge90
e404ea0d4f
assets, rotation, offset changes 2019-10-04 21:02:42 +02:00
Pfauenauge90
39e5530d45
made bow available in char selection 2019-10-04 21:02:40 +02:00
Pfauenauge
b5180320fb
bow position 2019-10-04 21:02:40 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation 2019-10-04 21:02:39 +02:00
Monty Marz
4c1eba1f3e Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Shane Handley
b1d775728a Play some music on game launch 2019-10-05 02:31:24 +09:00
Mckol
9aba318df2 Hash the passwords client-side 2019-10-04 16:44:31 +00:00
Nicolas
6e4d556073 Add max chat message length 
Fixes #115
Credit to @scorpion9979 for the previous implementation (https://gitlab.com/veloren/veloren/merge_requests/215)
 2019-10-04 16:14:54 +02:00
S Handley
810a7e5b5d This is a re-commit of this feature from MR yarn run test where shandley had a catastrophic git cockup. 2019-10-04 09:58:58 +00:00
Acrimon
03bf74f414 Updated toolchain version and a bunch of deps. 2019-10-03 17:19:22 -04:00
Forest Anderson
6715f02a4e Merge branch 'stevedagiraffe/add-option-to-invert-scroll-wheel' into 'master' 
Resolve #266 "Add option to invert scroll wheel"

Closes #266

See merge request veloren/veloren!528
 2019-10-02 23:39:32 +00:00
stevedagiraffe
f1b78d21c8 Formatted with fmt 2019-10-03 09:16:46 +10:00
Songtronix
bced3cb638 feat(voxygen): add logo for windows executable 2019-10-02 16:57:08 +02:00
stevedagiraffe
8680e92548 Added ability to toggle zoom inversion in settings 
Displayed as checkbox under the Gameplay tab.
 2019-10-02 23:09:05 +10:00
stevedagiraffe
f149182290 associated zoom inversion to GameplaySettings 2019-10-02 22:44:41 +10:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Imbris
83b5ca3335 Higher level cache abstraction 2019-10-01 02:10:28 -04:00
Imbris
89a1c45ac7 Cache most recent chunk access in terrain meshing 2019-10-01 02:10:28 -04:00
Carbonhell
6f6fdd87af Function to cancel pending server connections in the login screen. 2019-09-29 19:12:26 +00:00
Monty Marz
11a022abb3 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00
Joshua Barretto
45fbd75907 Merge branch 'zesterer/small-fixes' into 'master' 
Zesterer/small fixes

See merge request veloren/veloren!517
 2019-09-27 13:09:55 +00:00
Joshua Barretto
8d2f1d470c Removed unnecessary code 2019-09-27 14:03:08 +01:00
Joshua Barretto
a90ceddde0 Fixed cold near oceans, faster meshing 2019-09-27 12:46:20 +01:00
Joshua Barretto
09197049cb Made meshing considerably faster 2019-09-27 11:06:32 +01:00
Imbris
5ca65a6894 UI tweaks 2019-09-27 00:23:42 -04:00
Imbris
799e962663 AA mode UI improvements 2019-09-26 23:46:49 -04:00
Imbris
a3daa6065a Add aa modes, with ui interface to switch 2019-09-26 23:14:27 -04:00
Imbris
432e828517 Add MSAAx4 2019-09-26 23:14:27 -04:00
Joshua Barretto
ccc10a0447 Resolved warnings 2019-09-26 16:07:09 +01:00
Pfauenauge90
1a2b32b44b fixed merging issue, tooltip descriptions colour 2019-09-26 16:00:24 +02:00
Joshua Barretto
3a8b146687 Added item descriptions to tooltip 2019-09-26 14:41:04 +01:00
Pfauenauge90
de4af54928 test tooltips 2019-09-26 15:16:58 +02:00
Pfauenauge90
b62ae6f4a7 fix 2019-09-26 15:16:57 +02:00
timokoesters
1fc7c9b67b Fix rot_imgs and tooltip manager 2019-09-26 15:16:57 +02:00
Pfauenauge90
931e53ebbe added item tooltips 2019-09-26 15:16:57 +02:00
Joshua Barretto
bdf74cf151 Fixed typo 2019-09-26 14:03:41 +01:00
Joshua Barretto
81dc77c87b Resolved warnings 2019-09-26 13:34:15 +01:00
Joshua Barretto
59e6febb41 Fixed build placement bug, changed climb to LControl 2019-09-26 12:03:39 +01:00
Joshua Barretto
bef4f11536 Added sprite selection 2019-09-26 11:43:03 +01:00
Joshua Barretto
dff67e1c41 Added block collection, improved controls for it 2019-09-26 00:15:07 +01:00
Joshua Barretto
e22fe81a2f Added velorite 2019-09-26 00:15:07 +01:00
Vechro
deec1e6bca Remove player shadow on death 2019-09-26 00:15:07 +01:00
Joshua Barretto
f57c2ec453 Made consumable items have an effect, better damage animation 2019-09-26 00:15:07 +01:00
Joshua Barretto
a961a267f1 Added apple and mushroom collection 2019-09-26 00:15:07 +01:00
Joshua Barretto
b0a1619698 Fixed shadow distance culling 2019-09-26 00:15:07 +01:00
Joshua Barretto
499344ccab Added entity shadows 2019-09-26 00:15:07 +01:00
Joshua Barretto
899a7c56ab Dark water 2019-09-26 00:15:07 +01:00
Joshua Barretto
207568a012 Better day/night cycle, less intense sun 2019-09-26 00:15:07 +01:00
Pfauenauge90
dec418d1a4 char selection time and VD changed 2019-09-26 00:15:07 +01:00
Joshua Barretto
b62830b8b4 Better hills 2019-09-26 00:15:07 +01:00
Joshua Barretto
46fdc87014 Animated chunk loading 2019-09-26 00:15:07 +01:00
Joshua Barretto
8bcb3c44f7 Reminder about remesh for lighting updates 2019-09-26 00:15:07 +01:00
Joshua Barretto
2416b77a33 Meshing performance improvements 2019-09-26 00:15:07 +01:00
Joshua Barretto
3979dddbc1 Faster meshing, better AO, colour correction 2019-09-26 00:15:07 +01:00
Joshua Barretto
2bd8967921 Prevented extreme blending 2019-09-26 00:15:07 +01:00
Joshua Barretto
f1d590464f Added colour smoothing 2019-09-26 00:15:07 +01:00
Joshua Barretto
6d745fc472 Fixed floodfill algorithm 2019-09-26 00:15:07 +01:00
Imbris
34221a0f1d Disable AO 2019-09-26 00:15:07 +01:00
Joshua Barretto
d745acc948 Floodfill shadows, smooth shadow lighting 2019-09-26 00:15:07 +01:00
Shane Handley
ef3ad3519b Update previous references to 'volume' to prevent ambiguity. Update label for audio device selection in settings dialog. I don't think it is displayed, but maybe useful for documentation. 2019-09-25 01:25:24 +09:00
Shane Handley
8cf6546dec Add an additional SFX Volume control to the in-game settings dialog and supporting events. 2019-09-25 01:18:09 +09:00
Imbris
cceb21240b Fix feature names 2019-09-21 13:41:02 -04:00
Monty Marz
11244bc182 Delete char window visuals, small scrolling fix for char creation background 2019-09-20 12:59:23 +00:00
Monty Marz
3a0131306f Character assets Part 1 2019-09-18 16:46:12 +00:00
Imbris
2ad816449c Make some voxygen dependencies optional 2019-09-15 17:03:33 -04:00
Imbris
28250c9f14 Fix always returning the default settings 2019-09-12 23:37:28 -04:00
Arash Outadi
b986603215 Run cargo fmt 2019-09-12 22:47:51 -04:00
Arash Outadi
57eb3b2de4 Add code path for invalid settings file 2019-09-12 22:47:50 -04:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping 
With an additional approximation to allow for the same size jumps given different framerates.
 2019-09-09 19:11:40 +00:00
Joshua Barretto
933e48ac3b Merge branch 'fix-jump-height' into 'master' 
Fix jump height

See merge request veloren/veloren!485
 2019-09-08 15:50:08 +00:00
Geno
247f0818c1 Footstep volume fix 2019-09-08 15:47:52 +00:00
Forest
c31b01b051 Bumped version 2019-09-08 11:15:46 -04:00
scott-c
2b3749d2f4 Fix performance regression; simplify FigureKey 2019-09-08 19:52:57 +08:00
Andrew Pritchard
2e63152d90 Merge branch 'fix-jump-height' into 'fix-jump-height' 
Fix jump height

See merge request veloren/veloren!477
 2019-09-07 12:48:49 +00:00
Timo Koesters
92c0edcb98 Merge branch 'timo-attack' into 'master' 
Fix wolfs not attacking and adjust movement while attacking

See merge request veloren/veloren!484
 2019-09-07 10:25:57 +00:00
timokoesters
9f83130466
Fix audio 2019-09-07 11:46:21 +02:00
haslersn
d99bef6803 voxygen: Make the Terrain struct generic 2019-09-06 15:43:31 +02:00
haslersn
1796c09ca1 common: Rework volume API 
See the doc comments in `common/src/vol.rs` for more information on
the API itself.

The changes include:

* Consistent `Err`/`Error` naming.
  * Types are named `...Error`.
  * `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
  to an upcoming change where a “map” in the game related sense will
  be added.
* Add volume iterators. There are two types of them:
  * _Position_ iterators obtained from the trait `IntoPosIterator`
    using the method
    `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `Vec3<i32>`.
  * _Volume_ iterators obtained from the trait `IntoVolIterator`
    using the method
    `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
  Those traits will usually be implemented by references to volume
  types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
  type which usually implements several volume traits, such as `Chunk`).
  * _Position_ iterators iterate over the positions valid for that
    volume.
  * _Volume_ iterators do the same but return not only the position
    but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
  `Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
  * `RasterableVol` represents a volume that is compile-time sized and has
    its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
    because such a volume can be used with `VolGrid3d`.
  * `RectRasterableVol` represents a volume that is compile-time sized at
    least in x and y direction and has its lower bound at `(0, 0, z)`.
    There's no requirement on he lower bound or size in z direction.
    The name `RectRasterableVol` was chosen because such a volume can be
    used with `VolGrid2d`.
 2019-09-06 15:43:31 +02:00
Joshua Barretto
66c58840ef Merge branch 'scott-c/first-person-model' into 'master' 
Add first person models

See merge request veloren/veloren!443
 2019-09-06 13:02:03 +00:00
scott-c
37d9acedb0 cleanup comment 2019-09-06 20:22:17 +08:00
scott-c
fcdb0843fc Cleanup unused import 2019-09-06 19:35:47 +08:00
scott-c
930e075ad1 half camera height when rolling 2019-09-06 19:29:52 +08:00
Joshua Barretto
f574b1748a Merge branch 'desttinghim/sound-effects' into 'master' 
Sound Effects

Closes #163 and #97

See merge request veloren/veloren!473
 2019-09-06 11:19:32 +00:00
scott-c
645debe230 Hide player hands when rolling in first person 2019-09-06 19:12:46 +08:00
Louis Pearson
7f27385f95 Removed unescessary if statements 2019-09-06 05:02:29 -06:00
scott-c
836525c33a Simplify model cache key, fixes performance issue 2019-09-06 18:59:05 +08:00
Louis Pearson
02af86d2d6 Change ear pos to Vec3 2019-09-06 04:44:15 -06:00
Louis Pearson
059d968499 Cargo fmt 2019-09-06 04:38:02 -06:00
Louis Pearson
675d72a3ce Code cleanup 2019-09-06 04:36:42 -06:00
Louis Pearson
57fe89e5c8 Fix warnings 2019-09-06 04:25:17 -06:00
scott-c
bc1ccfc99b Fix first person weapon visible while not wielding 2019-09-06 18:22:26 +08:00
Louis Pearson
3fe12ee85f Fix settings move 2019-09-06 04:06:26 -06:00
Andrew Pritchard
b4c74279b7 Vec3 is apprently *not* Copy, Set near plane to 0.1 to prevent tirangle flickering 2019-09-06 13:24:42 +08:00
Monty Marz
943495c0c5 Pixel art for axe and flying rod, shadow for zone names and death message 2019-09-05 17:28:33 +00:00
Louis Pearson
8e5f993a5b Format files 2019-09-05 03:11:18 -06:00
Louis Pearson
2bca20cf69 Get sound effects working 2019-09-05 03:08:09 -06:00
Louis Pearson
529cb40dc4 Add soundcache 
Still getting the stuttering. Time to rethink channels
 2019-09-05 03:08:09 -06:00
Louis Pearson
65008f7d54 Adds proper 3d sound? 
Looks like loading the footstep files every time a sound is played
becomes a problem rather quickly.
 2019-09-05 03:08:09 -06:00
Louis Pearson
b5a979c82e Change footstep rate 2019-09-05 03:08:09 -06:00
Louis Pearson
00830108e9 Add positional audio 
Orientation needs to be set now
 2019-09-05 03:08:09 -06:00
Louis Pearson
fcb141a160 Add delay to walking sounds 2019-09-05 03:08:09 -06:00
Louis Pearson
ad3bd0b2ce Add footstep sounds, implement crude footstep sounding 
Sounds are played every tick, which is not good.
 2019-09-05 03:08:09 -06:00
Louis Pearson
41cd20aaf8 Add play_music call to audiofrontend 2019-09-05 03:08:09 -06:00
Louis Pearson
132d108086 Remove audio/base.rs 2019-09-05 03:08:09 -06:00
Louis Pearson
447cfec19f Add support for fading sounds 2019-09-05 03:08:09 -06:00
Louis Pearson
9dc1f8f549 Revamp AudioFrontend 
audio::base had a lot of unnescessary abstractions and constructs.
The current code simplifies the API in a way that makes sense and
that will allow sound effects and fading to be added in an incremental
way.
 2019-09-05 03:08:09 -06:00
Louis Pearson
0fe5b66dce Use latest version of Rodio instead of custom branch 2019-09-05 03:04:53 -06:00
scott-c
d045dbb2f6 Reduce first person camera interpolation time 2019-09-04 22:05:59 +08:00
scott-c
5fd4f00012 Add first person models 2019-09-04 22:05:59 +08:00
Imbris
fc9c87878e Fix some warnings, cleanup comment 2019-09-03 23:09:29 -04:00
Imbris
8a994ada8e Remove derpy eyes :( , fix undead eye indices, fmt 2019-09-03 23:06:15 -04:00
Imbris
cc331c10b6 Remove use of empty.vox 2019-09-03 23:06:09 -04:00
Imbris
074eee06e6 Add pants coloring, chest and pants sliders 2019-09-03 23:06:06 -04:00
Imbris
0ffc534df2 Add separate eye color lists for each race 2019-09-03 23:06:02 -04:00
Imbris
c4999f5e9d adjust how figure head coloring is done 2019-09-03 23:05:58 -04:00
Imbris
9d086949d1 Add basic index based coloring for figures 2019-09-03 23:05:56 -04:00
Imbris
fd251c4d3a Fix sliders, remove uneeded method, fix aspect ratio in character creation 2019-09-03 23:05:54 -04:00
Imbris
7bebffb2af Add ron file for head offsets, segment unionizer 2019-09-03 23:05:52 -04:00
Imbris
6289ce8c7f Split up figure.rs 2019-09-03 23:05:50 -04:00
Imbris
ab34377309 Add basic segment combination 2019-09-03 23:05:50 -04:00
Imbris
0668823493 Save settings, start log, & set panic hook first 2019-09-03 23:05:47 -04:00
Marcel
9a9ac6bebf Merge branch 'imbris/tooltip-enhancements' into 'master' 
Add ImageFrame widget, make tooltips use this, align ui to the pixels properly

See merge request veloren/veloren!474
 2019-09-03 06:44:38 +00:00
Imbris
625f83e535 Don't add adjacent duplicates to the history 2019-09-02 01:07:16 -04:00
Imbris
47d0904588 Directly adjust chat input when traversing history 2019-09-02 00:54:44 -04:00
tommy
12029d7e7f Added SetText event, rewritten based on comments 2019-09-01 23:43:06 -04:00
tommy
a63e67b8d9 Basic chat window history functionality 2019-09-01 23:43:04 -04:00
Imbris
e8e053095b Remove copy-pasted comment 2019-09-01 16:41:40 -04:00
Imbris
ba186e59cc Adjust tooltip layout by moving title to the right of images 2019-09-01 16:30:26 -04:00
Imbris
3d7326b65f Tooltips: make title optional, improve spacing, make it simple to add similar tooltips to multiple widgets 2019-09-01 15:34:21 -04:00
Imbris
3ccbb0f38d Convert tooltips to use ImageFrame, add autosizing 2019-09-01 15:34:20 -04:00
Imbris
e9bedf529d Pixel perfection, vox orientation, image rotation 2019-09-01 15:34:20 -04:00
Imbris
66ebdb2355 Add ImageFrame widget 2019-09-01 15:34:19 -04:00
Monty Marz
f53904b534 More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
Joshua Barretto
6919886475 Merge branch 'zesterer/worldgen' into 'master' 
Worldgen improvements

See merge request veloren/veloren!457
 2019-08-31 21:37:54 +00:00
Joshua Barretto
cc214982bf Fixed warnings 2019-08-31 11:44:52 +01:00
Joshua Barretto
17a61e0b7c Fixed terrain sprite transparency issue 2019-08-31 11:44:52 +01:00
Joshua Barretto
27c208d1a5 Fixed terrain sprite transparency layering 2019-08-31 11:44:52 +01:00
Joshua Barretto
1fcb4a0313 Added Generator trait, fixed ocean lighting 2019-08-31 11:44:52 +01:00
jshipsey
bb71bdd4a2 removing to make gitlab compiler happy 2019-08-30 23:18:56 -04:00
jshipsey
3c473d6d6c rebase 2019-08-30 23:01:29 -04:00
jshipsey
b81cd6a8f9 combine character.action movement blocks 2019-08-30 22:51:46 -04:00
timokoesters
9a832dd56b Move std::mem::discriminant into new method 2019-08-30 22:51:46 -04:00
timokoesters
d822356161 Remove warning 2019-08-30 22:51:46 -04:00
jshipsey
78bf7a0997 slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation 2019-08-30 22:50:53 -04:00
timokoesters
b99bac87db Make npcs roll correctly 2019-08-30 22:50:53 -04:00
timokoesters
77a48c61a1 Fix rolling for the player 2019-08-30 22:50:53 -04:00
jshipsey
d84c07c1cb fixed tiny feet in char creation 2019-08-30 22:50:53 -04:00
jshipsey
f8d0b1040a readded cidle 2019-08-30 22:50:53 -04:00
jshipsey
bec942753e some stuff fixed, other stuff still broken 2019-08-30 22:50:53 -04:00
timokoesters
cd3e340647 Use movement anim as base and action anim as overwrite 2019-08-30 22:50:53 -04:00
jshipsey
e6197d4c10 separate static anims for feet (run/static) 2019-08-30 22:50:53 -04:00
timokoesters
637b4642d8 Split animations 2019-08-30 22:50:53 -04:00
timokoesters
15978d216b
Rename controller main, alt to primary, secondary 2019-08-31 00:13:45 +02:00
timokoesters
bd8e71c5aa
Rename activate_inventory_slot to use_inventory_slot 2019-08-30 22:46:45 +02:00
timokoesters
b063694d05
Implement icons based on weapon 2019-08-29 21:48:05 +02:00
timokoesters
952ec35857
Remove warnings 2019-08-29 19:54:53 +02:00
Pfauenauge90
12365ee381
Axe offset 2019-08-29 19:44:29 +02:00
Pfauenauge90
9a391332a6
fmt 2019-08-29 19:44:29 +02:00
Pfauenauge90
50c4764588
changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
timokoesters
6e1c78e5d5
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
timokoesters
155605841b
Use comp::Stats to store Equipment, make char weapon selection work 2019-08-29 19:44:28 +02:00
yashaslokesh
be71aea20b Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types 
Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>
 2019-08-27 22:33:14 +00:00
timokoesters
cd061aba85
Make respawn hint text base on key bindings 2019-08-27 14:42:53 +02:00
timokoesters
6b4dfcc533
Allow mapping the same key to multile actions (LMB = attack + respawn) 2019-08-27 14:03:40 +02:00
timokoesters
186db16707
Rename attack, block to main, alt 2019-08-27 14:03:39 +02:00
timokoesters
84d0f61596
Make pipeline succeed 2019-08-26 14:05:17 +02:00
timokoesters
c4879307af
Update to github vek repo 2019-08-26 13:12:45 +02:00
timokoesters
eb34e5bb27
fmt 2019-08-26 13:12:43 +02:00
timokoesters
a715a84ea7
Implement unstoppable rolling 2019-08-26 13:12:42 +02:00
timokoesters
e90f95bc75
Look in the direction of the camera 2019-08-26 13:12:38 +02:00
jshipsey
39bd888a7c
idle block animation 2019-08-26 13:12:38 +02:00
timokoesters
e7c61c30cc
Block when pressing right click while looking at the attacker 2019-08-26 13:12:37 +02:00
Vechro
0f0a28d87a Small changes to velocity 2019-08-22 22:26:35 +03:00
Vechro
2077548d5c Simplify debug info 2019-08-22 21:53:46 +03:00
Monty Marz
fade04d44e Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Joshua Barretto
0fcb3a174d Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
75e1ee3cd7 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Barretto
590ce1a987 Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
Joshua Barretto
4ed21a2e59 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
Joshua Barretto
5f09ab3a4f Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7960e6ea6d Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
b31cca4bb3 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Barretto
6f35786b84 Added Instances construct 2019-08-19 18:23:47 +01:00
Joshua Barretto
e2082088c8 Added sprite pipeline 2019-08-19 18:01:23 +01:00
Acrimon
a41cf1a83d Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Monty Marz
7168850f05 Fix low fps 2019-08-19 08:03:19 +00:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Joshua Barretto
75dbebbd05 More interesting waves 2019-08-18 10:33:18 +01:00
Joshua Barretto
f0e52e6002 Better reflections and water fog 2019-08-18 10:33:18 +01:00