Joshua Barretto
86bb277116
Added snow to mountains, fixed hash sub-chunk allocation failure
...
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
2019-05-25 05:51:45 +01:00
Joshua Barretto
cafbb45e52
Small worldgen fixes and hash chunk optimisation
...
Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c
2019-05-25 05:51:45 +01:00
Joshua Barretto
611b270ded
Improved cache-coherency of world chunk interpolation
...
Former-commit-id: 2f45cf47916970185c65c701dfc63ae838f05734
2019-05-25 05:51:45 +01:00
Forest Anderson
0ef1c0084c
Merge branch 'adding-combat-anims' into 'master'
...
Combat animation groundwork
See merge request veloren/veloren!174
Former-commit-id: 7fd5356a9fab76184e2726e96154d975c5855458
2019-05-24 23:36:19 +00:00
jshipsey
e84d19b5c8
fmt
...
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
2019-05-24 19:01:10 -04:00
jshipsey
ee029b380c
erge branch 'adding-combat-anims' of https://gitlab.com/veloren/veloren into adding-combat-anims
...
rebase
Former-commit-id: 3cc8d5ff5435b2328c2104fbd2d345a3f4be6a67
2019-05-24 18:54:48 -04:00
jshipsey
f94a8b636d
restored previous animations with new bone setup
...
Former-commit-id: e507dba772d931e3ddebd0c4ecc8e038521a2e3e
2019-05-24 18:51:33 -04:00
jshipsey
8e896cc3c4
rotation simplification
...
Former-commit-id: d6ddc514d76dee88477964a7cf053122e39a67a8
2019-05-24 18:43:49 -04:00
jshipsey
98630b3692
attack state
...
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
2019-05-24 18:42:22 -04:00
jshipsey
ac41a2241c
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2
2019-05-24 18:33:56 -04:00
jshipsey
a65d6e733f
rotation simplification
...
Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0
2019-05-24 18:33:55 -04:00
jshipsey
5049b9a2ae
attack state
...
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
2019-05-24 18:33:55 -04:00
Forest Anderson
c45d1f37b7
Merge branch 'msgbox_update' into 'master'
...
Msgbox update
See merge request veloren/veloren!170
Former-commit-id: 7af35336762375d9b6d1c1ef3f4608d90f54d247
2019-05-24 21:26:25 +00:00
Joshua Barretto
9101889aa5
Remove msgbox dependency
...
The messagebox denedency was causing conflicts when trying to build on
my workstation. Removing this dependency resolved the problem
immediately. Will work to replace this functionality before sending
upstream.
Former-commit-id: aeb4255e9c046c5c721316ec408497a7eeca0a5a
2019-05-24 21:26:25 +00:00
Forest Anderson
27f2a5c3cc
Merge branch 'link-fixes' into 'master'
...
Book link fix.
Closes #98
See merge request veloren/veloren!173
Former-commit-id: b412b5b8b143e04b7462a0af361c001d4f21b9ea
2019-05-24 21:18:06 +00:00
Cody
ee813cf747
Fixes broken book link.
...
Former-commit-id: f5636533167c22fef504026acdfad8e35e7b2694
2019-05-24 17:06:55 -04:00
Forest Anderson
d057c2e636
Merge branch 'login-screen' into 'master'
...
New Background image (.png)
See merge request veloren/veloren!172
Former-commit-id: 8f392b67e77716848f4748396571aad3414c62dd
2019-05-24 19:41:18 +00:00
Monty Marz
70033245cc
New Background image (.png)
...
Former-commit-id: 35912f0ecb432f54a74daa076ff2b192aa100778
2019-05-24 19:41:18 +00:00
Joshua Barretto
959945e97f
Merge branch 'ingame_ui_attempt' into 'master'
...
Add Health Bars and Name Tags
See merge request veloren/veloren!155
Former-commit-id: 8ebb8dd060cc66349829b9e4b335b1f42ae949e5
2019-05-24 12:53:42 +00:00
Joshua Barretto
4f2b27c338
fmt
...
Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c
2019-05-24 13:43:03 +01:00
Imbris
265e8f243c
small fixes
...
Former-commit-id: 0ac2c4e058340d99709843b52fed4a06498ab500
2019-05-24 02:32:39 -04:00
Imbris
dd607ba9a4
add key to toggle ingame ui elements
...
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
2019-05-24 02:31:05 -04:00
Imbris
1d5bf26491
Round resolution scaling to powers of 2
...
Former-commit-id: c4ae59271076e1402eb1012257b6e40f082faf06
2019-05-24 02:31:04 -04:00
Imbris
24a14b083f
Scaling of ingame text rasterization to match final size
...
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
2019-05-24 02:31:04 -04:00
Imbris
a128abc925
Simplify ingame.rs, fix adding new entities
...
Former-commit-id: b5fbf1a0155e8cb2cb7837004b3c0e43ca2ae92e
2019-05-24 02:31:04 -04:00
Imbris
db910855df
Simplify ingame.rs, fix adding new entities
...
Former-commit-id: 3e92c4c8c1c580e2b2d95eecd213ac42cf0dd0bc
2019-05-24 02:31:03 -04:00
Imbris
e9683ba639
Link player stats, remove self name tag
...
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
2019-05-24 02:31:03 -04:00
Imbris
45bea22727
Add healthbars, rebase fixes, warning fixes
...
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
2019-05-24 02:31:03 -04:00
Imbris
93ec66a8b1
Add ability to position tuples of widgets ingame
...
Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532
2019-05-24 02:31:02 -04:00
Imbris
b828bffba9
Make name labels work
...
Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a
2019-05-24 02:31:02 -04:00
Joshua Barretto
8c4c14f749
Fixed UI shader
...
Former-commit-id: 12851d800a5435d25573e1deadb10b8103d40ac7
2019-05-24 02:31:02 -04:00
Imbris
7fd3854093
ingame_ui
...
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
2019-05-24 02:31:01 -04:00
Joshua Barretto
f839b623f4
Merge branch 'failed-164' into 'master'
...
Disclaimer
See merge request veloren/veloren!169
Former-commit-id: 9d6ded433e519f0950df861c96c5e936ae66908c
2019-05-23 22:45:48 +00:00
Monty Marz
cc9b028bf1
Disclaimer
...
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
2019-05-23 22:45:48 +00:00
Joshua Barretto
d67efe56eb
Merge branch 'view_dist_crash_fix' into 'master'
...
View dist crash fix
See merge request veloren/veloren!167
Former-commit-id: 3e697387bbbe781e28edcdb2d6ef2057d276fc24
2019-05-23 09:55:06 +00:00
sxv20_
3e49c37a08
fix crash on view distance change related to borrows
...
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
2019-05-23 10:30:46 +01:00
sxv20_
894b4339ca
move debug info DebugInfo struct
...
Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31
2019-05-23 10:30:00 +01:00
Joshua Barretto
0fcec2b476
Merge branch 'ping_indicator' into 'master'
...
Add ping indicator to debug HUD
See merge request veloren/veloren!166
Former-commit-id: ea9c854941094440cf6946549df9e3908e3788bf
2019-05-23 08:18:25 +00:00
Algorhythm
6456198b38
Add ping indicator to debug HUD
...
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
2019-05-23 08:18:25 +00:00
jshipsey
21b938e21d
fixed typo
...
Former-commit-id: 9a102af47e8210b5ec19d92999304f9b6b31b9dd
2019-05-23 00:11:07 -04:00
jshipsey
cace9c6a8f
cleaning up inconsistencies in animation code
...
Former-commit-id: 31c8ae92c3ebf9bed01aba29f9a030de334df153
2019-05-22 23:36:43 -04:00
jshipsey
a0c713ff23
merging to branch
...
Former-commit-id: 991d4f298866f4b222090f9b62a3ba5adce38f0a
2019-05-22 22:43:49 -04:00
jshipsey
358dda5e44
tweaks to run, sword position
...
Former-commit-id: 05d91424eaec9c44d960efbee57574653e6b22da
2019-05-22 22:20:57 -04:00
jshipsey
d8cc5bbcf0
restored previous animations with new bone setup
...
Former-commit-id: b6bb91e1b8a940caff11f7a78f613806695ce911
2019-05-22 22:20:57 -04:00
jshipsey
ceb207a1bf
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: 440ea04df1c5a38d02b90131be6cf120edaa207b
2019-05-22 22:20:57 -04:00
jshipsey
25f05b0add
rotation simplification
...
Former-commit-id: a948b8a62f42ff5f516721396c1e066fdd379794
2019-05-22 22:20:57 -04:00
jshipsey
921019cf68
attack state
...
Former-commit-id: a97fc3466bb92a12ea59376f058864846ef125f3
2019-05-22 22:20:57 -04:00
Joshua Barretto
54c78479c3
Merge branch 'vertex-compression' into 'master'
...
Improved GPU memory usage by ~5x by compressing vertex data
Closes #106
See merge request veloren/veloren!163
Former-commit-id: 4468e2bc4d9bd819f8a31994acc4cdcdd1317876
2019-05-22 18:54:01 +00:00
Joshua Barretto
3963d4a3ef
fmt
...
Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433
2019-05-22 19:49:06 +01:00
Joshua Barretto
1684013138
Improved GPU memory usage by ~5x by compressing vertex data
...
Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886
2019-05-22 19:32:33 +01:00
