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
2,708 Commits 151 Branches 18 Tags 2.1 GiB
7a4cdfb7a4
Commit Graph

1206 Commits

Author SHA1 Message Date
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
Joshua Barretto
825d8bb632 Fixed water in caves, made water reflection vary with lighting 2019-08-18 10:33:18 +01:00
Joshua Barretto
fa6825f13b Better fluid meshing, disabled fluid backface culling and depth buffer writing 2019-08-18 10:33:18 +01:00
Joshua Barretto
42237a84e4 Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
Luc Fauvel
4a29900914 Copying terrain pipeline and shaders for fluids 2019-08-18 10:33:18 +01:00
jshipsey
2ca81323d5 added shoulder movement and fixed placement 2019-08-18 02:35:27 -04:00
Imbris
f12821db35 Merge branch 'imbris/srgb' into 'master' 
Handle srgb values more accurately, Load shaders at runtime + hotloading

Closes #79

See merge request veloren/veloren!412
 2019-08-16 22:44:14 +00:00
Joshua Barretto
e9fc2789d1 Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' 
Scott c/cull entities outside viewport

Closes #207

See merge request veloren/veloren!442
 2019-08-16 16:47:02 +00:00
scott-c
fce74c6218 cargo fmt 2019-08-17 00:11:06 +08:00
scott-c
2fabdfe0eb unwrap_or instead of map_or 2019-08-17 00:08:09 +08:00
scott-c
dc73e4ffb7 use entity scale as hitbox for frustrum culling 2019-08-16 23:39:07 +08:00
scott-c
f312299e62 Replace view distance culling with frustum culling 2019-08-16 21:45:10 +08:00
Imbris
d89fff1499 Fix typo, move shaders back out of subfolders 2019-08-15 23:59:10 -04:00
Imbris
be0e0e52a8 Improve colors 2019-08-15 23:59:09 -04:00
Imbris
c09eb77149 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Imbris
cb25c45dec Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Acrimon
fda47fc322 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Piotr Korgól
0221de484e Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
Geno
a9f20148a4 added first person switch 2019-08-13 17:54:13 +00:00
Acrimon
b4a46f3e6e Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
0bbef0d851 Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Joshua Barretto
2191921721 Merge branch 'telastrus/auth' into 'master' 
Server-side authentication

See merge request veloren/veloren!419
 2019-08-09 01:37:44 +00:00
telastrus
07d3384b01 fixed the silent kick, made it actually proper 2019-08-08 17:58:36 -04:00
telastrus
66e254db7f actually removed printlns 2019-08-08 12:09:14 -04:00
telastrus
35a3f67e19 ran cargo fmt 2019-08-08 12:05:38 -04:00
telastrus
de2082469d auth done, no popup yet 2019-08-08 12:01:15 -04:00
telastrus
f2ed2870c6 90% there 2019-08-08 11:23:58 -04:00
telastrus
09b15e5278 velocity fix 2019-08-08 10:42:23 -04:00
telastrus
6d94d43021 still compiles 2019-08-07 23:56:02 -04:00
telastrus
157c4816b3 laying the groundwork 2019-08-07 15:42:44 -04:00
Monty Marz
aac53f9311 Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
telastrus
e4f2c73b85 undo unnecessary pub mod 
fixed comments

fixed other comment
 2019-08-06 22:46:25 -04:00
telastrus
0eafd42c0f fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Joshua Barretto
73a44d0fb1 Collision fixes, better camera in build mode 2019-08-06 16:00:14 +01:00
Marcel
86be3fccfc Merge branch 'timo-cleanup' into 'master' 
Implement specifier syntax and cleanup

See merge request veloren/veloren!413
 2019-08-06 06:52:24 +00:00
timokoesters
1227596406 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
telastrus
4dcb53bdb8 reverted some unnecessary changes 
corrected typo

ran cargo fmt
 2019-08-05 19:41:31 -04:00
telastrus
c098a5efd7 Added adjustable FOV slider 2019-08-05 12:37:52 -04:00
Joshua Barretto
a324f01a1d Improved orientation slerping 2019-08-04 15:51:17 +01:00
Joshua Barretto
e5bcc8912e Stopped stars appearing in the day 2019-08-04 15:30:45 +01:00
Piotr Korgól
d3f2ca69a4 Change the version number to 0.3 2019-08-04 13:53:59 +02:00