683298b0bf
prepare release builds in release branches
2019-08-04 16:26:59 +02:00
3de68e915a
Merge branch 'qutrin/release-numbers' into 'master'
...
Change the version number to 0.3
See merge request veloren/veloren!385
2019-08-04 12:11:30 +00:00
d3f2ca69a4
Change the version number to 0.3
2019-08-04 13:53:59 +02:00
4042496d10
Merge branch 'vercidium-optimisations' into 'master'
...
Optimised Fragment and Vertex Shaders
See merge request veloren/veloren!394
2019-08-04 11:36:06 +00:00
783e8dbfc0
Reverted parenthesis removal
2019-08-04 12:35:03 +01:00
8abfd2e10f
Reverted sun diffuse change
2019-08-04 12:25:15 +01:00
c36c78252c
Reverted to old star shader
2019-08-04 12:25:15 +01:00
ec34fcf9c8
Optimised fragment and vertex shaders. Framebuffer depth target changed from DEPTH24_STENCIL8 to DEPTH24 for faster depth writing and reading (no bitwise operations needed).
2019-08-04 12:25:15 +01:00
fddf06b787
Merge branch 'pfauenauge/models' into 'master'
...
New Female Danari and Elf models, Airblocks for tower ruins and witch house
See merge request veloren/veloren!404
2019-08-04 11:23:01 +00:00
8c1d244bf8
New Female Danari and Elf models, Airblocks for tower ruins and witch house
2019-08-04 11:23:01 +00:00
51e0edf516
Merge branch 'zesterer/small-fixes' into 'master'
...
Small Improvements
See merge request veloren/veloren!403
2019-08-04 10:42:35 +00:00
767ced8fe7
Limited entity spawning to 10
2019-08-04 11:30:05 +01:00
ff114a83b5
Made bosses slightly more powerful
2019-08-04 10:32:50 +01:00
daa9b81c69
Made boss spawning rarer
2019-08-04 10:27:08 +01:00
7c6479a1fa
More dungeons
2019-08-04 10:09:51 +01:00
c7d2fbc20e
Made humanoids glide when chasing
2019-08-04 09:21:29 +01:00
ee0eb8d53c
Better enemy AI targetting and combat
2019-08-04 08:58:41 +01:00
8ef1532902
Merge branch 'zesterer/worldgen' into 'master'
...
Dungeons
See merge request veloren/veloren!402
2019-08-03 21:33:01 +00:00
f14674ee9a
Switched to UnitChooser
2019-08-03 22:15:23 +01:00
f08d8bb00a
Better movement lerping
2019-08-03 22:15:23 +01:00
8b9a92b30e
Added dungeons
2019-08-03 22:15:23 +01:00
75c61098a5
Merge branch 'pfau/combat' into 'master'
...
Pfau/combat
See merge request veloren/veloren!401
2019-08-03 21:11:57 +00:00
d180c47edc
Pfau/combat
2019-08-03 21:11:57 +00:00
c9f1a793db
Merge branch 'timo-kill-xp' into 'master'
...
Give xp depending on max hp and lvl of entity killed
See merge request veloren/veloren!400
2019-08-03 20:57:06 +00:00
86e10c914c
Adjust xp gains
2019-08-03 22:27:48 +02:00
74b7613cd9
Get rid of unwraps
2019-08-03 22:08:19 +02:00
7365dbe9e6
Give xp depending on max hp and lvl of entity killed
2019-08-03 21:30:01 +02:00
295674d95a
Merge branch 'zesterer/small-fixes' into 'master'
...
Made orientation change with move_dir, added a small amount of knockback, orientation lerp, better enemy combat, improved healthbar placement
See merge request veloren/veloren!399
2019-08-03 18:54:21 +00:00
6b69b24185
Make ori more precise
2019-08-03 20:41:55 +02:00
fe0097c085
Made nametag position change with scale
2019-08-03 19:40:20 +01:00
5fc6ab2126
Better enemy attack rate
2019-08-03 19:40:20 +01:00
91b8b69186
Use slerp for ori
2019-08-03 20:33:31 +02:00
c33892e8af
Made entity collisions z-dependent
2019-08-03 19:09:01 +01:00
71bf09d3b7
Better orientation in the air
2019-08-03 18:30:48 +01:00
e52250a193
Made orientation change with move_dir, added a small amount of knockback
2019-08-03 18:24:07 +01:00
eaee0f263d
Merge branch 'zesterer/small-fixes' into 'master'
...
Made enemies sometimes roll
See merge request veloren/veloren!398
2019-08-03 12:37:42 +00:00
5e3e87f9c5
Made enemies sometimes roll
2019-08-03 13:31:40 +01:00
51fa4f3cfc
Merge branch 'animation-tweaks' into 'master'
...
animation and movement tweaks
See merge request veloren/veloren!389
2019-08-03 12:09:38 +00:00
66a8ed58db
Merge branch 'timo-no-ckback' into 'master'
...
no-ckback
See merge request veloren/veloren!391
2019-08-03 12:09:23 +00:00
cab898a91f
Made enemies actually attack
2019-08-03 13:01:54 +01:00
6f598681fb
Fix combat animations for non humanoids
2019-08-03 12:53:39 +01:00
3a43150bc5
Make hostile npcs back away when too close
2019-08-03 12:53:39 +01:00
c919b68346
changed angle of attack, changed z offset on hit
2019-08-03 12:46:07 +01:00
e39324a9d2
Remove knockback
2019-08-03 12:46:07 +01:00
4415393ec6
Merge branch 'zesterer/small-fixes' into 'master'
...
Added entity pushback
See merge request veloren/veloren!397
2019-08-03 11:33:56 +00:00
3063546a58
Added entity pushback
2019-08-03 12:26:05 +01:00
b90206bf28
Merge branch 'qutrin/humanoids' into 'master'
...
Allow normal enemies to spawn as humanoids
See merge request veloren/veloren!395
2019-08-03 10:47:03 +00:00
8f86f5c483
Allow normal enemies to spawn as humanoids
2019-08-03 12:35:16 +02:00
62dea9ee7b
Merge branch 'zesterer/worldgen-npcs' into 'master'
...
NPC Spawning
See merge request veloren/veloren!393
2019-08-03 06:41:17 +00:00
e6fe07dd3d
Shortened enemy sight distance
2019-08-02 21:35:03 +01:00
