Commit graph

146 commits

Author SHA1 Message Date
foam
a3086e5141 Merge branch 'master' of ssh://dave@fo.am/git/groworld
Conflicts:
	plant-eyes/plant-eyes.scm
2009-07-24 21:00:06 +01:00
Dave Griffiths
78255b9b86 added plant selection at start up and some ambient absorb particles 2009-07-24 20:02:49 +01:00
foam
e1e51d083b Merge branch 'master' of ssh://dave@fo.am/git/groworld 2009-07-23 13:08:06 +01:00
foam
d1bd7133f4 wiggle 2009-07-23 13:07:43 +01:00
Dave Griffiths
6c5fc421b2 oops, forgot to add client.ss 2009-07-23 13:06:59 +01:00
Dave Griffiths
74280d9200 more networking, join game stuff works with preset jid. also fixed the camera and root points coordinate system bugs shown up by having plants with different positions 2009-07-22 16:35:15 +01:00
Dave Griffiths
61ca4a0e6e first pass network working - for twig growth, duplicates the view changes ok 2009-07-21 17:33:26 +01:00
Dave Griffiths
e1c55a2457 first pass serialisation and network messaging 2009-07-13 16:01:20 +01:00
Dave Griffiths
cb7915058c broke apart the source, added jabberer and xmpp 2009-07-13 12:39:34 +01:00
Dave Griffiths
fb334fe4eb final fixes for v6 - new textures and camera changes 2009-07-10 11:08:41 +01:00
Dave Griffiths
cf6745c139 Merge branch 'master' of ssh://dave@fo.am/var/git/groworld 2009-07-09 12:53:21 +01:00
Dave Griffiths
f907549eb4 steerable and navigatorable twigs 2009-07-09 12:52:56 +01:00
f111c2c04d Merge branch 'master' of ssh://nik@fo.am/var/git/groworld 2009-07-09 10:28:59 +02:00
d960da5b2d xylem update to use ethernet module 2009-07-09 10:28:20 +02:00
Dave Griffiths
b4eef24816 added cursor keys 2009-07-02 14:46:07 +01:00
Dave Griffiths
6569ea30f9 Merge branch 'master' of ssh://dave@fo.am/var/git/groworld 2009-07-02 14:38:54 +01:00
Dave Griffiths
1dc73c2a9f camera stuff 2009-07-02 14:38:43 +01:00
a0f1ea5e07 event -> sound test 2009-07-02 15:33:32 +02:00
Dave Griffiths
ec0e0c876e added curl tex 2009-06-30 17:56:05 +01:00
Dave Griffiths
8715b791c5 v5 2009-06-30 17:55:49 +01:00
Dave Griffiths
b68cf01bf9 shrunk the pickup object 2009-06-29 18:30:30 +01:00
Dave Griffiths
d725f60e0a fixes 2009-06-29 17:53:57 +01:00
Dave Griffiths
be2624dcb9 added pickups and ornaments 2009-06-29 17:51:32 +01:00
Dave Griffiths
9c8d97369d camera fixes, ready for v3 2009-06-26 10:28:18 +01:00
Dave Griffiths
4310213545 twig recycling and scaling works 2009-06-25 17:56:09 +01:00
Dave Griffiths
8d1b3dafda added smidgen of gameplay back in 2009-06-25 17:04:55 +01:00
Dave Griffiths
79c4093f5d two types of plant rendering working 2009-06-25 13:09:52 +01:00
Dave Griffiths
fe0c0f0aab added extrusion test code 2009-06-25 11:18:37 +01:00
Dave Griffiths
a013bb0508 logical growth works, added a view side with ribbon roots for preview 2009-06-24 16:34:25 +01:00
Dave Griffiths
cf07513ea7 more plant eyes logic foo 2009-06-23 17:35:46 +01:00
Dave Griffiths
655ea3be51 added ambient particles and started work on the logic stuff 2009-06-23 16:45:26 +01:00
Dave Griffiths
c465ec71ae loadsa particles 2009-06-23 08:31:12 +01:00
Dave Griffiths
057656012d scaled everything by 5 2009-06-20 07:40:39 +01:00
Dave Griffiths
e95d837813 rename fpp -> plant-eyes 2009-06-20 07:07:24 +01:00
Dave Griffiths
386d1560dc added world, seed and camera following roots 2009-06-20 01:11:20 +01:00
Dave Griffiths
d5f08b881b removed junk 2009-06-19 17:23:40 +01:00
Dave Griffiths
1489bd4b10 added fpp 2009-06-19 16:53:02 +01:00
Dave Griffiths
143a4c0796 Merge branch 'master' of ssh://dave@fo.am/var/git/groworld 2009-06-15 12:20:39 +01:00
Dave Griffiths
aeaf9c0afb stones, sky, schematic roots 2009-06-15 12:19:54 +01:00
ffe9816a3e XMPP updated to point to planet version. 2009-06-12 13:21:02 +02:00
Dave Griffiths
72e6024a76 Merge branch 'master' of ssh://dave@fo.am/var/git/groworld 2009-06-12 09:58:45 +01:00
Dave Griffiths
2e4e40a761 2 player working, sorted out plant types 2009-06-12 09:44:06 +01:00
1b4a9e863f sepllink 2009-06-10 17:15:13 +02:00
b04277bf80 basic plant sensor interface 2009-06-10 17:12:29 +02:00
c19e30d7fc Merge branch 'master' of ssh://nik@fo.am/var/git/groworld 2009-06-10 16:52:47 +02:00
3aace4bb45 misc/minor 2009-06-10 16:38:49 +02:00
Dave Griffiths
e28bde30f0 plants added, worms better 2009-06-10 12:45:37 +01:00
Dave Griffiths
b1789e048b added pluggables code, refactored the structure and first pass garden + plants 2009-06-09 17:49:05 +01:00
Dave Griffiths
66dbdd9277 added windows fixes 2009-06-08 16:54:51 +01:00
Dave Griffiths
bbe9b1551e added stuff 2009-06-08 16:26:43 +01:00