Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity
1,826 Commits 5 Branches 45 Tags 43 MiB
Commit Graph

1387 Commits

Author SHA1 Message Date
darkrose 3099caf133 sound pt2 2017-09-24 14:50:17 +10:00
darkrose 81cf0e0719 sound pt1 2017-09-24 14:50:17 +10:00
darkrose 5d519799e6 commands now work 2017-09-24 14:50:17 +10:00
darkrose 02462fe854 new config and command system pt1 2017-09-24 14:50:17 +10:00
darkrose 62d033da29 get new ban and auth code innitialising right 2017-09-24 14:50:17 +10:00
darkrose 1b88f95b25 sane filesystem code 2017-09-24 14:50:17 +10:00
darkrose 258a6ed465 new ban manager 2017-09-24 14:50:17 +10:00
darkrose 7a7423825d new ban manager 2017-09-24 14:50:17 +10:00
darkrose f0e36c0404 this is what happens when darkrose rages at code 2017-09-24 14:50:17 +10:00
darkrose 9135bc808a compilable again 2017-09-24 14:50:17 +10:00
darkrose 3fff3795c1 start of redoing crafting 2017-09-24 14:49:45 +10:00
darkrose 59f8469cc5 rewrite content_list to C 2017-09-24 14:49:45 +10:00
darkrose 221f079fe0 sane code pt1 2017-09-24 14:49:45 +10:00
darkrose 9d65ff9782 ugly ugly c++ 2017-09-24 14:49:45 +10:00
darkrose 9678323f84 make tool wear and usage a bit easier to understand pt2 2017-09-24 14:49:45 +10:00
darkrose 0f57b18e0e make tool wear and usage a bit easier to understand pt1 2017-09-24 14:49:45 +10:00
BlockMen bc6446fc4a Don't copy material, return ref const instead 
Also update AnimData directly (maybe this causes SegFaulting? idk)
 2017-09-24 14:49:45 +10:00
BlockMen 478551894d Fix another gettext issue for MSVC builds 
This fixes at least partly #23
 2017-09-24 14:49:45 +10:00
BlockMen 634e299e81 Fix MSVC not compiling 2017-09-24 14:49:45 +10:00
BlockMen b924a6a5c3 Hotfix for gettext, caused by MSVC; Also fix custom book titles being "translated" 2017-09-24 14:49:45 +10:00
darkrose 14b8f93761 update credits 2017-04-08 18:30:17 +10:00
darkrose 0e7dafec77 little fiddles 2017-04-08 18:30:17 +10:00
darkrose 2d483ea6b3 switch to unifont + update translation file 2017-04-08 18:30:17 +10:00
darkrose e57cda07ca make server announcing work again 2017-04-08 18:29:16 +10:00
darkrose 9b852670bd bushes 2017-04-08 18:29:16 +10:00
darkrose c2f68e90f1 campfire pt5 2017-04-08 18:29:16 +10:00
darkrose 3edcdf3b10 campfire pt3 2017-04-08 18:29:16 +10:00
darkrose b3416add93 campfire pt2 2017-04-08 18:29:16 +10:00
darkrose bdb7493ccc campfire pt1 2017-04-08 18:29:16 +10:00
blockmaster2000 4a91f12ff0 Fix selectionmesh being always animated 2017-04-08 18:29:16 +10:00
blockmaster2000 9d8f8d09b2 Animate selected node aswell 2017-04-08 18:29:16 +10:00
blockmaster2000 591038c4cf Use mystoi() instead of stoi() 2017-04-08 18:29:16 +10:00
blockmaster2000 135679dde4 Remove working things 2017-04-08 18:29:16 +10:00
blockmaster2000 8856e1a25d Fix left things addressed 2017-04-08 18:29:16 +10:00
blockmaster2000 b20fffb931 Fix some things 2017-04-08 18:29:16 +10:00
blockmaster2000 a1ec501f26 Add setting to disable animated textures and add checkbox to settings menu 
(also fix first frame not being initialized correct)
 2017-04-08 18:29:16 +10:00
blockmaster2000 3057f16d13 Fix animation of flowing liquids not matching direction 2017-04-08 18:29:16 +10:00
blockmaster2000 402e477f76 Add node animation 2017-04-08 18:29:16 +10:00
Menche fe5acc2029 MobFeatures doesn't have a lifetime member anymore 2016-08-27 16:53:58 -07:00
Menche 7b1192de06 Merge branch 'master' of gitlab.com:voxelands/voxelands into next 2016-08-27 16:45:35 -07:00
Menche 909474632c Merge branch 'next' of gitlab.com:voxelands/voxelands into next 2016-08-27 16:42:53 -07:00
Menche d34e8e5e68 Merge branch 'patch-3' into 'next' 
Lowered fireball's lifetime.

This value should finally allow them to despawn.

See merge request !71
 2016-08-27 23:36:44 +00:00
Menche 7f09ce7046 Merge branch 'patch-2' into 'next' 
Fix for the wrong drop quantity.

Sand and brick stairs' corners drop 24 items instead of 4, this fixes it.

See merge request !70
 2016-08-27 23:36:34 +00:00
Menche 6e89813187 Merge branch 'patch-1' into 'next' 
Removed missing textures' links.

Stair corners' textures have been lost during the previous commit's rebasing.
This patch uses the default brick texture.


See merge request !68
 2016-08-27 23:36:26 +00:00
Capricorno b8ef0053a0 Readded brick bottom's texture. 2016-08-24 23:24:07 +00:00
Capricorno e03a4a0d0f Lowered fireball's lifetime. 2016-08-24 23:14:55 +00:00
Capricorno e0eaad3667 Fix for the wrong drop quantity. 2016-08-24 23:10:29 +00:00
darkrose 94e4123c1f make dungeons more fun 2016-08-19 03:50:33 +10:00
darkrose d3e4f91bdc mobs made awesome 2016-08-19 00:54:28 +10:00
blockmaster2000 4bb3da36da Make shadows not that dark 2016-08-17 22:28:52 +00:00
blockmaster2000 91baae320f Fix dirtlike lighting (ambient occlusion) 2016-08-17 21:43:22 +00:00
Menche 4ec28ba379 Revert "Added missing TODO" 
This reverts commit 1c217f6596.
 2016-08-15 19:55:22 -07:00
Menche 70495d8ebe Revert "Fast map raycasting" 
This reverts commit d563fd964f.
 2016-08-15 19:55:04 -07:00
Menche 3c94ab6199 Revert "Fixed TODO and a bug, and moved raycast to Map" 
This reverts commit 0135630a4a.
 2016-08-15 19:40:27 -07:00
Menche e0d371625d Revert "Final version of raycast" 
This reverts commit c470aaf455.
 2016-08-15 19:40:23 -07:00
Menche 5c1083b6a8 let rats spawn 2016-08-15 19:31:57 -07:00
Menche fe34d274fb lower mob lifetimes 2016-08-15 19:26:52 -07:00
Capricorno 1cb1cfe218 Removed missing textures' links. 2016-08-15 22:25:15 +00:00
Menche 9a69d9bab2 add oerkki dust recipe, for mob-less servers 2016-08-10 18:20:09 -07:00
Menche b112b35422 change serverlist url 2016-08-10 17:44:39 -07:00
Capricorno 98a084d998 Removed special alternate node value. 2016-08-03 18:54:14 +00:00
Capricorno aaacd5742a Fixed scaffolding's suffocation bug 2016-08-03 18:52:38 +00:00
Menche b590b463b7 Merge branch 'pumpkinjack' into 'next' 
Added missing Jack 'O Lantern recipe to the craftguide.

As per title.

See merge request !61
 2016-07-31 23:32:23 +00:00
Menche 8b14fbb779 Merge branch 'mobspawner' into 'next' 
Removed mobspawner from the craftguide.

Mobspawners at the moment are useless since you can't capture mobs to charge them; players just waste mithril for no use and then ask around how to use them.

See merge request !63
 2016-07-31 23:31:59 +00:00
Menche eea8d08c23 Merge branch 'scaffolding' into 'next' 
Scaffolding

Used to build without making piles of dirt or flying.

See merge request !64
 2016-07-31 23:31:49 +00:00
Menche 6399197b1a Merge branch 'stone_tile' into 'next' 
Removed the ability to use stone tiles as fuel.

This prevents using stone tiles as if they were made of wood...

See merge request !62
 2016-07-31 23:31:44 +00:00
Capricorno da7a251315 Scaffolding added 2016-07-30 11:30:07 +00:00
Capricorno 1e41c327cd Scaffolding added 2016-07-30 11:28:46 +00:00
Capricorno 46e1b63838 Scaffolding added 2016-07-30 11:27:52 +00:00
Capricorno 348c0c2aba Scaffolding added 2016-07-30 11:25:53 +00:00
Capricorno 1187e7e970 Removed mobspawner from the craftguide. 2016-07-29 16:35:17 +00:00
Capricorno 07978a2a20 Removed the ability to use stone tiles as fuel. 2016-07-29 16:06:37 +00:00
Capricorno 98039455f7 Added missing Jack 'O Lantern recipe to the craftguide. 2016-07-29 16:02:32 +00:00
Capricorno 38cb15c300 Added missing fireball's TTL. 2016-07-29 15:49:56 +00:00
Capricorn eaba86594e Add marble walls 2016-07-28 16:18:48 -07:00
Menche 7cbdd101db move default api_server 2016-07-28 10:43:51 -07:00
Menche 56687cdb83 add useradd command 2016-07-19 20:21:33 -07:00
Menche de9eeca556 kill some unused variables, grar 2016-07-18 01:08:36 -07:00
Menche 9d707c3493 -O3 improves performance, but negate -ffast-math 2016-07-09 17:07:06 -07:00
darkrose f823443087 Merge branch 'master' into 'next' 
Fixed wrong drop quantity for sandstone and brick columns.

As per title.

See merge request !58
 2016-06-19 18:20:54 +00:00
Capricorn 1eae3c0493 Fixed wrong drop quantity for sandstone and brick columns. 2016-06-19 11:16:30 +02:00
darkrose 0633e8636b Merge branch 'master' into 'next' 
Added pillars, pillars' bases and capitals. (updated)

- Column nodes added (9 types x 6 shapes):

Stone, limestone, marble, sandstone, brick, wood, junglewood, pinewood
and roughstone.


- Punching a node will turn it in this way:

square column -> square column base -> square column top ->
cross column -> cross column base > cross column top -> square column.


- Digging a node will give a square column, except for sandstone and
brick columns which will give 12 sand nodes or 12 clay bricks.


- Wood, junglewood and pinewood can burn and if burnt will drop 1 ash
lump.

See merge request !57
 2016-06-19 07:50:55 +00:00
Capricorn 3a0c19f4f5 Added pillars, pillars' bases and capitals. (updated) 2016-06-18 23:31:05 +02:00
darkrose fffa600431 Merge branch 'master' into 'next' 
Stairs' corners added.

By punching a stair node it will turn into an outer or inner corner.

See merge request !54
 2016-06-12 16:58:31 +00:00
Capricornus 5f93ebfd36 Stairs' corners added. 2016-06-12 16:57:44 +02:00
darkrose dcf480de11 Merge branch 'next' of gitlab.com:voxelands/voxelands into next 2016-05-29 14:09:16 +10:00
darkrose bb3b914747 Merge branch 'master' into 'next' 
Faster raycasting

I have modified the getPointedNode() function. The new time complexity is O(d) instea of O(d^3).
This allows greater building distances to creative players (not implemented, just possibility).
I have split the function to Map::raycast() and createHilightbox(). This makes Map::raycast() reusable in hostile creatures' AIs.
I have also fixed a bug: active objects can no longer be selected if a node blocks the sight (not perfectly accurate, but it works).

See merge request !51
 2016-05-29 04:00:20 +00:00
darkrose da482d41ff Merge branch 'next' into 'next' 
Added option to restict access to only known players

Title says it all. This allows setting up a pseudo private / friends-only server that let the owner control access via auth.txt. Basically it denys access to all unknown players.

See merge request !46
 2016-05-29 03:59:47 +00:00
Dániel Juhász c470aaf455 Final version of raycast 
Removed unneccessary semicolon.
 2016-05-26 14:07:03 +02:00
Dániel Juhász 0135630a4a Fixed TODO and a bug, and moved raycast to Map 
Now you can not hit an active object if there is a node in front of it.
You can only select nodes if they are not farther than d. The raycasting
algorithm was sliced into raycast() and createHilightbox(). raycast()
was moved into Map so it can be used in hostile creatures' AIs.
 2016-05-26 14:04:57 +02:00
Dániel Juhász 1c217f6596 Added missing TODO 2016-05-25 21:00:04 +02:00
Dániel Juhász d563fd964f Fast map raycasting 
Modified getPointedNode() so it became faster. Now the running time is
linear to the distance, allowing greater building distances.
 2016-05-25 20:44:00 +02:00
Menche 4e00dc2fe2 make FreeBSD's select() happy 2016-05-21 18:34:56 -07:00
Menche 79d7252bc4 clean up the flags and remove unneeded stuff 2016-05-14 19:17:31 -07:00
darkrose 53c73e97f7 fix typo picked up by translators 2016-04-29 22:53:46 +10:00
darkrose 48ff3beb52 that water/plant meshgen bug Menche keeps whining about 2016-04-28 00:34:11 +10:00
darkrose 9dcece34f1 translation updates 2016-04-18 15:24:36 +10:00
darkrose cd4d027755 dodgey intl fixish 2016-04-18 04:10:06 +10:00
GagaPete a0e680b142 Fixe typo 2016-04-17 11:48:34 +00:00
darkrose 849950830d fix some/most? of sdzens broken textures 2016-04-17 14:46:51 +10:00
darkrose 4262cd14af remove silly assert 2016-04-15 15:44:31 +10:00
Menche 6b4f1cc960 add reverse recipe for small stone axe 2016-04-12 12:19:36 -07:00
darkrose 412939e50f add missing translations to incinerator and cauldron 2016-04-12 19:23:56 +10:00
darkrose e960050620 spawnguard 2016-04-12 18:13:31 +10:00
Sebastian Joseph 58478a241a Implemented an option to restict access to only known players. 2016-04-11 23:18:12 +02:00
darkrose ed1b5d942e stop the constant digging 2016-04-07 17:32:53 +10:00
darkrose ba411a1f29 remove hat recipe from bars 2016-04-06 17:30:46 +10:00
darkrose 9e7d6cced1 some meshgen tweaks 2016-04-06 17:26:54 +10:00
roman-yagodin 28d3d9209b Check LANGUAGE and LC_ALL vars before LANG 2016-04-02 16:44:05 +03:00
darkrose cef3896eac some leaflike tweaks 2016-02-20 21:47:58 +10:00
Joel Heaton d144b5b422 tweaked armour, warmth and durability values; adjusted wear levels 2016-02-19 18:09:17 +00:00
darkrose 936c87d296 get rid of ghost nodes, hopefully 2016-02-18 17:29:26 +10:00
darkrose 2cde6c6077 Merge branch 'next' into 'next' 
32x textures

removal of redundant textures, the start of 32x textures, closer together control scheme with no combinations

See merge request !41
 2016-02-14 12:43:31 +00:00
sdzen febb05cbad grumble grumble *restores defaults* 2016-02-14 07:30:31 -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
darkrose a419661cdf update credits 2016-02-14 00:32:58 +10:00
darkrose 261cdc5568 Merge branch 'Nascher/voxelands-SeperateDirectories' into next 2016-02-14 00:17:07 +10:00
Nascher fc13a988a3 Add a rule that the "RUN_IN_PLACE" users are not affected by the Migrating Process 2016-02-13 15:12:29 +01: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 5738799340 Signed-off-by: sdzen <sdzen@techie.com> 2016-02-12 12:05:52 -05:00
Nascher cdd5d6484a Fix for creating the Config Directory under BSD and updated the XDG Paths 2016-02-12 14:48:56 +01:00
Nascher 700d329917 Update the Logging Messages of the Migrating Process 2016-02-12 13:23:05 +01: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
Nascher f93a7dac79 Update the XDG Base Spec for FreeBSD and Add a "Migrating Process" for the Old Directory 2016-02-10 21:54:26 +01: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
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 7d59fc857a add desert biome 2016-02-02 20:21:00 +10: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
Nascher b7cc508a7e Tweak the description for the directories 2016-01-31 12:28:26 +01:00
Nascher 24d819d39c Add XDG Base Directory Specification 2016-01-31 12:18:54 +01:00
Nascher 7217483be7 Seperate the Voxelands Userdata Directory 
The Userdata Directory is now splitted up into the Userconfig (~/.config/voxelands) and Userdata (~/.local/share/voxelands) for Linux.
 2016-01-28 13:33:18 +01: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
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