voxelands/voxelands-menche.git
6 years agoMerge branch 'next' into 'next'05f4f5a172fa74f78b31c3c52ee5d6b6/head
darkrose [Sat, 7 Nov 2015 15:25:25 +0000 (7 15:25 +0000)]
Merge branch 'next' into 'next'

[Resumit: next branch] Changed the texture of Electric Lamps to make building possible by day

[Original merge request](https://gitlab.com/voxelands/voxelands/merge_requests/26)

This time correctly to the next branch. I checked that it compiles and runs locally. Hope I did it right this time. :)

See merge request !27

6 years agoMerge branch 'master' into 'next'27/head52e697f4ebbd5f7b241d2a7dd96856ef/head5beb2ef536625c63e94172f80a94e9e3/head8208e66a18882b03107870330ca88ee3/headac06a9525e88e653557f2ff58b043884/headb5b4584b81674451bca80d23af594b75/head
GagaPete [Sat, 7 Nov 2015 09:19:29 +0000 (7 09:19 +0000)]
Merge branch 'master' into 'next'

Master

See merge request !1

6 years agore-enable cactus farming
darkrose [Sat, 7 Nov 2015 05:13:34 +0000 (7 15:13 +1000)]
re-enable cactus farming

6 years agoMake the electric lamp status better visible when working on days (the 2nd)26/head01a2e0b9952c4d493e40afbbc770b6eb/head6d8447d23327794be86bfb3201e0d298/head
Sebastian Joseph [Fri, 6 Nov 2015 23:12:38 +0000 (7 00:12 +0100)]
Make the electric lamp status better visible when working on days (the 2nd)

6 years agoMake the electric lamp status better visible when working on days
Sebastian Joseph [Fri, 6 Nov 2015 22:57:08 +0000 (6 23:57 +0100)]
Make the electric lamp status better visible when working on days

6 years agovine on trellis should be plant type when digging
darkrose [Fri, 6 Nov 2015 08:35:37 +0000 (6 18:35 +1000)]
vine on trellis should be plant type when digging

6 years agosome coldzone adjustments
darkrose [Thu, 5 Nov 2015 17:20:56 +0000 (6 03:20 +1000)]
some coldzone adjustments

6 years agobug fix to sleeping, ensure sleep cycle is disabled when players wake
darkrose [Wed, 4 Nov 2015 09:39:54 +0000 (4 19:39 +1000)]
bug fix to sleeping, ensure sleep cycle is disabled when players wake

6 years agofix the flashing snow, and snow appearing inside buildings
darkrose [Wed, 4 Nov 2015 08:36:36 +0000 (4 18:36 +1000)]
fix the flashing snow, and snow appearing inside buildings

6 years agoMerge branch 'next' into 'next'4b650f901da34b81e7c4d0e5cf1aa10e/head
darkrose [Sun, 1 Nov 2015 13:51:50 +0000 (1 13:51 +0000)]
Merge branch 'next' into 'next'

initialise KeyNamesLang array after intl has been initialised

See merge request !25

6 years agoinitialise KeyNamesLang array after intl has been initialised1/head25/head4/head0b342b63b22618c04c0b103b20b05c2f/head675b032d47d4e884dfda86044015bc1e/head
Joel Heaton [Sat, 31 Oct 2015 13:02:49 +0000 (31 13:02 +0000)]
initialise KeyNamesLang array after intl has been initialised

6 years agoMerge branch 'next' of gitlab.com:voxelands/voxelands into next
darkrose [Fri, 30 Oct 2015 17:39:36 +0000 (31 03:39 +1000)]
Merge branch 'next' of gitlab.com:voxelands/voxelands into next

6 years agoadd an exception handler to mapblock meshgen
darkrose [Fri, 30 Oct 2015 17:39:12 +0000 (31 03:39 +1000)]
add an exception handler to mapblock meshgen

6 years agoMerge branch 'next' into 'next'e90edea9c45f65db98e29f24e617ac4d/head
darkrose [Fri, 30 Oct 2015 17:38:17 +0000 (30 17:38 +0000)]
Merge branch 'next' into 'next'

make controls menu display keybinds correctly

See merge request !24

6 years agomake controls menu display keybinds correctly24/head92a9d9d52fabb001644eab522eb6614f/head940390ab2c2bc4d8beacf78117cd0678/head
Joel Heaton [Fri, 30 Oct 2015 17:27:34 +0000 (30 17:27 +0000)]
make controls menu display keybinds correctly

6 years agothis is next
darkrose [Wed, 28 Oct 2015 06:38:26 +0000 (28 16:38 +1000)]
this is next

6 years agoMerge branch 'master' into 'master'4812539b5a9e7f932ba8f5affd62b286/head
darkrose [Mon, 26 Oct 2015 05:24:08 +0000 (26 05:24 +0000)]
Merge branch 'master' into 'master'

Added missing #include <algorithm> so win version compiles

See merge request !23

6 years agoAdded missing #include <algorithm> so win version compiles23/headcdf789ebbd6f5a64759770059a187806/head
Melissa Draper [Mon, 26 Oct 2015 05:11:17 +0000 (25 22:11 -0700)]
Added missing #include <algorithm> so win version compiles

6 years ago1510.00v1510.00
darkrose [Sat, 24 Oct 2015 12:50:04 +0000 (24 22:50 +1000)]
1510.00

6 years agotranslation updates
darkrose [Sat, 24 Oct 2015 12:37:36 +0000 (24 22:37 +1000)]
translation updates

6 years agoOptimised texture images for deer
Melissa Draper [Thu, 22 Oct 2015 20:06:27 +0000 (22 13:06 -0700)]
Optimised texture images for deer

css-ig.net/scriptpng version 11/10/2015 option PNG8+A used.

6 years agoOptimised texture images for sheep
Melissa Draper [Thu, 22 Oct 2015 20:05:30 +0000 (22 13:05 -0700)]
Optimised texture images for sheep

css-ig.net/scriptpng version 11/10/2015 option PNG8+A used.

6 years agoOptimised texture images for kittens
Melissa Draper [Thu, 22 Oct 2015 19:59:57 +0000 (22 12:59 -0700)]
Optimised texture images for kittens

css-ig.net/scriptpng version 11/10/2015 option PNG8+A used.

6 years agomake paper craft give 3 paper
darkrose [Tue, 20 Oct 2015 16:06:53 +0000 (21 02:06 +1000)]
make paper craft give 3 paper

6 years agotranslation updates
darkrose [Sun, 18 Oct 2015 15:55:35 +0000 (19 01:55 +1000)]
translation updates

6 years agocraft cobble from rock
darkrose [Wed, 14 Oct 2015 05:26:19 +0000 (14 15:26 +1000)]
craft cobble from rock

6 years agoadd support for extra_dug_item to restricted to certain tool levels
darkrose [Tue, 13 Oct 2015 09:49:23 +0000 (13 19:49 +1000)]
add support for extra_dug_item to restricted to certain tool levels

6 years agoassorted mob tweaks
darkrose [Sat, 10 Oct 2015 06:04:20 +0000 (10 16:04 +1000)]
assorted mob tweaks

6 years agowhen digging out-of-level minerals, dig slower to warn the player
darkrose [Thu, 8 Oct 2015 15:17:10 +0000 (9 01:17 +1000)]
when digging out-of-level minerals, dig slower to warn the player

6 years agogood bye wooden tools
darkrose [Thu, 8 Oct 2015 09:55:56 +0000 (8 19:55 +1000)]
good bye wooden tools

6 years agoImprovements to the sheep textures
Melissa Draper [Mon, 5 Oct 2015 07:31:22 +0000 (5 00:31 -0700)]
Improvements to the sheep textures

Sheared sheep is now more distinguishable. Both textures have
had a nose job.

6 years agostop sheep crabwalking
darkrose [Mon, 5 Oct 2015 06:33:10 +0000 (5 16:33 +1000)]
stop sheep crabwalking

6 years ago... not without this it won't
darkrose [Sun, 4 Oct 2015 18:00:42 +0000 (5 04:00 +1000)]
... not without this it won't

6 years agolet's see if this improves the segfault situation
darkrose [Sun, 4 Oct 2015 17:54:07 +0000 (5 03:54 +1000)]
let's see if this improves the segfault situation

6 years agoimproved mob spawning, part whatever
darkrose [Sun, 4 Oct 2015 17:12:03 +0000 (5 03:12 +1000)]
improved mob spawning, part whatever

6 years agoremove some legacy nodes
darkrose [Sun, 4 Oct 2015 12:24:59 +0000 (4 22:24 +1000)]
remove some legacy nodes

6 years agocamp beds pt2
darkrose [Sun, 4 Oct 2015 10:31:19 +0000 (4 20:31 +1000)]
camp beds pt2

6 years agocamp beds pt1
darkrose [Sun, 4 Oct 2015 07:55:32 +0000 (4 17:55 +1000)]
camp beds pt1

6 years agoAdding sheared sheep mob with creative spawner.
Melissa Draper [Sun, 4 Oct 2015 07:46:19 +0000 (4 00:46 -0700)]
Adding sheared sheep mob with creative spawner.

6 years agoallow affected node metadata to disable remove of selected node
darkrose [Sun, 4 Oct 2015 06:47:18 +0000 (4 16:47 +1000)]
allow affected node metadata to disable remove of selected node

6 years agoallow opening a form from the node next to the selected node, if onact_also_affects...
darkrose [Sun, 4 Oct 2015 06:40:23 +0000 (4 16:40 +1000)]
allow opening a form from the node next to the selected node, if onact_also_affects points to it

6 years agosleep in beds pt2
darkrose [Sun, 4 Oct 2015 05:56:32 +0000 (4 15:56 +1000)]
sleep in beds pt2

6 years agoAdd new sheep model and texture
Melissa Draper [Sun, 4 Oct 2015 03:49:14 +0000 (3 20:49 -0700)]
Add new sheep model and texture

Based on http://opengameart.org/content/sheep-rigged-textured-and-animated

6 years agosleeping in beds pt1
darkrose [Sat, 3 Oct 2015 19:10:02 +0000 (4 05:10 +1000)]
sleeping in beds pt1

6 years agomob spawner texture
darkrose [Mon, 28 Sep 2015 12:15:49 +0000 (28 22:15 +1000)]
mob spawner texture

6 years agoadd descriptions and spawners to kitties
darkrose [Mon, 28 Sep 2015 09:28:20 +0000 (28 19:28 +1000)]
add descriptions and spawners to kitties

6 years agoadding kitty mobs
Melissa Draper [Sun, 27 Sep 2015 07:50:36 +0000 (27 00:50 -0700)]
adding kitty mobs

6 years agomob spawners pt3
darkrose [Mon, 28 Sep 2015 08:51:54 +0000 (28 18:51 +1000)]
mob spawners pt3

6 years agomob spawners pt2
darkrose [Mon, 28 Sep 2015 08:34:50 +0000 (28 18:34 +1000)]
mob spawners pt2

6 years agomob spawners pt1
darkrose [Mon, 28 Sep 2015 08:11:57 +0000 (28 18:11 +1000)]
mob spawners pt1

6 years agonew mob spawning pt2
darkrose [Sun, 27 Sep 2015 08:20:47 +0000 (27 18:20 +1000)]
new mob spawning pt2

6 years agoimproved mob spawning, pt1
darkrose [Sat, 12 Sep 2015 19:46:03 +0000 (13 05:46 +1000)]
improved mob spawning, pt1

6 years agopropagate energy through limestone
darkrose [Fri, 11 Sep 2015 07:48:21 +0000 (11 17:48 +1000)]
propagate energy through limestone

6 years agoremove potential divide by zero in hud
darkrose [Sat, 5 Sep 2015 04:21:54 +0000 (5 14:21 +1000)]
remove potential divide by zero in hud

6 years agoadd death drops inventory to gui
darkrose [Sat, 29 Aug 2015 09:21:12 +0000 (29 19:21 +1000)]
add death drops inventory to gui

6 years agolose inventory on death in survival mode
darkrose [Sat, 29 Aug 2015 08:15:44 +0000 (29 18:15 +1000)]
lose inventory on death in survival mode

6 years agooops, furnace textures
darkrose [Fri, 28 Aug 2015 18:47:13 +0000 (29 04:47 +1000)]
oops, furnace textures

6 years agonew furnace and incinerator code
darkrose [Fri, 28 Aug 2015 17:26:33 +0000 (29 03:26 +1000)]
new furnace and incinerator code

6 years agoactual seasons
darkrose [Thu, 27 Aug 2015 11:29:58 +0000 (27 21:29 +1000)]
actual seasons

6 years agomoving sun and moon, plus seasons, and moon phases
darkrose [Wed, 26 Aug 2015 10:22:15 +0000 (26 20:22 +1000)]
moving sun and moon, plus seasons, and moon phases

6 years agothis is next
darkrose [Tue, 25 Aug 2015 07:01:27 +0000 (25 17:01 +1000)]
this is next

6 years ago1508.01v1508.01
darkrose [Mon, 24 Aug 2015 05:41:43 +0000 (24 15:41 +1000)]
1508.01

6 years agoensure enchantments get initialised
darkrose [Mon, 24 Aug 2015 05:40:26 +0000 (24 15:40 +1000)]
ensure enchantments get initialised

6 years ago1508.00v1508.00
darkrose [Sun, 23 Aug 2015 15:34:14 +0000 (24 01:34 +1000)]
1508.00

6 years agotranslation updates
darkrose [Sun, 23 Aug 2015 15:01:01 +0000 (24 01:01 +1000)]
translation updates

6 years agostfu openal
darkrose [Thu, 20 Aug 2015 05:57:58 +0000 (20 15:57 +1000)]
stfu openal

6 years agosome helpers for converting mese to mithril
darkrose [Mon, 17 Aug 2015 12:05:27 +0000 (17 22:05 +1000)]
some helpers for converting mese to mithril

6 years agotranslation updates
darkrose [Mon, 17 Aug 2015 05:59:09 +0000 (17 15:59 +1000)]
translation updates

6 years agoadd new controls to readme file
darkrose [Sun, 16 Aug 2015 07:15:45 +0000 (16 17:15 +1000)]
add new controls to readme file

6 years agoa possible improvement to the key settings menu
darkrose [Sun, 16 Aug 2015 06:20:05 +0000 (16 16:20 +1000)]
a possible improvement to the key settings menu

6 years agoalso don't draw the crosshair if a menu/form is open with old HUD'
darkrose [Sat, 15 Aug 2015 15:26:50 +0000 (16 01:26 +1000)]
also don't draw the crosshair if a menu/form is open with old HUD'

6 years agofix darkened screen with old style HUD
darkrose [Sat, 15 Aug 2015 15:22:52 +0000 (16 01:22 +1000)]
fix darkened screen with old style HUD

6 years agowolves drop meat
darkrose [Sat, 15 Aug 2015 10:07:20 +0000 (15 20:07 +1000)]
wolves drop meat

6 years agomake far mobs less likely to move, and thus send less data
darkrose [Sat, 15 Aug 2015 08:29:21 +0000 (15 18:29 +1000)]
make far mobs less likely to move, and thus send less data

6 years agoadd mithril block
darkrose [Sat, 15 Aug 2015 07:58:16 +0000 (15 17:58 +1000)]
add mithril block

6 years agoadd warning about settings not working from the pause menu
darkrose [Sat, 15 Aug 2015 07:27:03 +0000 (15 17:27 +1000)]
add warning about settings not working from the pause menu

6 years agocredits screen reorganising
darkrose [Fri, 14 Aug 2015 18:42:11 +0000 (15 04:42 +1000)]
credits screen reorganising

6 years agoadd ability to disable mobs from gui
darkrose [Fri, 14 Aug 2015 13:37:59 +0000 (14 23:37 +1000)]
add ability to disable mobs from gui

6 years agosand should randomly drop saltpeter, rarely
darkrose [Fri, 14 Aug 2015 13:34:29 +0000 (14 23:34 +1000)]
sand should randomly drop saltpeter, rarely

6 years agoadd background outlines to forge slots
darkrose [Thu, 13 Aug 2015 19:05:30 +0000 (14 05:05 +1000)]
add background outlines to forge slots

6 years agoadd effects times to HUD
darkrose [Thu, 13 Aug 2015 17:40:06 +0000 (14 03:40 +1000)]
add effects times to HUD

6 years agolimestone stairs, slabs, and walls
darkrose [Thu, 13 Aug 2015 15:51:48 +0000 (14 01:51 +1000)]
limestone stairs, slabs, and walls

6 years agoallow fast swimming
darkrose [Thu, 13 Aug 2015 15:05:08 +0000 (14 01:05 +1000)]
allow fast swimming

6 years agodifferent fences and bookshelves for different wood types
darkrose [Thu, 13 Aug 2015 14:21:50 +0000 (14 00:21 +1000)]
different fences and bookshelves for different wood types

6 years agobetter gem ore textures
darkrose [Thu, 13 Aug 2015 13:15:00 +0000 (13 23:15 +1000)]
better gem ore textures

6 years agoallow farm dirt further from water
darkrose [Thu, 13 Aug 2015 12:34:07 +0000 (13 22:34 +1000)]
allow farm dirt further from water

6 years agosome lighting tweaks
darkrose [Mon, 10 Aug 2015 16:42:10 +0000 (11 02:42 +1000)]
some lighting tweaks

6 years agomake enchantments less effective when tool type and material type don't match
darkrose [Mon, 10 Aug 2015 06:29:08 +0000 (10 16:29 +1000)]
make enchantments less effective when tool type and material type don't match

6 years agoadd overlays for all tools and mithril ingots
darkrose [Mon, 10 Aug 2015 05:48:26 +0000 (10 15:48 +1000)]
add overlays for all tools and mithril ingots

6 years agobookshelves should not disappear when dug
darkrose [Sun, 9 Aug 2015 20:08:25 +0000 (10 06:08 +1000)]
bookshelves should not disappear when dug

6 years agomake it work on bsd again
darkrose [Fri, 7 Aug 2015 16:19:09 +0000 (8 02:19 +1000)]
make it work on bsd again

6 years agomake images fit in inventory grids better, and fix the mithril dust texture
darkrose [Wed, 5 Aug 2015 20:17:50 +0000 (6 06:17 +1000)]
make images fit in inventory grids better, and fix the mithril dust texture

6 years agoenchantments pt 5? - gems in mapgen
darkrose [Wed, 5 Aug 2015 07:34:42 +0000 (5 17:34 +1000)]
enchantments pt 5? - gems in mapgen

6 years agoenchantments pt 4
darkrose [Mon, 3 Aug 2015 18:03:18 +0000 (4 04:03 +1000)]
enchantments pt 4

6 years agoenchantments pt3 / forge pt2 - PROTOCOL BUMP
darkrose [Mon, 3 Aug 2015 16:53:37 +0000 (4 02:53 +1000)]
enchantments pt3 / forge pt2 - PROTOCOL BUMP

6 years agoforge pt1
darkrose [Mon, 3 Aug 2015 08:26:32 +0000 (3 18:26 +1000)]
forge pt1

6 years agoenchantments pt2
darkrose [Sat, 1 Aug 2015 11:29:32 +0000 (1 21:29 +1000)]
enchantments pt2

6 years agoenchantments pt1
darkrose [Fri, 31 Jul 2015 20:04:02 +0000 (1 06:04 +1000)]
enchantments pt1

6 years agoremove MESE
darkrose [Thu, 30 Jul 2015 07:37:52 +0000 (30 17:37 +1000)]
remove MESE

6 years agoadd levels to tools, randomise mineral drop quantity with max based on tool level
darkrose [Tue, 28 Jul 2015 20:02:10 +0000 (29 06:02 +1000)]
add levels to tools, randomise mineral drop quantity with max based on tool level