Marcel
|
776919bc6e
|
Merge branch 'soruh/update-toolchain' into 'master'
Update the toolchain to `nightly-2019-11-04`
See merge request veloren/veloren!645
|
2019-11-04 18:58:06 +00:00 |
|
soruh
|
e3bd152d24
|
update toolchain to nightly-2019-11-04
|
2019-11-04 18:26:32 +01:00 |
|
Marcel
|
41f46cb499
|
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 |
|
Monty Marz
|
ceee89db63
|
Merge branch 'login_info' into 'master'
login info text
See merge request veloren/veloren!642
|
2019-11-01 20:53:52 +00:00 |
|
Monty Marz
|
240b620c13
|
login info text
|
2019-11-01 20:53:52 +00:00 |
|
Joshua Barretto
|
97eec62709
|
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 |
|
soruh
|
007920a238
|
iterate up to max_z + 1
(because max_z could still be a soild block)
|
2019-11-01 00:24:18 +00:00 |
|
Acrimon
|
b095a14c02
|
Merge branch 'xacrimon/update-lockfile' into 'master'
Updated lockfile.\
See merge request veloren/veloren!639
|
2019-10-30 23:34:33 +00:00 |
|
Acrimon
|
21ceb6994b
|
Updated lockfile.
|
2019-10-30 23:25:18 +01:00 |
|
Acrimon
|
167b88bac9
|
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 |
|
Acrimon
|
1c9e311693
|
Fix #364.
|
2019-10-29 23:48:15 +01:00 |
|
Acrimon
|
f724e80f2b
|
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 |
|
Acrimon
|
5beea76624
|
Remove heaptrack as it is now deprecated.
|
2019-10-29 06:55:45 +00:00 |
|
Acrimon
|
4a628125c4
|
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 |
|
Acrimon
|
c4093956f7
|
Fix ci job.
|
2019-10-28 19:23:27 +01:00 |
|
Acrimon
|
64a9b0f1b1
|
Added basic security job that just runs audit.
|
2019-10-28 19:18:02 +01:00 |
|
Monty Marz
|
e4cf3405bc
|
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 |
|
Monty Marz
|
a0a8011d7e
|
Updated: Help Window, Map, Item Descriptions
|
2019-10-27 22:22:40 +00:00 |
|
Justin Shipsey
|
a6d268e8ee
|
Merge branch 'slipped/skeletons' into 'master'
new skeletons
See merge request veloren/veloren!620
|
2019-10-27 14:06:54 +00:00 |
|
Joshua Barretto
|
e69b315dcc
|
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 |
|
Mckol
|
da128e2356
|
updated download info in readme
|
2019-10-27 12:07:09 +01:00 |
|
Marcel
|
c8e45c2f5a
|
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 |
|
Marcel Märtens
|
242a0d35bd
|
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 |
|
Imbris
|
e804282169
|
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 |
|
jshipsey
|
12f83cf270
|
rebase, small fixes
|
2019-10-25 22:20:38 -04:00 |
|
Imbris
|
6b0e346ec4
|
fix: bugs in new server ecs systems fixed
|
2019-10-25 22:00:47 -04:00 |
|
jshipsey
|
c5942dfcc9
|
purged references to npckind from anim files, removed warnings
|
2019-10-25 21:50:14 -04:00 |
|
jshipsey
|
2b5fd372c5
|
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 |
|
jshipsey
|
ada6142c1f
|
added large bipeds, small birbs, small fish skeletons
|
2019-10-25 21:47:23 -04:00 |
|
jshipsey
|
4f5f7402f0
|
added dragon skeleton
|
2019-10-25 21:44:33 -04:00 |
|
jshipsey
|
e858c31b4c
|
fish_medium and bird_medium skelingtons
|
2019-10-25 21:39:06 -04:00 |
|
jshipsey
|
25448ae2a1
|
body tweak
|
2019-10-25 21:34:29 -04:00 |
|
jshipsey
|
574f070758
|
added large bipeds, small birbs, small fish skeletons
|
2019-10-25 21:34:29 -04:00 |
|
jshipsey
|
644939810f
|
added dragon skeleton
|
2019-10-25 21:33:59 -04:00 |
|
jshipsey
|
54fc712076
|
fish_medium and bird_medium skelingtons
|
2019-10-25 21:33:02 -04:00 |
|
Marcel
|
ee915671ef
|
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 |
|
Timo Koesters
|
0fe206ffd1
|
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 |
|
timokoesters
|
5bff899522
|
fix: character now spawns with a weapon again
|
2019-10-25 13:14:36 +02:00 |
|
Timo Koesters
|
0ae15bb251
|
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 |
|
timokoesters
|
3ceb3a9d6d
|
refactor: small adjustments
|
2019-10-25 09:47:28 +02:00 |
|
Imbris
|
bc9d3db30d
|
Merge branch 'imbris/chair-fix' into 'master'
Fix object spawning
See merge request veloren/veloren!628
|
2019-10-25 07:14:46 +00:00 |
|
Imbris
|
58ca150f63
|
fix: /object chat command no longer spawns invisible objects
|
2019-10-25 02:08:23 -04:00 |
|
Imbris
|
c18fe8042b
|
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 |
|
Imbris
|
4bcc55ad34
|
improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks
|
2019-10-24 20:02:29 -04:00 |
|
pestilence
|
52dbfde510
|
add giveitem command
|
2019-10-25 00:14:08 +02:00 |
|
timokoesters
|
a6faffca4e
|
feat: asset glob loading, random weapons in chests
|
2019-10-24 23:55:25 +02:00 |
|
timokoesters
|
f1b728b89b
|
improvement: load_cloned returns a result
|
2019-10-24 23:55:24 +02:00 |
|
timokoesters
|
0a1e12c9ad
|
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 |
|
timokoesters
|
20248a4818
|
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 |
|
Monty Marz
|
edd56e2fc0
|
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 |
|