teddydestodes [Wed, 1 Jun 2011 12:11:52 +0000 (14:11 +0200)]
Merge remote-tracking branch 'upstream/master'
Nils Dagsson Moskopp [Tue, 31 May 2011 00:56:23 +0000 (08:56 +0800)]
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
Nils Dagsson Moskopp [Wed, 1 Jun 2011 06:09:28 +0000 (08:09 +0200)]
* clay is rarer now
Nils Dagsson Moskopp [Wed, 1 Jun 2011 02:57:46 +0000 (04:57 +0200)]
+ clay and associated items
Nils Dagsson Moskopp [Tue, 31 May 2011 20:04:09 +0000 (22:04 +0200)]
+ brick
Nils Dagsson Moskopp [Tue, 31 May 2011 18:52:20 +0000 (20:52 +0200)]
* menulogo now shows minetest delta
Nils Dagsson Moskopp [Tue, 31 May 2011 00:56:41 +0000 (02:56 +0200)]
+ fence inventory icon
Nils Dagsson Moskopp [Tue, 31 May 2011 00:56:23 +0000 (02:56 +0200)]
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
Nils Dagsson Moskopp [Mon, 30 May 2011 12:42:08 +0000 (14:42 +0200)]
+ cactii
Nils Dagsson Moskopp [Sun, 29 May 2011 17:08:59 +0000 (01:08 +0800)]
+ .gitignore
teddydestodes [Sun, 29 May 2011 17:17:42 +0000 (19:17 +0200)]
fast_move and free_move can now be toggled
Nils Dagsson Moskopp [Sun, 29 May 2011 17:08:59 +0000 (19:08 +0200)]
+ .gitignore
Nils Dagsson Moskopp [Sun, 29 May 2011 17:03:05 +0000 (19:03 +0200)]
+ README in main directory
Nils Dagsson Moskopp [Sun, 29 May 2011 16:49:02 +0000 (18:49 +0200)]
* better heart icon
Nils Dagsson Moskopp [Sun, 29 May 2011 16:48:39 +0000 (18:48 +0200)]
* better glass graphics
Nils Dagsson Moskopp [Sun, 29 May 2011 16:48:21 +0000 (18:48 +0200)]
* better rat graphics
Nils Dagsson Moskopp [Sun, 29 May 2011 16:47:40 +0000 (18:47 +0200)]
* enemies are now omsk birds
Nils Dagsson Moskopp [Sun, 29 May 2011 16:45:50 +0000 (18:45 +0200)]
* better player graphics
Nils Dagsson Moskopp [Sat, 28 May 2011 00:17:19 +0000 (02:17 +0200)]
+ sandstone
Perttu Ahola [Tue, 24 May 2011 18:04:22 +0000 (21:04 +0300)]
when pause menu is activated, move mouse cursor on top of the disconnect button, for convenience.
Perttu Ahola [Tue, 24 May 2011 17:13:21 +0000 (20:13 +0300)]
Merged CiaranG's fence and fixed two things
Perttu Ahola [Tue, 24 May 2011 17:05:30 +0000 (20:05 +0300)]
a work-in-progress map modified callback interface (committing because i want to merge the fence stuff)
Perttu Ahola [Tue, 24 May 2011 17:03:19 +0000 (20:03 +0300)]
Added a check that avoids server crash (unhandled exception) when map generation is attempted near limit
Ciaran Gultnieks [Tue, 24 May 2011 16:52:04 +0000 (17:52 +0100)]
Added fences (but still needs an icon or something to display in inventory)
Ciaran Gultnieks [Mon, 23 May 2011 19:40:25 +0000 (20:40 +0100)]
Added 'shout' player privilege
Ciaran Gultnieks [Sun, 22 May 2011 22:56:57 +0000 (23:56 +0100)]
Allow default privileges for new players to be set in the server config
Perttu Ahola [Sun, 22 May 2011 21:12:24 +0000 (00:12 +0300)]
merged password change menu
Perttu Ahola [Sun, 22 May 2011 20:55:02 +0000 (23:55 +0300)]
Some work-in-progress stuff and many comment updates
Ciaran Gultnieks [Sun, 22 May 2011 20:09:12 +0000 (21:09 +0100)]
Added the ability to change your password (via pause menu)
--HG--
extra : rebase_source :
e8ec407f60711d42d33be4811b2880088f617b5b
Perttu Ahola [Sun, 22 May 2011 14:25:52 +0000 (17:25 +0300)]
mud placed in sunlight no longer instantly turns to grass; also tuned transforming speed a bit (will be made a lot longer when testing is complete)
Perttu Ahola [Sun, 22 May 2011 14:00:09 +0000 (17:00 +0300)]
Preliminary "active block" stuff + set up test code to grow grass.
Perttu Ahola [Sat, 21 May 2011 11:28:58 +0000 (14:28 +0300)]
Fixed a small memory leak in ServerEnvironment and cleaned the code a bit
Perttu Ahola [Sat, 21 May 2011 11:28:28 +0000 (14:28 +0300)]
fixed a small memory leak in game.cpp
Perttu Ahola [Sat, 21 May 2011 11:28:13 +0000 (14:28 +0300)]
fixed a small memory leak in mapnode.cpp
Perttu Ahola [Sat, 21 May 2011 09:52:57 +0000 (12:52 +0300)]
updated readme a bit
Perttu Ahola [Sat, 21 May 2011 09:28:33 +0000 (12:28 +0300)]
added a delay to menu loop
Perttu Ahola [Sat, 21 May 2011 09:25:08 +0000 (12:25 +0300)]
Cleaned networking code a bit (had this one on the to-do list for like 4 months already)
Perttu Ahola [Sat, 21 May 2011 08:44:29 +0000 (11:44 +0300)]
fix in readme
Perttu Ahola [Sat, 21 May 2011 08:31:48 +0000 (11:31 +0300)]
some documentation updates
Perttu Ahola [Sat, 21 May 2011 08:07:45 +0000 (11:07 +0300)]
and the changelog
Perttu Ahola [Sat, 21 May 2011 08:07:03 +0000 (11:07 +0300)]
All textures are are now searched first from the directory specified by the texture_path setting.
Perttu Ahola [Sat, 21 May 2011 07:13:10 +0000 (10:13 +0300)]
updated changelog
Perttu Ahola [Fri, 20 May 2011 22:11:58 +0000 (01:11 +0300)]
Merge: New map directory structure and player passwords
Ciaran Gultnieks [Fri, 20 May 2011 20:37:13 +0000 (21:37 +0100)]
Passwords - a few corrections to the previous commit
Ciaran Gultnieks [Fri, 20 May 2011 19:28:03 +0000 (20:28 +0100)]
Passwords - password entry at main menu, stored and checked by server
Perttu Ahola [Thu, 19 May 2011 19:59:10 +0000 (22:59 +0300)]
change default sneak key from RSHIFT to LSHIFT
Perttu Ahola [Thu, 19 May 2011 17:10:17 +0000 (20:10 +0300)]
Moved the temporary mapgen test files and added a modified map.cpp too... These are probably useful in the next mapgen update and shouldn't be lost.
--HG--
rename : src/noise.cpp.new => misc/noise.cpp
rename : src/noise.h.new => misc/noise.h
Perttu Ahola [Thu, 19 May 2011 17:06:54 +0000 (20:06 +0300)]
Add (possibly non-compatible) work-in-progress noise.{h,cpp} so that they won't be accidentally lost. These are useful for upcoming mapgen updates.
Perttu Ahola [Thu, 19 May 2011 17:04:59 +0000 (20:04 +0300)]
add recent major changes to changelog
Ciaran Gultnieks [Thu, 19 May 2011 11:18:42 +0000 (12:18 +0100)]
Don't say 'Creating server and client' if the server is remote, so not being created
Perttu Ahola [Thu, 19 May 2011 05:16:48 +0000 (08:16 +0300)]
put the wstring stoi too in the ignore-on-vc2010 #if
Perttu Ahola [Wed, 18 May 2011 19:05:31 +0000 (22:05 +0300)]
(hopefully) fixed stoi/stof compile problems on vc2010
Perttu Ahola [Wed, 18 May 2011 18:59:31 +0000 (21:59 +0300)]
small comment update
Ciaran Gultnieks [Wed, 18 May 2011 15:48:27 +0000 (16:48 +0100)]
New map directory structure that avoids map size being limited by filesystem
Perttu Ahola [Tue, 17 May 2011 17:11:12 +0000 (20:11 +0300)]
Added libIrrlicht.dll.a to searched library names for non-MSVC windows
Perttu Ahola [Mon, 16 May 2011 21:00:01 +0000 (00:00 +0300)]
merged fix to readlink ignored return value warning
Perttu Ahola [Mon, 16 May 2011 20:59:28 +0000 (23:59 +0300)]
merged CiaranG's stuff again: auto-admin powers to local user, DSTACK macro -Wformat warnings
Ciaran Gultnieks [Mon, 16 May 2011 20:57:36 +0000 (21:57 +0100)]
Get rid of ignored return value warning
Ciaran Gultnieks [Mon, 16 May 2011 20:47:50 +0000 (21:47 +0100)]
Get rid of all the string format warnings caused by the DSTACK macro
Perttu Ahola [Mon, 16 May 2011 17:40:19 +0000 (20:40 +0300)]
added -Wno-unused-but-set-variable, which hides a new warning in gcc 4.6 which only slows down development with no effect on security or anything.
Ciaran Gultnieks [Mon, 16 May 2011 17:26:37 +0000 (18:26 +0100)]
Restored the auto-admin powers of the local user (via name= in the config)
--HG--
extra : rebase_source :
a35aa0d978990c28fa4fc158ce47d1f4aa967c04
Perttu Ahola [Mon, 16 May 2011 16:54:08 +0000 (19:54 +0300)]
Fixed two compiler warnings
Perttu Ahola [Mon, 16 May 2011 16:39:15 +0000 (19:39 +0300)]
merged CiaranG's changes (player privileges)
Ciaran Gultnieks [Mon, 16 May 2011 16:13:33 +0000 (17:13 +0100)]
Server commands without classes
Ciaran Gultnieks [Mon, 16 May 2011 15:13:17 +0000 (16:13 +0100)]
Privileges to/from string conversion functions standalone, not static members
Ciaran Gultnieks [Mon, 16 May 2011 10:34:06 +0000 (11:34 +0100)]
Better synchronisation of build/mine attempts when the player isn't allowed to
Ciaran Gultnieks [Mon, 16 May 2011 10:32:49 +0000 (11:32 +0100)]
Allow "all" to be specified in player config file for privileges
Ciaran Gultnieks [Mon, 16 May 2011 09:41:19 +0000 (10:41 +0100)]
Improved server commands and added player permissions.
--HG--
extra : rebase_source :
178fe08f10b7de3ebaba088bd24faad795114216
Perttu Ahola [Sun, 15 May 2011 10:07:53 +0000 (13:07 +0300)]
fixed an "unused variable" warning
Perttu Ahola [Sun, 15 May 2011 10:06:46 +0000 (13:06 +0300)]
added missing #ifndef KEYCODE_HEADER to keycode.h
Perttu Ahola [Sat, 14 May 2011 16:46:35 +0000 (19:46 +0300)]
removed a leftover debug print
Perttu Ahola [Sat, 14 May 2011 12:44:27 +0000 (15:44 +0300)]
removed unnecessary comment
Perttu Ahola [Sat, 14 May 2011 12:43:26 +0000 (15:43 +0300)]
Added key configuration in the configuration file.
Perttu Ahola [Mon, 9 May 2011 18:41:16 +0000 (21:41 +0300)]
merged CiaranG's changes: the glass block
Ciaran Gultnieks [Mon, 9 May 2011 18:35:46 +0000 (19:35 +0100)]
Added .hgignore
Ciaran Gultnieks [Mon, 9 May 2011 18:28:12 +0000 (19:28 +0100)]
Added glass texture (poor artwork skills, apologies in advance)
Ciaran Gultnieks [Mon, 9 May 2011 18:22:07 +0000 (19:22 +0100)]
Added glass, with rendering and furnace support.
Perttu Ahola [Mon, 9 May 2011 13:39:37 +0000 (16:39 +0300)]
Removed a single outdated comment in client.cpp
Perttu Ahola [Fri, 6 May 2011 13:58:06 +0000 (16:58 +0300)]
Fixed viewing range stuff a bit (now it works better with very low ranges)
Perttu Ahola [Tue, 3 May 2011 14:33:51 +0000 (17:33 +0300)]
Fixed a temporary solution of server shutting down to an assert(0) when a too large block metadata is sent to an old client
Perttu Ahola [Tue, 3 May 2011 14:33:13 +0000 (17:33 +0300)]
Hopefully fixed the bug of huge mineral deposits rarely in seafloor sand
Perttu Ahola [Tue, 3 May 2011 05:22:05 +0000 (08:22 +0300)]
comment update
Perttu Ahola [Fri, 29 Apr 2011 23:12:32 +0000 (02:12 +0300)]
random comment updates
Perttu Ahola [Fri, 29 Apr 2011 15:30:34 +0000 (18:30 +0300)]
added cobblestone to the texture atlas
Perttu Ahola [Fri, 29 Apr 2011 14:55:50 +0000 (17:55 +0300)]
changelog update
Perttu Ahola [Fri, 29 Apr 2011 14:53:07 +0000 (17:53 +0300)]
made proper skyboxes for dawn/evening and night
Perttu Ahola [Fri, 29 Apr 2011 13:39:47 +0000 (16:39 +0300)]
Tweaked clouds a bit
Perttu Ahola [Fri, 29 Apr 2011 13:02:58 +0000 (16:02 +0300)]
updated changelog
Perttu Ahola [Fri, 29 Apr 2011 13:00:36 +0000 (16:00 +0300)]
added simple skybox
Perttu Ahola [Fri, 29 Apr 2011 12:34:26 +0000 (15:34 +0300)]
added clouds
Perttu Ahola [Thu, 28 Apr 2011 21:38:11 +0000 (00:38 +0300)]
didn't actually change everything, just re-saved the grass texture.
Perttu Ahola [Thu, 28 Apr 2011 21:29:34 +0000 (00:29 +0300)]
Maybe fixed the flood of "WARNING: StaticObjectList::remove(): id=13 not found" style debug messages on the server when a player has quit.
Perttu Ahola [Tue, 26 Apr 2011 21:14:16 +0000 (00:14 +0300)]
Changed a bit of the code that is and should still be commented out.
Perttu Ahola [Tue, 26 Apr 2011 13:22:00 +0000 (16:22 +0300)]
forgot to change one thing back
Perttu Ahola [Tue, 26 Apr 2011 12:38:42 +0000 (15:38 +0300)]
tested out and commented out some new stuff for the terrain generator, to be used in the future.
Perttu Ahola [Mon, 25 Apr 2011 22:13:30 +0000 (01:13 +0300)]
A small fix to unnecessary saving of map metadata
Perttu Ahola [Mon, 25 Apr 2011 21:23:38 +0000 (00:23 +0300)]
Optimized map saving and sending (server-side)
Perttu Ahola [Mon, 25 Apr 2011 08:55:40 +0000 (11:55 +0300)]
Set oerkki1 to not be drawn in completely dark
Perttu Ahola [Mon, 25 Apr 2011 08:55:07 +0000 (11:55 +0300)]
Added /#time <int> command to server for changing the time of day
Perttu Ahola [Sun, 24 Apr 2011 21:31:22 +0000 (00:31 +0300)]
fix to the previous commit