218d8194b1
prepare release builds in release branches
2019-08-04 16:26:59 +02:00
724844d23c
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
9637bb89aa
Change the version number to 0.3
2019-08-04 13:53:59 +02:00
4295d2372a
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
744f69e271
Reverted parenthesis removal
2019-08-04 12:35:03 +01:00
5aed7db800
Reverted sun diffuse change
2019-08-04 12:25:15 +01:00
01fc0c44e4
Reverted to old star shader
2019-08-04 12:25:15 +01:00
451bcd2649
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
3ad164489a
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
f83092a03c
New Female Danari and Elf models, Airblocks for tower ruins and witch house
2019-08-04 11:23:01 +00:00
636402cccd
Merge branch 'zesterer/small-fixes' into 'master'
...
Small Improvements
See merge request veloren/veloren!403
2019-08-04 10:42:35 +00:00
d29cf107d9
Limited entity spawning to 10
2019-08-04 11:30:05 +01:00
0b26ca7e87
Made bosses slightly more powerful
2019-08-04 10:32:50 +01:00
790abdcc18
Made boss spawning rarer
2019-08-04 10:27:08 +01:00
ba52d86eea
More dungeons
2019-08-04 10:09:51 +01:00
9a85fbc80e
Made humanoids glide when chasing
2019-08-04 09:21:29 +01:00
09074fd7ef
Better enemy AI targetting and combat
2019-08-04 08:58:41 +01:00
aea3712c01
Merge branch 'zesterer/worldgen' into 'master'
...
Dungeons
See merge request veloren/veloren!402
2019-08-03 21:33:01 +00:00
beefd3326d
Switched to UnitChooser
2019-08-03 22:15:23 +01:00
80a1605052
Better movement lerping
2019-08-03 22:15:23 +01:00
e9d249966d
Added dungeons
2019-08-03 22:15:23 +01:00
0a85f41e8f
Merge branch 'pfau/combat' into 'master'
...
Pfau/combat
See merge request veloren/veloren!401
2019-08-03 21:11:57 +00:00
b3efdf1f09
Pfau/combat
2019-08-03 21:11:57 +00:00
8a07cd96bf
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
02516a23e2
Adjust xp gains
2019-08-03 22:27:48 +02:00
e510c17c9e
Get rid of unwraps
2019-08-03 22:08:19 +02:00
656d881c6c
Give xp depending on max hp and lvl of entity killed
2019-08-03 21:30:01 +02:00
5a2c24f8b0
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
799bb872f9
Make ori more precise
2019-08-03 20:41:55 +02:00
9cde590574
Made nametag position change with scale
2019-08-03 19:40:20 +01:00
663be70e3f
Better enemy attack rate
2019-08-03 19:40:20 +01:00
a3330f7d5b
Use slerp for ori
2019-08-03 20:33:31 +02:00
baf0899d56
Made entity collisions z-dependent
2019-08-03 19:09:01 +01:00
06f964d49e
Better orientation in the air
2019-08-03 18:30:48 +01:00
6dc48d3a23
Made orientation change with move_dir, added a small amount of knockback
2019-08-03 18:24:07 +01:00
3a036aa9bc
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
e205a3b1db
Made enemies sometimes roll
2019-08-03 13:31:40 +01:00
96029f6614
Merge branch 'animation-tweaks' into 'master'
...
animation and movement tweaks
See merge request veloren/veloren!389
2019-08-03 12:09:38 +00:00
cde72d6c49
Merge branch 'timo-no-ckback' into 'master'
...
no-ckback
See merge request veloren/veloren!391
2019-08-03 12:09:23 +00:00
929cd5ee29
Made enemies actually attack
2019-08-03 13:01:54 +01:00
5288ae2fcf
Fix combat animations for non humanoids
2019-08-03 12:53:39 +01:00
4e59bb19c8
Make hostile npcs back away when too close
2019-08-03 12:53:39 +01:00
a7731c9b15
changed angle of attack, changed z offset on hit
2019-08-03 12:46:07 +01:00
d8f1e6b7dc
Remove knockback
2019-08-03 12:46:07 +01:00
bb4e279a70
Merge branch 'zesterer/small-fixes' into 'master'
...
Added entity pushback
See merge request veloren/veloren!397
2019-08-03 11:33:56 +00:00
0a8985335e
Added entity pushback
2019-08-03 12:26:05 +01:00
f8d1387b16
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
0c75429837
Allow normal enemies to spawn as humanoids
2019-08-03 12:35:16 +02:00
9b8f55ed83
Merge branch 'zesterer/worldgen-npcs' into 'master'
...
NPC Spawning
See merge request veloren/veloren!393
2019-08-03 06:41:17 +00:00
3d8453c0c3
Shortened enemy sight distance
2019-08-02 21:35:03 +01:00
