Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,698 Commits 1 Branch 1 Tag 115 MiB
Commit Graph

4698 Commits

Author SHA1 Message Date
OttoLidenbrock 3df9f38901 Update android makefile 2015-05-23 21:08:43 +10:00
OttoLidenbrock f783e6c573 rename games/MultiCraft_game/minetest.conf to games/MultiCraft_game/multicraft.conf 2015-05-23 20:52:43 +10:00
OttoLidenbrock 0c320aaff2 rename conf to multicraft.conf 2015-05-23 20:36:48 +10:00
OttoLidenbrock 5349ea0800 Only allow multicraft game as game 2015-05-23 13:15:05 +10:00
OttoLidenbrock 02848d189e Make armour HUD always show even if empty, and add game to master 2015-05-23 13:05:33 +10:00
OttoLidenbrock 458fa3a678 Fix android build 2015-05-23 12:53:16 +10:00
OttoLidenbrock 96504404e6 Change where games looks for mods from mods/ to files/ 2015-05-19 12:17:41 +10:00
OttoLidenbrock 79a49474ce Fix accidental removal of credits 2015-05-17 01:05:23 +10:00
OttoLidenbrock 48d3e1897b Remove version info top-left for main menu 2015-05-17 00:57:50 +10:00
OttoLidenbrock 15891d82ff Remove "?" button from main menu 2015-05-17 00:37:38 +10:00
OttoLidenbrock e098ffee67 Fix PC build bug 2015-05-17 00:32:00 +10:00
OttoLidenbrock c27ae07f46 Fix swimming bug 2015-05-17 00:30:22 +10:00
OttoLidenbrock 00adfc0430 Change inventory button size 2015-05-16 23:25:16 +10:00
Maksim Gamarnik 6df7918aea Merge MultiCraft_game 
and change gitignore
 2015-05-15 16:43:28 +03:00
Maksim Gamarnik d2a6429253 Mailmap update and remove old doc 2015-05-15 16:17:39 +03:00
Maksim Gamarnik 5de8a9be67 Remove Minimals game 
Goodbye
 2015-05-15 16:09:17 +03:00
Maksim Gamarnik dab2defb1b Default Setting and Textures 
MultiCraft gamecontrol textures
Optimal settings
 2015-05-15 16:05:49 +03:00
OttoLidenbrock 6a18586475 Fix previous Makefile commit (it didn't work) 2015-05-15 21:54:05 +10:00
Maksim Gamarnik 86720e755d New SQLite on Android build 2015-05-15 14:47:40 +03:00
OttoLidenbrock 47b38aa9c9 Only include files.zip in APK 2015-05-15 21:45:05 +10:00
OttoLidenbrock 14f92a18de add ver.txt 2015-05-15 21:16:20 +10:00
OttoLidenbrock ff09365cd0 Remove usage of pushd/popd from android makefile so Debian can work (assuming zip is installed) 2015-05-15 20:49:54 +10:00
OttoLidenbrock ce92c40653 Fix builtin/init.lua 2015-05-15 20:15:58 +10:00
OttoLidenbrock ca5f746c50 Update English in strings.xml 2015-05-15 19:06:20 +10:00
OttoLidenbrock 7bee4e8f5f Make sure there is always a delay after digging before a node can be placed 2015-05-13 17:41:46 +10:00
Megaf cf68f37cd2 Merge resolution 
Replaced libjpeg dependency on apt-get, it should be libjpeg-dev instead of libjpeg8-dev.

On Debian 8...
```
Package libjpeg8-dev is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source
However the following packages replace it:
  libjpeg62-turbo-dev
```
Using libjpeg-dev should make the OS select the most appropriate lib to be installed.
These are the packages available on Debian 8.
```
libjpeg-dev - Development files for the JPEG library [dummy package]
libjpeg-turbo-progs - Programs for manipulating JPEG files
libjpeg-turbo-progs-dbg - Programs for manipulating JPEG files (debugging symbols)
libjpeg62-turbo - libjpeg-turbo JPEG runtime library
libjpeg62-turbo-dbg - Debugging symbols for the libjpeg-turbo JPEG library
libjpeg62-turbo-dev - Development files for the libjpeg-turbo JPEG library
libturbojpeg1 - TurboJPEG runtime library - SIMD optimized
libturbojpeg1-dbg - TurboJPEG runtime library - SIMD optimized (debugging symbols)
libturbojpeg1-dev - Development files for the TurboJPEG library

```
This seems to work on all current Debian versions, Wheezy, Jessie and Sid.
https://packages.debian.org/wheezy/libjpeg-dev
https://packages.debian.org/jessie/libjpeg-dev
https://packages.debian.org/stretch/libjpeg-dev

Im not sure if Ubuntu has this dummy package.

http://packages.ubuntu.com/search?keywords=libjpeg-dev

Perhaps this should be further discussed.

libjpeg8-dev -> libjpeg-dev

Conflicts:
	README.txt
 2015-05-13 17:04:24 +10:00
Craig Robbins 9c31210a43 Change lower limit of display_gamma to 1.0 (linear light) 
Now matches function comment
 2015-05-13 17:01:56 +10:00
kwolekr 1643bdd449 Schematics: Add per-node force placement option 2015-05-13 17:01:54 +10:00
kwolekr e02a6e8f30 Fix typo in WieldMesh::setItem() 2015-05-13 17:01:52 +10:00
kwolekr d5f1f230d3 Ensure that Map::findNodesWithMetadata() reports nodes strictly within the node-granular area 2015-05-13 17:01:49 +10:00
kwolekr 97683c9d21 Replace Wieldmesh::setItem assertion that could be triggered by the server with an error 2015-05-13 17:01:47 +10:00
est31 22a2bc2ac1 Fix release build warning 2015-05-13 17:01:42 +10:00
kwolekr 2348171144 Fix compilation for non-client builds, and fix signed comparison warning 2015-05-13 17:01:35 +10:00
kwolekr a33092eda6 Tests: Add schematic unittests 
Improve schematic file-saving interface
Add ability to create temporary test files
 2015-05-13 17:01:33 +10:00
est31 8e1865b3bb Gracefully handle PacketErrors 2015-05-13 17:01:30 +10:00
kwolekr ef755ff2c4 Fix missing Y component assignment in check_v3f 2015-05-13 17:01:28 +10:00
paramat 2e28e6849e Conf.example: Update recommended maximum cloud radius to 26 2015-05-13 17:01:24 +10:00
Kevin Ott b562f20e85 Remove duplicate lua_getfield() in c_converter.cpp 
Fixes #2678
 2015-05-13 17:01:22 +10:00
kwolekr 739c856b94 Schematics: Add indent-with-space option for schematic Lua table serialization 2015-05-13 17:01:19 +10:00
kwolekr 4ffc59b9b1 NodeResolver: Remove NodeResolveMethod 
This simplifies NodeResolver logic and makes some interfaces cleaner.
 2015-05-13 17:01:16 +10:00
ShadowNinja 5748937250 Fix connection speed unit names 2015-05-13 17:01:13 +10:00
ShadowNinja d5837d29d7 Fix error messages for type-checking Lua reading functions 2015-05-13 17:01:10 +10:00
ShadowNinja 5777d5cff5 Improve Redis error messages 2015-05-13 17:01:08 +10:00
kwolekr 9dd81a7a23 Fix build on Debian broken by b45df9d (missing include, somehow?) 2015-05-13 17:01:05 +10:00
kwolekr ba49b4a5b6 NodeDefManager: Improve const-correctness of interfaces 
- Add ability to explicitly reset NodeResolve state (useful for unittesting)
- Remove non-essential NodeResolve methods modifying state from INodeDefManager
- Add const qualifier to NodeDefManager and ContentFeatures serialize
 2015-05-13 17:01:02 +10:00
kwolekr 4c439aec8d Add core.find_nodes_with_meta() script API 2015-05-13 17:00:59 +10:00
kwolekr ebbaba6907 Tests: Add NodeResolver unittests 
Minor misc. NodeResolver cleanups
Prefix faux content type constants for testing with t_ to avoid
confusion or name collisions
 2015-05-13 17:00:53 +10:00
ShadowNinja 0ac2dc99e7 Make Git version detection use VERSION_STRING instead of tags 
This fixes the problem where 0.4.12-dev versions were erroneously shown as
0.4.11-dev because the tag was added on a separate branch.  It also fixes a
similar issue when builders didn't fetch new tags when updating.

This also removes the number-of-commits-since-tag field, since it's
incompatible with this.  Said field doesn't seem to be useful anyway if you
have the commit hash.
 2015-05-13 17:00:50 +10:00
ShadowNinja ea3a218056 Fix GCC compiler warning 2015-05-13 17:00:47 +10:00
Jay Arndt 6037a46e88 Stop NetworkPacket methods from producing bloated packets 2015-05-13 17:00:45 +10:00