|
|
f14c787c85
|
Switched to EventBus system
|
2019-08-07 16:39:16 +01:00 |
|
|
|
a59fcc18df
|
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 |
|
|
|
2101f27ffb
|
Part 1 of implementing the social window
|
2019-08-07 13:14:26 +00:00 |
|
|
|
d58274b928
|
Added entity event system, fixed fall damage
|
2019-08-07 10:50:49 +01:00 |
|
|
|
18f5504efc
|
Merge branch 'telastrus/fall-damage' into 'master'
Rudimentary fall damage
See merge request veloren/veloren!417
|
2019-08-07 02:51:43 +00:00 |
|
|
|
b05f99d809
|
undo unnecessary pub mod
fixed comments
fixed other comment
|
2019-08-06 22:46:25 -04:00 |
|
|
|
687a042cfa
|
fall damage + velocity debug
|
2019-08-06 17:51:13 -04:00 |
|
|
|
5504e5be0e
|
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 |
|
|
|
c8ce4459e8
|
Collision fixes, better camera in build mode
|
2019-08-06 16:00:14 +01:00 |
|
|
|
6616690f66
|
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 |
|
|
|
71ba9deeca
|
Add a new dungeon, fixes for existing ones
|
2019-08-06 12:51:14 +03:00 |
|
|
|
17aae64bf5
|
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 |
|
|
|
a6691a3f58
|
Implement specifier syntax and cleanup
|
2019-08-06 08:31:48 +02:00 |
|
|
|
89ae781cd4
|
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 |
|
|
|
423d990132
|
reverted some unnecessary changes
corrected typo
ran cargo fmt
|
2019-08-05 19:41:31 -04:00 |
|
|
|
fe06ae6510
|
Added adjustable FOV slider
|
2019-08-05 12:37:52 -04:00 |
|
|
|
30e5cf5489
|
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 |
|
|
|
06048c1113
|
Fixes voxel errors in the human female hair
|
2019-08-04 18:55:20 +00:00 |
|
|
|
8b2c53c93b
|
really really fix .gitlab-ci windows release build wasnt uploading artifacts
|
2019-08-04 18:14:48 +02:00 |
|
|
|
893b4b066a
|
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 |
|
|
|
4a49335917
|
temp allor release builds to be generated
|
2019-08-04 16:55:09 +02:00 |
|
|
|
a82ae863f3
|
Improved orientation slerping
|
2019-08-04 15:51:17 +01:00 |
|
|
|
bbe32c062c
|
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 |
|
|
|
da7c3020a2
|
Stopped stars appearing in the day
|
2019-08-04 15:30:45 +01:00 |
|
|
|
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 |
|
