Forest Anderson
|
d6a2129c84
|
Merge branch 'qutrin/lantern-limit' into 'master'
Add a lantern strength limit to prevent shader overflows
Closes #219
See merge request veloren/veloren!421
|
2019-08-08 15:07:58 +00:00 |
|
telastrus
|
09b15e5278
|
velocity fix
|
2019-08-08 10:42:23 -04:00 |
|
Piotr Korgól
|
9f2d66b025
|
Add a lantern strength limit to prevent shader overflows
|
2019-08-08 14:44:58 +02: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 |
|
Joshua Barretto
|
e6f384fc11
|
Added default explosion radius
|
2019-08-07 18:18:32 +01:00 |
|
Joshua Barretto
|
5b62531da3
|
Added /explosion command
|
2019-08-07 18:17:04 +01:00 |
|
Joshua Barretto
|
192f5d355f
|
Switched to EventBus system
|
2019-08-07 16:39:16 +01:00 |
|
Marcel
|
2eac162ee4
|
Merge branch 'pfauenauge/social-window' into 'master'
Part 1 of implementing the social window
See merge request veloren/veloren!415
|
2019-08-07 13:14:26 +00:00 |
|
Monty Marz
|
aac53f9311
|
Part 1 of implementing the social window
|
2019-08-07 13:14:26 +00:00 |
|
Joshua Barretto
|
98a913195b
|
Added entity event system, fixed fall damage
|
2019-08-07 10:50:49 +01:00 |
|
Forest Anderson
|
2fb8306b98
|
Merge branch 'telastrus/fall-damage' into 'master'
Rudimentary fall damage
See merge request veloren/veloren!417
|
2019-08-07 02:51:43 +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
|
8b4b1163d4
|
Merge branch 'zesterer/small-fixes' into 'master'
Collision fixes, better camera in build mode
See merge request veloren/veloren!416
|
2019-08-06 15:13:57 +00:00 |
|
Joshua Barretto
|
73a44d0fb1
|
Collision fixes, better camera in build mode
|
2019-08-06 16:00:14 +01:00 |
|
Joshua Barretto
|
cbae0d753f
|
Merge branch 'vechro/dungeons' into 'master'
Add a new dungeon, fixes for existing ones
See merge request veloren/veloren!414
|
2019-08-06 10:21:39 +00:00 |
|
Vechro
|
595f9ac3d2
|
Add a new dungeon, fixes for existing ones
|
2019-08-06 12:51:14 +03: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 |
|
Forest Anderson
|
3d38dbb45a
|
Merge branch 'telastrus/add-adjustable-fov' into 'master'
Add adjustable fov
See merge request veloren/veloren!411
|
2019-08-05 23:48:41 +00: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 |
|
Timo Koesters
|
ade0724baf
|
Merge branch 'human-female-hair-fix' into 'master'
Fixes voxel errors in the human female hair
See merge request veloren/veloren!407
|
2019-08-04 18:55:20 +00:00 |
|
Monty Marz
|
ad5608b3f5
|
Fixes voxel errors in the human female hair
|
2019-08-04 18:55:20 +00:00 |
|
Marcel Märtens
|
ef049607e0
|
really really fix .gitlab-ci windows release build wasnt uploading artifacts
|
2019-08-04 18:14:48 +02:00 |
|
Joshua Barretto
|
fcc54f0476
|
Merge branch 'zesterer/small-fixes' into 'master'
Stopped stars appearing in the day, better slerping
See merge request veloren/veloren!406
|
2019-08-04 15:00:15 +00:00 |
|
Marcel Märtens
|
42c8eb8c2d
|
temp allor release builds to be generated
|
2019-08-04 16:55:09 +02:00 |
|
Joshua Barretto
|
a324f01a1d
|
Improved orientation slerping
|
2019-08-04 15:51:17 +01:00 |
|
Marcel
|
1bf6fdcd46
|
Merge branch 'fixci' into 'master'
prepare release builds in release branches
See merge request veloren/veloren!405
|
2019-08-04 14:34:34 +00:00 |
|
Joshua Barretto
|
e5bcc8912e
|
Stopped stars appearing in the day
|
2019-08-04 15:30:45 +01:00 |
|
Marcel Märtens
|
683298b0bf
|
prepare release builds in release branches
|
2019-08-04 16:26:59 +02:00 |
|
Joshua Barretto
|
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 |
|
Piotr Korgól
|
d3f2ca69a4
|
Change the version number to 0.3
|
2019-08-04 13:53:59 +02:00 |
|
Joshua Barretto
|
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 |
|
Joshua Barretto
|
783e8dbfc0
|
Reverted parenthesis removal
|
2019-08-04 12:35:03 +01:00 |
|
Joshua Barretto
|
8abfd2e10f
|
Reverted sun diffuse change
|
2019-08-04 12:25:15 +01:00 |
|
Tesseract
|
c36c78252c
|
Reverted to old star shader
|
2019-08-04 12:25:15 +01:00 |
|
Tesseract
|
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 |
|
Joshua Barretto
|
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 |
|
Monty Marz
|
8c1d244bf8
|
New Female Danari and Elf models, Airblocks for tower ruins and witch house
|
2019-08-04 11:23:01 +00:00 |
|
Joshua Barretto
|
51e0edf516
|
Merge branch 'zesterer/small-fixes' into 'master'
Small Improvements
See merge request veloren/veloren!403
|
2019-08-04 10:42:35 +00:00 |
|
Joshua Barretto
|
767ced8fe7
|
Limited entity spawning to 10
|
2019-08-04 11:30:05 +01:00 |
|
Joshua Barretto
|
ff114a83b5
|
Made bosses slightly more powerful
|
2019-08-04 10:32:50 +01:00 |
|
Joshua Barretto
|
daa9b81c69
|
Made boss spawning rarer
|
2019-08-04 10:27:08 +01:00 |
|
Joshua Barretto
|
7c6479a1fa
|
More dungeons
|
2019-08-04 10:09:51 +01:00 |
|
Joshua Barretto
|
c7d2fbc20e
|
Made humanoids glide when chasing
|
2019-08-04 09:21:29 +01:00 |
|
Joshua Barretto
|
ee0eb8d53c
|
Better enemy AI targetting and combat
|
2019-08-04 08:58:41 +01:00 |
|
Joshua Barretto
|
8ef1532902
|
Merge branch 'zesterer/worldgen' into 'master'
Dungeons
See merge request veloren/veloren!402
|
2019-08-03 21:33:01 +00:00 |
|
Joshua Barretto
|
f14674ee9a
|
Switched to UnitChooser
|
2019-08-03 22:15:23 +01:00 |
|