Commit Graph

2887 Commits

Author SHA1 Message Date
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
e830077fb1 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
eb4f9f4b78 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
8bda7b1633 Fix possess bug, remove commented code, drain controller events 2019-10-24 00:00:00 -04:00
22d29d1209 Integrate new systems with metrics 2019-10-23 23:50:06 -04:00
d83a082bb4 Move terrain management and syncing into server side ecs systems 2019-10-23 23:50:06 -04:00
9cd42d1056 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
7bfd964c5f Cleanup unused code 2019-10-23 22:43:02 -04:00
4a8c87b4bf 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
4cfe95ef0f 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
242a2e0712 Fix some panics when removing regions 2019-10-23 22:43:02 -04:00
45ca8d3a23 Make clients subscribed to nearby regions and only send physics updates from those regions. 2019-10-23 22:43:02 -04:00
492af9171c Add initial region system implementation 2019-10-23 22:39:42 -04:00
696da23f7f 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
e92752709d Merge branch 'pfau/assets-2' into 'master'
Multiple Assets and UI fixes and additions

See merge request veloren/veloren!619
2019-10-23 19:40:45 +00:00
9282ca00b4 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
238461af2f Merge branch 'xacrimon/error-handling' into 'master'
Drastically improved error messages in client and server.

See merge request veloren/veloren!621
2019-10-23 17:50:18 +00:00
d64ab139d1 Formatted code. 2019-10-23 20:23:31 +02:00
ffc6a83a7b Formatting fix 2019-10-23 13:30:03 -04:00
adb95e61ea Added loc into readme 2019-10-23 13:27:04 -04:00
478b98737f code-style: iter instead of into_iter. 2019-10-23 16:45:47 +02:00
d0e0b6de53 Drastically improved error messages in client and server. 2019-10-23 18:38:09 +02:00
34a361bba8 feat(env): customizable config file location 2019-10-22 17:15:10 +02:00
a6e377552c Merge branch 'ifreund-drop-items' into 'master'
Allow dropping items

See merge request veloren/veloren!615
2019-10-22 01:22:50 +00:00
244fe7fb60 Merge branch 'vechro/aa-fix' into 'master'
Fix MSAA x16

See merge request veloren/veloren!613
2019-10-22 00:58:43 +00:00