Ciaran Gultnieks
|
e09fec3373
|
New map directory structure that avoids map size being limited by filesystem
|
2011-05-18 16:48:27 +01:00 |
|
Perttu Ahola
|
c52fbcd8e9
|
merged fix to readlink ignored return value warning
|
2011-05-17 00:00:01 +03:00 |
|
Perttu Ahola
|
07ff1da6ae
|
merged CiaranG's stuff again: auto-admin powers to local user, DSTACK macro -Wformat warnings
|
2011-05-16 23:59:28 +03:00 |
|
Ciaran Gultnieks
|
f1bdc6b187
|
Get rid of ignored return value warning
|
2011-05-16 21:57:36 +01:00 |
|
Ciaran Gultnieks
|
29932d4bdd
|
Get rid of all the string format warnings caused by the DSTACK macro
|
2011-05-16 21:47:50 +01:00 |
|
Perttu Ahola
|
5624dac3b7
|
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.
|
2011-05-16 20:40:19 +03:00 |
|
Ciaran Gultnieks
|
8bba9cde5c
|
Restored the auto-admin powers of the local user (via name= in the config)
--HG--
extra : rebase_source : a35aa0d978990c28fa4fc158ce47d1f4aa967c04
|
2011-05-16 18:26:37 +01:00 |
|
Perttu Ahola
|
bc59c18503
|
Fixed two compiler warnings
|
2011-05-16 19:54:08 +03:00 |
|
Perttu Ahola
|
94c9686020
|
merged CiaranG's changes (player privileges)
|
2011-05-16 19:39:15 +03:00 |
|
Ciaran Gultnieks
|
b3268ff389
|
Server commands without classes
|
2011-05-16 17:13:33 +01:00 |
|
Ciaran Gultnieks
|
1520d49310
|
Privileges to/from string conversion functions standalone, not static members
|
2011-05-16 16:13:17 +01:00 |
|
Ciaran Gultnieks
|
7cdd988f88
|
Better synchronisation of build/mine attempts when the player isn't allowed to
|
2011-05-16 11:34:06 +01:00 |
|
Ciaran Gultnieks
|
50c48219a7
|
Allow "all" to be specified in player config file for privileges
|
2011-05-16 11:32:49 +01:00 |
|
Ciaran Gultnieks
|
248d7c8469
|
Improved server commands and added player permissions.
--HG--
extra : rebase_source : 178fe08f10b7de3ebaba088bd24faad795114216
|
2011-05-16 10:41:19 +01:00 |
|
Perttu Ahola
|
1c3a85fa54
|
fixed an "unused variable" warning
|
2011-05-15 13:07:53 +03:00 |
|
Perttu Ahola
|
17f575b11b
|
added missing #ifndef KEYCODE_HEADER to keycode.h
|
2011-05-15 13:06:46 +03:00 |
|
Perttu Ahola
|
dadac0e79f
|
removed a leftover debug print
|
2011-05-14 19:46:35 +03:00 |
|
Perttu Ahola
|
5cb569af7f
|
removed unnecessary comment
|
2011-05-14 15:44:27 +03:00 |
|
Perttu Ahola
|
974c5cc08c
|
Added key configuration in the configuration file.
|
2011-05-14 15:43:26 +03:00 |
|
Perttu Ahola
|
0674db4a6b
|
merged CiaranG's changes: the glass block
|
2011-05-09 21:41:16 +03:00 |
|
Ciaran Gultnieks
|
2e1a69c3b1
|
Added glass, with rendering and furnace support.
|
2011-05-09 19:22:07 +01:00 |
|
Perttu Ahola
|
8c3b4fed10
|
Removed a single outdated comment in client.cpp
|
2011-05-09 16:39:37 +03:00 |
|
Perttu Ahola
|
1a6e1e142f
|
Fixed viewing range stuff a bit (now it works better with very low ranges)
|
2011-05-06 16:58:06 +03:00 |
|
Perttu Ahola
|
59c4a342a9
|
Fixed a temporary solution of server shutting down to an assert(0) when a too large block metadata is sent to an old client
|
2011-05-03 17:33:51 +03:00 |
|
Perttu Ahola
|
821d5bb4cc
|
Hopefully fixed the bug of huge mineral deposits rarely in seafloor sand
|
2011-05-03 17:33:13 +03:00 |
|
Perttu Ahola
|
1c08b6c99a
|
comment update
|
2011-05-03 08:22:05 +03:00 |
|
Perttu Ahola
|
9c72d44fe7
|
random comment updates
|
2011-04-30 02:12:32 +03:00 |
|
Perttu Ahola
|
67529acf5f
|
added cobblestone to the texture atlas
|
2011-04-29 18:30:34 +03:00 |
|
Perttu Ahola
|
a73b10eb1c
|
made proper skyboxes for dawn/evening and night
|
2011-04-29 17:53:07 +03:00 |
|
Perttu Ahola
|
a5df5f8291
|
Tweaked clouds a bit
|
2011-04-29 16:39:47 +03:00 |
|
Perttu Ahola
|
0847e550f0
|
added simple skybox
|
2011-04-29 16:00:36 +03:00 |
|
Perttu Ahola
|
7a367f96e1
|
added clouds
|
2011-04-29 15:34:26 +03:00 |
|
Perttu Ahola
|
288822e73d
|
Maybe fixed the flood of "WARNING: StaticObjectList::remove(): id=13 not found" style debug messages on the server when a player has quit.
|
2011-04-29 00:29:34 +03:00 |
|
Perttu Ahola
|
8377b5f2a6
|
Changed a bit of the code that is and should still be commented out.
|
2011-04-27 00:14:16 +03:00 |
|
Perttu Ahola
|
36d299ce58
|
forgot to change one thing back
|
2011-04-26 16:22:00 +03:00 |
|
Perttu Ahola
|
ffb1128951
|
tested out and commented out some new stuff for the terrain generator, to be used in the future.
|
2011-04-26 15:38:42 +03:00 |
|
Perttu Ahola
|
664eb4f7c5
|
A small fix to unnecessary saving of map metadata
|
2011-04-26 01:13:30 +03:00 |
|
Perttu Ahola
|
2830095366
|
Optimized map saving and sending (server-side)
|
2011-04-26 00:23:38 +03:00 |
|
Perttu Ahola
|
42fb1ba676
|
Set oerkki1 to not be drawn in completely dark
|
2011-04-25 11:55:40 +03:00 |
|
Perttu Ahola
|
041b5e5479
|
Added /#time <int> command to server for changing the time of day
|
2011-04-25 11:55:07 +03:00 |
|
Perttu Ahola
|
2c4351b9b2
|
fix to the previous commit
|
2011-04-25 00:31:22 +03:00 |
|
Perttu Ahola
|
ab51298a0d
|
server to print version in chat
|
2011-04-25 00:24:40 +03:00 |
|
Perttu Ahola
|
6edb8c567c
|
Tuned polygon generation to sort the triangles for nicer gradients
|
2011-04-24 21:54:04 +03:00 |
|
Perttu Ahola
|
f2349ec5df
|
...Now the tesselation should actually work
|
2011-04-24 21:18:25 +03:00 |
|
Perttu Ahola
|
2704bdc68e
|
Optimized smooth lighting calculation code
|
2011-04-24 21:15:50 +03:00 |
|
Perttu Ahola
|
c9967d6d07
|
updated menu a bit, and some other small fixes
|
2011-04-24 15:37:41 +03:00 |
|
Perttu Ahola
|
ba88685fab
|
cleaned the smooth lighting code a bit
|
2011-04-24 14:19:35 +03:00 |
|
Perttu Ahola
|
79799840a2
|
disable tiling of textures only if smooth lighting is used
|
2011-04-24 12:39:33 +03:00 |
|
Perttu Ahola
|
b21c7de3ed
|
Added a setting for disabling smooth lighting. Updated changelog.
|
2011-04-24 12:31:19 +03:00 |
|
Perttu Ahola
|
8c1f7a0dd2
|
Added a simple software "ambient occlusion" effect, like minecraft's "smooth lighting"
|
2011-04-24 11:41:33 +03:00 |
|
Perttu Ahola
|
0034744568
|
Made the main menu a bit more unique looking
|
2011-04-24 00:11:23 +03:00 |
|
Perttu Ahola
|
96e09703ba
|
fix to the previous commit
|
2011-04-23 18:59:23 +03:00 |
|
Perttu Ahola
|
ea69a49a7b
|
tuned error reporting a bit
|
2011-04-23 18:53:39 +03:00 |
|
Perttu Ahola
|
179fc8597b
|
port to be not set to 0 from configuration
|
2011-04-23 18:43:20 +03:00 |
|
Perttu Ahola
|
1995b59320
|
Code refactoring; split half of main.cpp to game.cpp.
|
2011-04-23 18:31:31 +03:00 |
|
Perttu Ahola
|
9f17664336
|
cleaning up main.cpp a bit
|
2011-04-23 16:01:49 +03:00 |
|
Perttu Ahola
|
bda4681242
|
fixed flowing water lighting when it is below a solid block
|
2011-04-23 16:01:32 +03:00 |
|
Perttu Ahola
|
bbe47f845b
|
Updated to-do list and added the give_initial_stuff setting for testing
|
2011-04-22 10:48:40 +03:00 |
|
Perttu Ahola
|
b36e5c0508
|
Removed IrrlichtWrapper
|
2011-04-22 09:54:05 +03:00 |
|
Perttu Ahola
|
983bf6677d
|
set client to not show hp if server doesn't support it
|
2011-04-21 19:54:05 +03:00 |
|
Perttu Ahola
|
c638442e78
|
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
|
2011-04-21 19:35:17 +03:00 |
|
Perttu Ahola
|
3c61d57f6d
|
item drop multiplication fix
|
2011-04-19 17:09:45 +03:00 |
|
Perttu Ahola
|
a7d36a50bb
|
Menu will now ignore an invalid port or the port 0.
|
2011-04-15 23:35:32 +03:00 |
|
Perttu Ahola
|
e20dbbf6ee
|
fixed port setting not being loaded from configuration file for client
|
2011-04-12 17:42:17 +03:00 |
|
Perttu Ahola
|
08139f32f9
|
fixing
|
2011-04-12 01:59:09 +03:00 |
|
Perttu Ahola
|
249c0dc68a
|
Fixed some problems with crafting and inventory
|
2011-04-11 21:28:04 +03:00 |
|
Perttu Ahola
|
81ac026e1f
|
updated example map generator python script
|
2011-04-11 18:33:05 +03:00 |
|
Perttu Ahola
|
50a8087684
|
support for format 0 and 1 maps
|
2011-04-11 16:58:49 +03:00 |
|
Perttu Ahola
|
f5f15e38a5
|
Added installing build-essential to build instructions and modified the main.cpp notes a bit
|
2011-04-11 14:04:26 +03:00 |
|
Perttu Ahola
|
9d4e9c59de
|
fixed warnings reported by cppcheck
|
2011-04-11 11:36:13 +03:00 |
|
Perttu Ahola
|
3f153c20d3
|
Fixed error reported by cppcheck:
[./server.cpp:1327]: (error) Possible null pointer dereference: obj - otherwise it is redundant to check if obj is null at line 1332
|
2011-04-11 11:05:40 +03:00 |
|
Perttu Ahola
|
67d5f5c1d5
|
fixed problem with vc++ build crashing at startup
|
2011-04-11 09:47:25 +03:00 |
|
Perttu Ahola
|
032882ae05
|
hopefully fixed a bit more
|
2011-04-11 00:24:32 +03:00 |
|
Perttu Ahola
|
3236032101
|
improved old map support
|
2011-04-11 00:19:40 +03:00 |
|
Perttu Ahola
|
dc6966cb9d
|
added ignoring of map_meta.txt to better support old maps
|
2011-04-11 00:06:07 +03:00 |
|
Perttu Ahola
|
bb39795ab2
|
fixed the object update interval thingy
|
2011-04-10 23:29:36 +03:00 |
|
Perttu Ahola
|
9d5ccafbb0
|
changed server to do object management at longer intervals (0.5s)
|
2011-04-10 23:14:41 +03:00 |
|
Perttu Ahola
|
26eb607a11
|
Made environment to not consider disconnected players when dealing with ActiveObjects
|
2011-04-10 23:05:21 +03:00 |
|
Perttu Ahola
|
b0b5c43254
|
better support for old maps
|
2011-04-10 22:50:31 +03:00 |
|
Perttu Ahola
|
3d25fe42f3
|
missing include for server build
|
2011-04-10 20:53:39 +03:00 |
|
Perttu Ahola
|
89eaaa3e6e
|
added missing file
|
2011-04-10 20:49:15 +03:00 |
|
Perttu Ahola
|
10eedbc1d2
|
Map generation is now properly threaded and doesn't block block placement and other stuff.
|
2011-04-10 20:18:34 +03:00 |
|
Perttu Ahola
|
6fa85c8502
|
a commit before starting to reorganize the map loading/generation logic
|
2011-04-10 19:12:56 +03:00 |
|
Perttu Ahola
|
7aa2d4d109
|
new-style rats are now generated in the map
|
2011-04-10 16:20:31 +03:00 |
|
Perttu Ahola
|
1a32e5585f
|
fixed a bit
|
2011-04-10 15:23:36 +03:00 |
|
Perttu Ahola
|
5a4d8ffad3
|
implemented rats in new system to verify that it works
|
2011-04-10 15:16:27 +03:00 |
|
Perttu Ahola
|
08bbf96877
|
items now fall by gravity... also some other random updating
|
2011-04-10 12:34:12 +03:00 |
|
Perttu Ahola
|
fd7a0735c9
|
new object system
|
2011-04-10 04:15:10 +03:00 |
|
Perttu Ahola
|
6f99cd021b
|
set GUIInventoryMenu to be scaled according to the height of the window (not width)
|
2011-04-09 17:11:31 +03:00 |
|
Perttu Ahola
|
4b54b291ae
|
Some progress on transitioning from MapBlockObject to ActiveObject.
|
2011-04-08 00:47:14 +03:00 |
|
Perttu Ahola
|
2dba606e12
|
stone shovel now needs cobble, not stone.
|
2011-04-06 22:28:51 +03:00 |
|
Perttu Ahola
|
90234e35a6
|
cleaning notes and stuff
|
2011-04-06 11:34:41 +03:00 |
|
Perttu Ahola
|
3269fce795
|
Server: Only send node removal/addition to client if client's player is near it. Otherwise set the modified blocks unsent.
|
2011-04-06 11:02:39 +03:00 |
|
Perttu Ahola
|
b5ace9a064
|
Made mesh update on node removal asynchronous on client, to reduce frametime spikes
|
2011-04-06 11:01:55 +03:00 |
|
Perttu Ahola
|
e56d166337
|
Made mesh update on node addition asynchronous on client, to reduce frametime spikes
|
2011-04-06 10:28:39 +03:00 |
|
Perttu Ahola
|
212f34db82
|
fixed the bug of disabled removal of empty chests
|
2011-04-06 01:42:37 +03:00 |
|
Perttu Ahola
|
89aa8b9be1
|
Furnace is now usable. Added more tools.
--HG--
rename : data/tool_stpick.png => data/tool_stonepick.png
rename : data/tool_wpick.png => data/tool_woodpick.png
|
2011-04-05 18:23:30 +03:00 |
|
Perttu Ahola
|
5b4928e07c
|
forgot the furnace menu files!
|
2011-04-05 11:46:17 +03:00 |
|
Perttu Ahola
|
d6d811f97b
|
A more robust format for node metadata
|
2011-04-05 10:59:48 +03:00 |
|
Perttu Ahola
|
d1d57cf5c3
|
initial workings of the furnace
|
2011-04-05 02:56:29 +03:00 |
|
Perttu Ahola
|
389fe31ace
|
changed node metadata format to better accomodate future needs and problems
|
2011-04-05 00:24:47 +03:00 |
|
Perttu Ahola
|
042834b09d
|
Fixed chest contents not immediately updating to all players
|
2011-04-04 18:29:44 +03:00 |
|
Perttu Ahola
|
7df125c249
|
Modified windows build parameters a bit to make it build
|
2011-04-04 15:34:07 +03:00 |
|
Perttu Ahola
|
14c621d853
|
removed reference to script directory in cmake install
|
2011-04-04 15:19:11 +03:00 |
|
Perttu Ahola
|
4a92df6ff0
|
Chests work now!
|
2011-04-04 15:13:19 +03:00 |
|
Perttu Ahola
|
9e683fff50
|
initial chest metadata
|
2011-04-04 11:18:14 +03:00 |
|
Perttu Ahola
|
a9f89fb3fb
|
now the server builds
|
2011-04-04 05:25:55 +03:00 |
|
Perttu Ahola
|
023fc5b771
|
still a missing file
|
2011-04-04 05:14:59 +03:00 |
|
Perttu Ahola
|
3a58f8179f
|
forgot some files
|
2011-04-04 05:13:08 +03:00 |
|
Perttu Ahola
|
fa736e138c
|
fully implemented the sign with the new framework
|
2011-04-04 05:12:33 +03:00 |
|
Perttu Ahola
|
fa08294d09
|
Node metadata framework
|
2011-04-04 03:45:08 +03:00 |
|
Perttu Ahola
|
2f466726e6
|
Made a proper queued thread to client for handling some block mesh updates. Also made client mutex-free to allow easier adding of new stuff.
|
2011-04-04 02:05:12 +03:00 |
|
Perttu Ahola
|
e0f7bd4d57
|
Modified block mesh generation to have clearer input and output. Instead of being a messy object oriented cludge, it now is a messy cludge with separate parameters.
|
2011-04-03 19:50:54 +03:00 |
|
Perttu Ahola
|
01c2b003e1
|
commit before some more radical changes
|
2011-04-03 16:21:06 +03:00 |
|
Perttu Ahola
|
06eb0ad4d0
|
copied draft of updateNodeMeshes from backup
|
2011-04-03 12:48:20 +03:00 |
|
Perttu Ahola
|
e4f7f97e6c
|
Removed lua stuff
|
2011-04-03 12:28:55 +03:00 |
|
Perttu Ahola
|
ee89e29ae1
|
Revert mapgen to best working version (2)
|
2011-04-03 12:14:23 +03:00 |
|
Perttu Ahola
|
8581bf0091
|
tuned water texture and removed two debug prints from server
|
2011-04-02 21:10:53 +03:00 |
|
Perttu Ahola
|
bc66bb2d40
|
Mapgen is better now. Not a lot, but a bit!
|
2011-04-02 20:55:22 +03:00 |
|
Perttu Ahola
|
2990f5d90b
|
commit before some radical changes
|
2011-04-02 13:44:06 +03:00 |
|
Perttu Ahola
|
2e7b15fed3
|
mapgen work-in-progress
|
2011-03-02 02:00:11 +02:00 |
|
Perttu Ahola
|
9a22d02903
|
mapgen tweaking
|
2011-03-01 01:32:54 +02:00 |
|
Perttu Ahola
|
f923c1fb66
|
tweaked mapgen
|
2011-02-28 21:12:01 +02:00 |
|
Perttu Ahola
|
c137946a3f
|
fixed server sending wrong position of node removal
|
2011-02-28 16:40:25 +02:00 |
|
Perttu Ahola
|
231386d501
|
tweaked mapgen
|
2011-02-28 14:51:57 +02:00 |
|
Perttu Ahola
|
ad9e084e94
|
added trees (very glitchy) and changed grass texture
|
2011-02-28 02:48:31 +02:00 |
|
Perttu Ahola
|
a302ae3e08
|
-
|
2011-02-28 02:14:52 +02:00 |
|
Perttu Ahola
|
c8be58a65c
|
A third try on terrain generation. No trees yet.
|
2011-02-28 02:01:40 +02:00 |
|
Perttu Ahola
|
d9d0efdeed
|
fixed 3d noise and made 2d noise faster
|
2011-02-27 00:59:56 +02:00 |
|
Perttu Ahola
|
48a772b3c6
|
3d noise stuff
|
2011-02-26 20:16:47 +02:00 |
|
Perttu Ahola
|
ec3cb2d1d7
|
fixed a possible infinite loop in ClientEnvironment (dtime counter getting so small that it doesn't increment the value)
|
2011-02-24 18:25:19 +02:00 |
|
Perttu Ahola
|
9f859d8389
|
modified the build system of lua to a more minimal one
|
2011-02-24 00:19:41 +02:00 |
|
Perttu Ahola
|
bfd0980748
|
fixed a path in build system's packaging part
|
2011-02-23 11:12:03 +02:00 |
|
Perttu Ahola
|
be32adc872
|
updated scripting api a bit
--HG--
rename : data/luaobjects/test/client.lua => data/scripts/objects/test/client.lua
rename : data/luaobjects/test/server.lua => data/scripts/objects/test/server.lua
|
2011-02-23 11:10:09 +02:00 |
|
Perttu Ahola
|
9778347c7f
|
mainly work on object scripting api
|
2011-02-23 02:49:57 +02:00 |
|
Perttu Ahola
|
eef7bc3570
|
removed an old comment
|
2011-02-23 00:07:07 +02:00 |
|
Perttu Ahola
|
b82d3f2744
|
Fixed insufficient error handling in narrow_to_wide, which caused a crash if the path of the userdata directory contained special characters that were not included in the used charset (which is used because of the font)
|
2011-02-23 00:06:45 +02:00 |
|
Perttu Ahola
|
62e7912577
|
some tidying
|
2011-02-21 16:50:05 +02:00 |
|
Perttu Ahola
|
69dbc046eb
|
preliminary lua scripting framework for objects
|
2011-02-21 16:10:36 +02:00 |
|
Perttu Ahola
|
c57637b4c3
|
Temporary commit; lots of test code and stuff
|
2011-02-21 00:45:14 +02:00 |
|
Perttu Ahola
|
f5ff378dd0
|
video backend selection
|
2011-02-19 11:48:54 +02:00 |
|
Perttu Ahola
|
4c2b9ed516
|
random code cleaning, shouldn't affect anything
|
2011-02-18 22:25:25 +02:00 |
|
Perttu Ahola
|
74f4a0ece8
|
Set ambient light in inventory cube generation
|
2011-02-18 22:25:13 +02:00 |
|
Perttu Ahola
|
31572eaf8a
|
removed duplicate "bmp"
|
2011-02-17 19:13:27 +02:00 |
|
Perttu Ahola
|
3264ac4390
|
Better texture handling. Textures are not added to atlas if they are big, and atlas is not further made after it is full.
|
2011-02-17 19:07:14 +02:00 |
|
Perttu Ahola
|
fb5ae9a7a5
|
Debug stacks will now be printed on Ctrl-C. Also client properly quits on Ctrl-C.
|
2011-02-16 22:54:07 +02:00 |
|
Perttu Ahola
|
741776313a
|
fixed invalid block loading (the action is to generate a new one)
|
2011-02-16 22:53:35 +02:00 |
|
Perttu Ahola
|
92432a28c0
|
small fixes: crack texture, server build on windows, configuration file example, adding config file example to install
|
2011-02-16 20:03:31 +02:00 |
|
Perttu Ahola
|
ff6a348bb1
|
fixed slight error in server build
|
2011-02-15 22:27:10 +02:00 |
|
Perttu Ahola
|
a0e8f3afd3
|
might work good on cmake+msvc now
|
2011-02-15 20:53:29 +02:00 |
|