|
|
5e153f1b5c
|
Merge branch 'angelonfira/add-lines-of-code-readme' into 'master'
Added lines of code badge into readme
See merge request veloren/veloren!622
|
2019-11-04 16:14:11 +00:00 |
|
|
|
e79385086c
|
Merge branch 'login_info' into 'master'
login info text
See merge request veloren/veloren!642
|
2019-11-01 20:53:52 +00:00 |
|
|
|
cbb794f676
|
login info text
|
2019-11-01 20:53:52 +00:00 |
|
|
|
2f6006341a
|
Merge branch 'soruh/calculate-spawn-point' into 'master'
dynamically calculate the spawn point's z coordinate
See merge request veloren/veloren!637
|
2019-11-01 00:24:18 +00:00 |
|
|
|
49f7be290b
|
iterate up to max_z + 1
(because max_z could still be a soild block)
|
2019-11-01 00:24:18 +00:00 |
|
|
|
46b00255b0
|
Merge branch 'xacrimon/update-lockfile' into 'master'
Updated lockfile.\
See merge request veloren/veloren!639
|
2019-10-30 23:34:33 +00:00 |
|
|
|
cf154669bf
|
Updated lockfile.
|
2019-10-30 23:25:18 +01:00 |
|
|
|
4417080ce5
|
Merge branch 'xacrimon/artifacts-license' into 'master'
Add LICENSE to all builds.
Closes #364
See merge request veloren/veloren!638
|
2019-10-29 23:51:58 +00:00 |
|
|
|
bf7e157726
|
Fix #364.
|
2019-10-29 23:48:15 +01:00 |
|
|
|
5cf858a1e9
|
Merge branch 'xacrimon/remove-heaptrack' into 'master'
Remove heaptrack as it is now deprecated.
See merge request veloren/veloren!636
|
2019-10-29 06:55:45 +00:00 |
|
|
|
bc9667d669
|
Remove heaptrack as it is now deprecated.
|
2019-10-29 06:55:45 +00:00 |
|
|
|
bad72c1d0a
|
Merge branch 'xacrimon/security-status' into 'master'
Add a security job which displays cargo-audit info
See merge request veloren/veloren!634
|
2019-10-28 19:28:11 +00:00 |
|
|
|
6b6f81de47
|
Fix ci job.
|
2019-10-28 19:23:27 +01:00 |
|
|
|
3a82aa384f
|
Added basic security job that just runs audit.
|
2019-10-28 19:18:02 +01:00 |
|
|
|
acdcdeed1f
|
Merge branch 'pfau/keybinds_item_desc' into 'master'
Updated: Help Window, Map, Item Descriptions
See merge request veloren/veloren!633
|
2019-10-27 22:22:40 +00:00 |
|
|
|
7d63f0297d
|
Updated: Help Window, Map, Item Descriptions
|
2019-10-27 22:22:40 +00:00 |
|
|
|
064703a996
|
Merge branch 'slipped/skeletons' into 'master'
new skeletons
See merge request veloren/veloren!620
|
2019-10-27 14:06:54 +00:00 |
|
|
|
f0e48e3cd7
|
Merge branch 'mckol/update-readme' into 'master'
Updated download info in readme
See merge request veloren/veloren!632
|
2019-10-27 12:17:36 +00:00 |
|
|
|
2f395ec454
|
updated download info in readme
|
2019-10-27 12:07:09 +01:00 |
|
|
|
1aeb354fbc
|
Merge branch 'physics-fix' into 'master'
fixing character movement to no longer fail normalization then get a zero vec...
See merge request veloren/veloren!631
|
2019-10-26 22:56:21 +00:00 |
|
|
|
5ee567dfb6
|
fixing character movement to no longer fail normalization then get a zero vec and then normalize again
may this can be further simplyfied
|
2019-10-26 22:14:11 +02:00 |
|
|
|
11b0270745
|
Merge branch 'imbris/more-fixes' into 'master'
Fix some bugs introduced by !555
See merge request veloren/veloren!630
|
2019-10-26 03:11:39 +00:00 |
|
|
|
3536b0f273
|
rebase, small fixes
|
2019-10-25 22:20:38 -04:00 |
|
|
|
fd06a0a7bf
|
fix: bugs in new server ecs systems fixed
|
2019-10-25 22:00:47 -04:00 |
|
|
|
d74f0bb2ce
|
purged references to npckind from anim files, removed warnings
|
2019-10-25 21:50:14 -04:00 |
|
|
|
c503f6e063
|
streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.
|
2019-10-25 21:50:14 -04:00 |
|
|
|
345095a183
|
added large bipeds, small birbs, small fish skeletons
|
2019-10-25 21:47:23 -04:00 |
|
|
|
1c1e577c5b
|
added dragon skeleton
|
2019-10-25 21:44:33 -04:00 |
|
|
|
33fb92aa08
|
fish_medium and bird_medium skelingtons
|
2019-10-25 21:39:06 -04:00 |
|
|
|
81f37241d0
|
body tweak
|
2019-10-25 21:34:29 -04:00 |
|
|
|
b9c623307a
|
added large bipeds, small birbs, small fish skeletons
|
2019-10-25 21:34:29 -04:00 |
|
|
|
c69beb64a9
|
added dragon skeleton
|
2019-10-25 21:33:59 -04:00 |
|
|
|
1456548dbd
|
fish_medium and bird_medium skelingtons
|
2019-10-25 21:33:02 -04:00 |
|
|
|
572196ed10
|
Merge branch 'songtronix/set-voxygen-config-via-env' into 'master'
customizable config file location via environment variable
See merge request veloren/veloren!617
|
2019-10-25 18:52:38 +00:00 |
|
|
|
1616f60664
|
Merge branch 'timo-char-weapon-fix' into 'master'
fix: character now spawns with a weapon again
See merge request veloren/veloren!629
|
2019-10-25 11:42:31 +00:00 |
|
|
|
9c21e5e45d
|
fix: character now spawns with a weapon again
|
2019-10-25 13:14:36 +02:00 |
|
|
|
d77e91343b
|
Merge branch 'timo-items-as-ron' into 'master'
feat: store items as RON files
See merge request veloren/veloren!618
|
2019-10-25 08:57:39 +00:00 |
|
|
|
9bf42005f2
|
refactor: small adjustments
|
2019-10-25 09:47:28 +02:00 |
|
|
|
c294528b2e
|
Merge branch 'imbris/chair-fix' into 'master'
Fix object spawning
See merge request veloren/veloren!628
|
2019-10-25 07:14:46 +00:00 |
|
|
|
4f389b3a70
|
fix: /object chat command no longer spawns invisible objects
|
2019-10-25 02:08:23 -04:00 |
|
|
|
a6b352b93e
|
Merge branch 'imbris/mesh-speed' into 'master'
Speed up terrain meshing ~20%
See merge request veloren/veloren!625
|
2019-10-25 02:22:03 +00:00 |
|
|
|
8df95e0ce7
|
improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks
|
2019-10-24 20:02:29 -04:00 |
|
|
|
8dffaf4b6d
|
add giveitem command
|
2019-10-25 00:14:08 +02:00 |
|
|
|
a9555d8427
|
feat: asset glob loading, random weapons in chests
|
2019-10-24 23:55:25 +02:00 |
|
|
|
9ffbb9550b
|
improvement: load_cloned returns a result
|
2019-10-24 23:55:24 +02:00 |
|
|
|
2182becc6a
|
improvement: make debug items of type ItemKind::Tool
This way all items that can be held in a hand are tools
|
2019-10-24 23:55:24 +02:00 |
|
|
|
c426c1641c
|
feat: store items as RON files
When a new item is created, a ron file will be used as a template
|
2019-10-24 23:47:26 +02:00 |
|
|
|
0047aace1a
|
Merge branch 'pfau/fix-help-window' into 'master'
.floating(true) for help window background to make it layer above every recent and future widget
See merge request veloren/veloren!627
|
2019-10-24 18:21:17 +00:00 |
|
|
|
072611f703
|
.floating(true) for help window background to make it layer above every recent and future widget
|
2019-10-24 18:21:17 +00:00 |
|
|
|
8fa8bc31c4
|
Merge branch 'soruh/fix-welcome-window-depth' into 'master'
fix the welcome window not being closeable, due to it being obscured by the chat
See merge request veloren/veloren!623
|
2019-10-24 12:49:20 +00:00 |
|
