Commit Graph

1536 Commits

Author SHA1 Message Date
sdzen 7b2df4578f Merge branch 'next' of git@gitlab.com:sdzen/voxelands.git into next
Conflicts:
	README.txt
2016-02-14 07:35:59 -05:00
sdzen febb05cbad grumble grumble *restores defaults* 2016-02-14 07:30:31 -05:00
sdzen 2e04fef92d Update readme.txt 2016-02-14 01:58:41 +00:00
sdzen 7663198139 delete gate steel 2016-02-14 01:56:05 +00:00
sdzen 6b3aa7bf36 remove the slab, or suffer my curse 2016-02-13 20:49:20 -05:00
sdzen 966c43c417 New glass and wood textures, glass doors may not be used as fuel 2016-02-13 20:34:22 -05:00
sdzen 3e04d6987d Overlay water and lava onto buckets to reduce textures, ditto for the redundant gate textures 2016-02-12 17:49:17 -05:00
sdzen 36b29f8b80 Merge branch 'next' of git@gitlab.com:voxelands/voxelands.git into next 2016-02-12 15:48:52 -05:00
sdzen b3f3d5b502 32x textures 2016-02-12 15:46:59 -05:00
sdzen 5738799340 Signed-off-by: sdzen <sdzen@techie.com> 2016-02-12 12:05:52 -05:00
darkrose ae906f67a6 remove solidness and visual_solidness fields from ContentFeatures 2016-02-12 18:46:26 +10:00
darkrose 8c6a2bd366 make seeds burnable 2016-02-12 04:45:44 +10:00
darkrose e28be0b0c1 leaf position should use young tree, not just tree 2016-02-11 18:48:49 +10:00
darkrose 44c0bcf1f8 randomly change a value and see if that helps anything 2016-02-11 18:21:42 +10:00
darkrose 36182068af increase size of selected nodes 2016-02-11 14:50:19 +10:00
darkrose 9cd69ac339 positional leaves pt3 2016-02-10 20:44:15 +10:00
darkrose 58dec97327 positional leaves pt2 2016-02-10 19:16:21 +10:00
darkrose 7d8619c5f5 positional leaves pt1 2016-02-10 18:24:42 +10:00
darkrose 1cae23c7e6 add an updateNodeWithEvent to save on pointless lighting updates 2016-02-05 01:11:47 +10:00
darkrose e4488ebba5 Merge branch 'next' into 'next'
Bugfixes for circutry

* Stop pure energy consumer devices from acting as wires to allow separate control of adjacent devices (e.g. sticky pistons).
* Stop wires creating energy from generating endless power (integer underrun).
* Reenables (?) display of power level for wires and status for switches by actually cloning the properties in the clone methods of the Metadatas.

See merge request !40
2016-02-04 05:15:14 +00:00
darkrose 320e81f3e5 Merge branch 'GagaPete/voxelands-next' into next 2016-02-04 15:13:08 +10:00
Sebastian Joseph 3d249ebde8 Fixed wires creating infinite energy when energy traveled more than 16 wires 2016-02-04 00:23:16 +01:00
Sebastian Joseph 6ebfff5b31 Changed circutry nodemetas to clone the properties in the clone method (reenabled visual power of wire feedback) 2016-02-04 00:13:34 +01:00
Sebastian Joseph 69496bc0e5 Stopped circutry devices from propogating power (allow more reliable "Jebdoors") 2016-02-03 23:35:58 +01:00
darkrose a5b6ff5e3d fuck you windows 2016-02-04 05:23:42 +10:00
darkrose 9cf6b6e3e8 Merge branch 'next' into 'next'
sand and desert sand texture improvements

Created 32x32 textures for the sand and sand_desert textures.

See merge request !39
2016-02-03 09:12:55 +00:00
nic96 356565a3f1 sand and desert sand texture improvements 2016-02-02 20:30:20 -07:00
darkrose 7d59fc857a add desert biome 2016-02-02 20:21:00 +10:00
sdzen afa6557e0a throw in some new textures to this shiz. 32x flags and some improved 16x textures to be upscaled later 2016-01-31 19:57:00 -05:00
sdzen 394beae05e Try to simplify the control system with fps style controls 2016-01-31 18:48:05 -05:00
darkrose 6448b19167 heavily restrict mobspawns 2016-01-31 21:56:48 +10:00
darkrose f4f0556a06 Merge branch 'next' of gitlab.com:voxelands/voxelands into next 2016-01-28 02:03:08 +10:00
darkrose 02fd4ceb8c remove Item{S,C}ao, drop items directly to parcels 2016-01-28 02:02:42 +10:00
darkrose 212a6c6360 Merge branch 'next' into 'next'
compile cguittfont statically

- rpm's cmake macros have BUILD_SHARED_LIBS ON by default which results
  in "libcuittfont.so not found" when compiled with system freetype

See merge request !36
2016-01-27 14:04:50 +00:00
Maverick 4931345a11 compile cguittfont statically
- rpm's cmake macros have BUILD_SHARED_LIBS ON by default which results
  in "libcuittfont.so not found" when compiled with system freetype
2016-01-27 14:59:20 +01:00
darkrose 9cf5666177 some texture tweaks 2016-01-27 16:50:11 +10:00
darkrose c1427fd4d4 make plantlike nodes in water actually be in the water, instead of a strange hole in the water 2016-01-27 02:29:26 +10:00
darkrose 5f8caf40c0 adjust plantlike tileable growth tex coords 2016-01-27 00:04:13 +10:00
darkrose 867eb581fa adjust fernlike state for mesh_detail levels 2016-01-26 23:41:07 +10:00
darkrose 5eee9343d3 adjust dirtlike state for mesh_detail levels 2016-01-26 23:37:39 +10:00
darkrose 9e0ea98abc add light flare effect to light sources 2016-01-26 23:13:31 +10:00
darkrose 743174de9f add space dust to craft guide 2016-01-25 13:21:36 +10:00
darkrose df075a7e94 less gravity in space 2016-01-25 13:20:52 +10:00
darkrose 609112acdb space + space dust (oerkki dust + mithril dust) 2016-01-25 02:35:15 +10:00
darkrose 39b46f03fb reduce on-activate mob spawn chance 2016-01-23 23:18:29 +10:00
darkrose 1bc48179db new pine texture 2016-01-22 23:25:20 +10:00
darkrose 7c54d1ab23 a little tweak to server async step 2016-01-21 01:31:24 +10:00
darkrose a731c2968f change how animations are sent to client, add die animation 2016-01-20 18:42:54 +10:00
darkrose 7a713db7ba oops, remove debug prints 2016-01-19 16:58:28 +10:00
darkrose 22ae552ed6 adjust heights for environmental damage 2016-01-18 22:17:58 +10:00