Commit Graph

2748 Commits

Author SHA1 Message Date
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
Monty Marz
f4ba68c60d .floating(true) for help window background to make it layer above every recent and future widget 2019-10-24 18:21:17 +00:00
Joshua Barretto
7d86a360d6 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
Imbris
2fad65c749 Merge branch 'imbris/graphic-cache' into 'master'
Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures.

See merge request veloren/veloren!609
2019-10-24 05:27:09 +00:00
Imbris
4b1fb112de Merge branch 'imbris/regions' into 'master'
Fix ghost bug :) [Regional system for sending entity updates to clients]

See merge request veloren/veloren!555
2019-10-24 04:39:13 +00:00
Imbris
a200dafd45 Fix possess bug, remove commented code, drain controller events 2019-10-24 00:00:00 -04:00
Imbris
966b2bfbff Integrate new systems with metrics 2019-10-23 23:50:06 -04:00
Imbris
8f81b69a25 Move terrain management and syncing into server side ecs systems 2019-10-23 23:50:06 -04:00
Imbris
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
Imbris
c02cd0a730 Cleanup unused code 2019-10-23 22:43:02 -04:00
Imbris
53ddbec527 Actually fix region removal panic, update fuzzy chunk location, sync entity removal when unloading chunks, region size constant tweak 2019-10-23 22:43:02 -04:00
Imbris
ab7740f378 Fix not not sending updates outside a certain range and not sending character state when it changes due to update throttling 2019-10-23 22:43:02 -04:00
Imbris
10f9f10cb3 Fix some panics when removing regions 2019-10-23 22:43:02 -04:00
Imbris
b09bddda79 Make clients subscribed to nearby regions and only send physics updates from those regions. 2019-10-23 22:43:02 -04:00
Imbris
24d1f6d970 Add initial region system implementation 2019-10-23 22:39:42 -04:00
soruh
f186aac2ea fix the welcome window not being closeable
due to the chat being in front of it,
by giving the welcome window a depth of -1.0.
The value of -1.0 is very arbitrary, but has some effect on
further development*, so there should be consideration concerning it.

* if something is supposed to be over/under the welcome window and
over/under something else with a different depth at the same time,
the resulting depth could become really ugly.
Of course it's always possible to change depths afterwards, but this often
breaks things, so the general scope of depths should
imo be considered, before this becomes a problem.
2019-10-24 00:46:40 +02:00