]>
git.nickg.me.uk Git - traingame.git/log
Nick Gasson [Tue, 2 Mar 2010 21:25:21 +0000 (21:25 +0000)]
Start getting the train to go uphill
Nick Gasson [Tue, 2 Mar 2010 08:25:16 +0000 (08:25 +0000)]
Merge branch 'master' into slope_track
Nick Gasson [Tue, 2 Mar 2010 08:24:58 +0000 (08:24 +0000)]
Remove signal handler as it seems to upset X
Nick Gasson [Sun, 28 Feb 2010 22:33:28 +0000 (22:33 +0000)]
Merge branch 'master' into slope_track
Nick Gasson [Sun, 28 Feb 2010 22:25:31 +0000 (22:25 +0000)]
Some tabs had snuck in
Nick Gasson [Sun, 28 Feb 2010 22:15:31 +0000 (22:15 +0000)]
Merge branch 'master' into slope_track
Nick Gasson [Sun, 28 Feb 2010 22:15:01 +0000 (22:15 +0000)]
Remove SEGV workaround: this isn't the problem
Nick Gasson [Sun, 28 Feb 2010 22:00:55 +0000 (22:00 +0000)]
No need to store `flip' field for SlopeTrack
Nick Gasson [Sun, 28 Feb 2010 21:59:53 +0000 (21:59 +0000)]
Load sloped track from XML
Nick Gasson [Sun, 28 Feb 2010 21:25:21 +0000 (21:25 +0000)]
Do some fancy maths to make the slopes line up nicely
Nick Gasson [Sun, 28 Feb 2010 20:44:00 +0000 (20:44 +0000)]
Simple upward slopes working
Nick Gasson [Sun, 28 Feb 2010 20:28:29 +0000 (20:28 +0000)]
Make SlopeTrack work like a proper track segment
Nick Gasson [Sun, 28 Feb 2010 19:48:06 +0000 (19:48 +0000)]
Generate sloped track
Nick Gasson [Sun, 28 Feb 2010 18:00:36 +0000 (18:00 +0000)]
Add stub SlopeTrack class
Nick Gasson [Sun, 28 Feb 2010 17:03:20 +0000 (17:03 +0000)]
Calculate slope before and after sloped section
Nick Gasson [Sun, 28 Feb 2010 16:53:12 +0000 (16:53 +0000)]
Detect slopes and warn they're not supported
Nick Gasson [Sun, 28 Feb 2010 16:47:29 +0000 (16:47 +0000)]
Only allow track to be placed on level ground
Nick Gasson [Sun, 28 Feb 2010 13:53:20 +0000 (13:53 +0000)]
Add start of loading/unloading window
Nick Gasson [Sun, 28 Feb 2010 13:37:28 +0000 (13:37 +0000)]
Prevent planting of trees over track or other scenery
Nick Gasson [Sun, 28 Feb 2010 13:31:56 +0000 (13:31 +0000)]
Add some trees to the goods_demo map
Nick Gasson [Sun, 28 Feb 2010 13:30:42 +0000 (13:30 +0000)]
Add lots of trees to the figure8 map
Nick Gasson [Sun, 28 Feb 2010 13:30:30 +0000 (13:30 +0000)]
Scatter trees randomly in dragged area
Nick Gasson [Sun, 28 Feb 2010 13:23:19 +0000 (13:23 +0000)]
Rename `throttle' to `power' in GUI
Nick Gasson [Sat, 27 Feb 2010 22:43:38 +0000 (22:43 +0000)]
Having both placeBuilding and addScenery is pointless
Nick Gasson [Sat, 27 Feb 2010 22:41:30 +0000 (22:41 +0000)]
Storing trees and buildings separately is pointless
Nick Gasson [Sat, 27 Feb 2010 21:41:23 +0000 (21:41 +0000)]
Use boot::program_options to parse command line
Nick Gasson [Sat, 27 Feb 2010 20:54:55 +0000 (20:54 +0000)]
Add support for non-square maps
Nick Gasson [Sat, 27 Feb 2010 20:12:42 +0000 (20:12 +0000)]
Make scenery picker generic
Nick Gasson [Sat, 27 Feb 2010 17:32:19 +0000 (17:32 +0000)]
Rename BuildingPicker to SceneryPicker
Nick Gasson [Sat, 27 Feb 2010 17:27:18 +0000 (17:27 +0000)]
Make buildings implement IScenery and remove IBuilding
Nick Gasson [Sat, 27 Feb 2010 17:20:06 +0000 (17:20 +0000)]
Have Building track its own location
Nick Gasson [Sat, 27 Feb 2010 17:12:23 +0000 (17:12 +0000)]
Allow deleting trees
Nick Gasson [Sat, 27 Feb 2010 15:40:14 +0000 (15:40 +0000)]
Disallow raising terrain over track
Nick Gasson [Sat, 27 Feb 2010 14:10:28 +0000 (14:10 +0000)]
Adjust land height in figure8 map
Nick Gasson [Sat, 27 Feb 2010 14:10:18 +0000 (14:10 +0000)]
Tweak sea and beach colours
Nick Gasson [Sat, 27 Feb 2010 13:51:57 +0000 (13:51 +0000)]
Fix speed issue when reversing
Nick Gasson [Sat, 27 Feb 2010 13:24:48 +0000 (13:24 +0000)]
Change control method to use up/down keys
Nick Gasson [Sat, 27 Feb 2010 13:20:53 +0000 (13:20 +0000)]
Stop including all of SDL with IScreen.hpp
Nick Gasson [Sat, 27 Feb 2010 13:17:17 +0000 (13:17 +0000)]
Fix smoke trail visual artefacts
Nick Gasson [Fri, 26 Feb 2010 19:24:58 +0000 (19:24 +0000)]
Undo last change: was pointless
Nick Gasson [Fri, 26 Feb 2010 19:24:12 +0000 (19:24 +0000)]
Make Map::eraseTile safer
Nick Gasson [Fri, 26 Feb 2010 19:20:43 +0000 (19:20 +0000)]
Use Colour struct rather than HighlightColour everywhere
Nick Gasson [Fri, 26 Feb 2010 19:13:30 +0000 (19:13 +0000)]
Reduce state changes in renderHighlightedTiles
Nick Gasson [Fri, 26 Feb 2010 19:11:24 +0000 (19:11 +0000)]
Tweak goods_demo map
Nick Gasson [Fri, 26 Feb 2010 19:11:09 +0000 (19:11 +0000)]
Fix display of editor drag highlights
Nick Gasson [Fri, 26 Feb 2010 17:54:19 +0000 (17:54 +0000)]
Use right bit for saving depth mask
Nick Gasson [Fri, 26 Feb 2010 08:52:15 +0000 (08:52 +0000)]
Fix graphical artefacts in highlighted tiles
Nick Gasson [Thu, 25 Feb 2010 20:28:30 +0000 (20:28 +0000)]
Tidy up the Building class to be more like Tree
Nick Gasson [Wed, 24 Feb 2010 22:38:35 +0000 (22:38 +0000)]
Overload loadTree with normal and unserialise variants
Nick Gasson [Wed, 24 Feb 2010 22:34:21 +0000 (22:34 +0000)]
Use Point<int> rather than two ints to track location in map loader
Nick Gasson [Wed, 24 Feb 2010 22:27:35 +0000 (22:27 +0000)]
Be consitent: use `load' for resources not `make'
Nick Gasson [Wed, 24 Feb 2010 22:17:33 +0000 (22:17 +0000)]
Methods to serialise/unserialise trees from XML
Nick Gasson [Wed, 24 Feb 2010 21:38:48 +0000 (21:38 +0000)]
Rename ModelTree to just Tree
Nick Gasson [Wed, 24 Feb 2010 21:34:32 +0000 (21:34 +0000)]
Delete old tree code
Nick Gasson [Wed, 24 Feb 2010 21:29:08 +0000 (21:29 +0000)]
Add an IXMLSerialisable interface for everything we can write to an XML file
Nick Gasson [Wed, 24 Feb 2010 20:12:57 +0000 (20:12 +0000)]
Add a new pie tree model
Nick Gasson [Sat, 20 Feb 2010 21:21:27 +0000 (21:21 +0000)]
Try to add some protection against SEGV GLX death
Nick Gasson [Sat, 20 Feb 2010 20:59:27 +0000 (20:59 +0000)]
Load and save trees from XML file
Nick Gasson [Sat, 20 Feb 2010 20:29:40 +0000 (20:29 +0000)]
Load copies of a single cached tree
Nick Gasson [Sat, 20 Feb 2010 19:54:53 +0000 (19:54 +0000)]
A cute 3D tree model
Nick Gasson [Sat, 20 Feb 2010 15:33:08 +0000 (15:33 +0000)]
Some modifications to tree generation algorithm
Nick Gasson [Wed, 17 Feb 2010 22:24:44 +0000 (22:24 +0000)]
Neat fading out messages
Nick Gasson [Mon, 15 Feb 2010 21:27:25 +0000 (21:27 +0000)]
Fix GUI window location bug with border attribute
Nick Gasson [Mon, 15 Feb 2010 21:07:22 +0000 (21:07 +0000)]
Automatic centering and growing of widgets
Nick Gasson [Mon, 15 Feb 2010 20:36:21 +0000 (20:36 +0000)]
Center widgets in the screen by default
Nick Gasson [Sun, 14 Feb 2010 18:43:22 +0000 (18:43 +0000)]
Yet more re-indenting
Nick Gasson [Sun, 14 Feb 2010 18:42:15 +0000 (18:42 +0000)]
Re-indent another couple of files
Nick Gasson [Sun, 14 Feb 2010 18:41:19 +0000 (18:41 +0000)]
Move back to 3-space indent
Nick Gasson [Sun, 14 Feb 2010 18:36:32 +0000 (18:36 +0000)]
Tidy up trees a little bit
Nick Gasson [Sun, 14 Feb 2010 18:23:44 +0000 (18:23 +0000)]
Much better tree generation
Nick Gasson [Sun, 14 Feb 2010 17:19:27 +0000 (17:19 +0000)]
Reasonable looking trees
Nick Gasson [Sun, 14 Feb 2010 17:03:18 +0000 (17:03 +0000)]
Alternative ltrees
Nick Gasson [Sun, 7 Feb 2010 17:21:10 +0000 (17:21 +0000)]
Try to optimise LTree rendering a bit
Nick Gasson [Sun, 7 Feb 2010 13:50:05 +0000 (13:50 +0000)]
Render tree to display list
Nick Gasson [Sun, 7 Feb 2010 13:12:58 +0000 (13:12 +0000)]
Change the colour of trees
Nick Gasson [Sun, 7 Feb 2010 12:57:19 +0000 (12:57 +0000)]
Only draw points arrow when we are near it
Nick Gasson [Sun, 7 Feb 2010 12:48:11 +0000 (12:48 +0000)]
Some cosmetic improvements to arrows
Nick Gasson [Sun, 7 Feb 2010 12:06:10 +0000 (12:06 +0000)]
Draw a better arrow on points
Nick Gasson [Sun, 7 Feb 2010 10:58:15 +0000 (10:58 +0000)]
Simplify and fix point state changing
Nick Gasson [Sun, 7 Feb 2010 10:39:10 +0000 (10:39 +0000)]
Restore old signal handlers after ours have fired once
Nick Gasson [Sat, 6 Feb 2010 21:42:22 +0000 (21:42 +0000)]
Only allowing setting of points when choice possible
Nick Gasson [Sat, 6 Feb 2010 21:29:45 +0000 (21:29 +0000)]
Basic setting of points
Nick Gasson [Sat, 6 Feb 2010 21:08:06 +0000 (21:08 +0000)]
Remove choice code
Nick Gasson [Sat, 6 Feb 2010 20:58:40 +0000 (20:58 +0000)]
Let track segments have multiple states
Nick Gasson [Sat, 6 Feb 2010 11:17:09 +0000 (11:17 +0000)]
Draw an arrow on points
Nick Gasson [Sat, 6 Feb 2010 09:45:44 +0000 (09:45 +0000)]
Indent another file
Nick Gasson [Fri, 5 Feb 2010 22:14:34 +0000 (22:14 +0000)]
Re-tabify more files
Nick Gasson [Fri, 5 Feb 2010 22:06:38 +0000 (22:06 +0000)]
Re-indent some files to 4-spaces
Nick Gasson [Fri, 5 Feb 2010 21:53:00 +0000 (21:53 +0000)]
Editor button for placing trees
Nick Gasson [Mon, 18 Jan 2010 08:10:34 +0000 (08:10 +0000)]
Better tree generation
Nick Gasson [Mon, 18 Jan 2010 07:42:46 +0000 (07:42 +0000)]
Render an actual L-system tree!
Nick Gasson [Sat, 16 Jan 2010 12:30:57 +0000 (12:30 +0000)]
Basic L-system generation
Nick Gasson [Sat, 16 Jan 2010 09:55:19 +0000 (09:55 +0000)]
Add stub LTree implementation
Nick Gasson [Sat, 16 Jan 2010 09:46:36 +0000 (09:46 +0000)]
Stub for LTree demo screen
Nick Gasson [Sat, 16 Jan 2010 09:41:27 +0000 (09:41 +0000)]
Remove duplicate calls to makeSDLWindow
Nick Gasson [Tue, 12 Jan 2010 08:47:07 +0000 (08:47 +0000)]
Fix some cases of flipLeader - still borked though
Nick Gasson [Tue, 12 Jan 2010 06:30:53 +0000 (06:30 +0000)]
Forgot to set sa_mask in struct sigaction
Nick Gasson [Sun, 10 Jan 2010 16:19:58 +0000 (16:19 +0000)]
Add some debugging for reversing on points issue
Nick Gasson [Sun, 10 Jan 2010 15:36:53 +0000 (15:36 +0000)]
Handle SIGINTs
Nick Gasson [Sun, 10 Jan 2010 15:12:00 +0000 (15:12 +0000)]
Detect stopping at stations