]> git.nickg.me.uk Git - traingame.git/log
traingame.git
13 years agoUse GLOB_RECURSE to find files for CMake lua
Nick Gasson [Sat, 19 Jun 2010 15:14:53 +0000 (16:14 +0100)]
Use GLOB_RECURSE to find files for CMake

13 years agoAdd SWIG support to build system
Nick Gasson [Sat, 19 Jun 2010 15:08:47 +0000 (16:08 +0100)]
Add SWIG support to build system

13 years agoPrint Lua stack trace on error
Nick Gasson [Tue, 8 Jun 2010 21:18:38 +0000 (22:18 +0100)]
Print Lua stack trace on error

13 years agoLoad safe Lua libraries at startup
Nick Gasson [Tue, 8 Jun 2010 20:48:52 +0000 (21:48 +0100)]
Load safe Lua libraries at startup

13 years agoAdd Lua startup script
Nick Gasson [Tue, 8 Jun 2010 20:46:26 +0000 (21:46 +0100)]
Add Lua startup script

13 years agoAdd Lua event hooks
Nick Gasson [Tue, 8 Jun 2010 20:44:25 +0000 (21:44 +0100)]
Add Lua event hooks

13 years agoMerge branch 'master' into lua
Nick Gasson [Tue, 8 Jun 2010 18:35:43 +0000 (19:35 +0100)]
Merge branch 'master' into lua

Conflicts:
CMakeLists.txt

13 years agoChange version number to 0.3.0-dev
Nick Gasson [Tue, 8 Jun 2010 18:34:56 +0000 (19:34 +0100)]
Change version number to 0.3.0-dev

13 years agoUse built-in FindFreetype module from CMake 2.8
Nick Gasson [Tue, 8 Jun 2010 18:31:05 +0000 (19:31 +0100)]
Use built-in FindFreetype module from CMake 2.8

13 years agoFlesh out Lua UI demo a little bit
Nick Gasson [Tue, 8 Jun 2010 18:21:22 +0000 (19:21 +0100)]
Flesh out Lua UI demo a little bit

13 years agoRe-enable UI demo mode and add Lua script
Nick Gasson [Sun, 6 Jun 2010 18:04:08 +0000 (19:04 +0100)]
Re-enable UI demo mode and add Lua script

13 years agoLoad Lua script when playing game
Nick Gasson [Sun, 6 Jun 2010 18:01:36 +0000 (19:01 +0100)]
Load Lua script when playing game

13 years agoLua log and debug functions
Nick Gasson [Sun, 6 Jun 2010 17:25:55 +0000 (18:25 +0100)]
Lua log and debug functions

13 years agoStart adding Lua VM inside game
Nick Gasson [Sun, 6 Jun 2010 17:14:48 +0000 (18:14 +0100)]
Start adding Lua VM inside game

13 years agoBump version to 0.2.1 r0.2.1
Nick Gasson [Sun, 6 Jun 2010 13:48:00 +0000 (14:48 +0100)]
Bump version to 0.2.1

13 years agoGracefully handle crashes when writing files
Nick Gasson [Sun, 6 Jun 2010 12:34:49 +0000 (13:34 +0100)]
Gracefully handle crashes when writing files

Don't clobber maps until finished

13 years agoFix crash when saving map
Nick Gasson [Sun, 6 Jun 2010 12:14:00 +0000 (13:14 +0100)]
Fix crash when saving map

13 years agoFix editor rendering when multi-sector track placed
Nick Gasson [Sun, 6 Jun 2010 12:12:35 +0000 (13:12 +0100)]
Fix editor rendering when multi-sector track placed

13 years agoTweak demo map to remove artifact
Nick Gasson [Sun, 6 Jun 2010 12:10:58 +0000 (13:10 +0100)]
Tweak demo map to remove artifact

13 years agoUpdate QuadTree copyright
Nick Gasson [Sun, 6 Jun 2010 12:07:24 +0000 (13:07 +0100)]
Update QuadTree copyright

13 years agoFix render of track overlays
Nick Gasson [Sun, 6 Jun 2010 12:06:04 +0000 (13:06 +0100)]
Fix render of track overlays

13 years agoRe-indent Frustum.cpp
Nick Gasson [Sun, 6 Jun 2010 11:48:42 +0000 (12:48 +0100)]
Re-indent Frustum.cpp

13 years agoMerge branch 'static_track'
Nick Gasson [Sun, 6 Jun 2010 11:36:33 +0000 (12:36 +0100)]
Merge branch 'static_track'

13 years agoRemove some pointless regeneration of meshes
Nick Gasson [Sun, 6 Jun 2010 11:35:57 +0000 (12:35 +0100)]
Remove some pointless regeneration of meshes

13 years agoFix adding track and scenery in the editor
Nick Gasson [Sun, 6 Jun 2010 11:16:45 +0000 (12:16 +0100)]
Fix adding track and scenery in the editor

13 years agoOnly render sea beneath sectors where it will be visible
Nick Gasson [Sun, 6 Jun 2010 11:08:55 +0000 (12:08 +0100)]
Only render sea beneath sectors where it will be visible

13 years agoFix rendering of track which spans multiple sectors
Nick Gasson [Sun, 6 Jun 2010 10:57:25 +0000 (11:57 +0100)]
Fix rendering of track which spans multiple sectors

13 years agoRemove debugging lines
Nick Gasson [Sun, 6 Jun 2010 10:55:04 +0000 (11:55 +0100)]
Remove debugging lines

13 years agoMove clipping code into a separate class
Nick Gasson [Sun, 6 Jun 2010 10:54:14 +0000 (11:54 +0100)]
Move clipping code into a separate class

13 years agoBasic clipping of each rendered sector
Nick Gasson [Sun, 6 Jun 2010 10:41:40 +0000 (11:41 +0100)]
Basic clipping of each rendered sector

13 years agoAdd method to find quad tree leaf size
Nick Gasson [Sun, 6 Jun 2010 10:10:23 +0000 (11:10 +0100)]
Add method to find quad tree leaf size

13 years agoRemove scenery rending from Map::renderSector
Nick Gasson [Sun, 6 Jun 2010 10:10:09 +0000 (11:10 +0100)]
Remove scenery rending from Map::renderSector

13 years agoTidy up TrackCommon.cpp
Nick Gasson [Sat, 5 Jun 2010 11:55:27 +0000 (12:55 +0100)]
Tidy up TrackCommon.cpp

13 years agoRender S-bends as static meshes
Nick Gasson [Sat, 5 Jun 2010 11:39:47 +0000 (12:39 +0100)]
Render S-bends as static meshes

13 years agoGenerate curved track in static mesh
Nick Gasson [Sat, 5 Jun 2010 11:31:03 +0000 (12:31 +0100)]
Generate curved track in static mesh

13 years agoRemove delay between frames
Nick Gasson [Sat, 5 Jun 2010 08:28:05 +0000 (09:28 +0100)]
Remove delay between frames

13 years agoMerge branch 'master' of ssh://vds/home/nick/git/traingame
Nick Gasson [Mon, 31 May 2010 19:27:57 +0000 (20:27 +0100)]
Merge branch 'master' of ssh://vds/home/nick/git/traingame

13 years agoFix invalid vertex sharing with different colours
Nick Gasson [Mon, 31 May 2010 07:31:45 +0000 (08:31 +0100)]
Fix invalid vertex sharing with different colours

13 years agoUpdate SlopeTrack for the new track rendering system
Nick Gasson [Sun, 30 May 2010 21:49:29 +0000 (22:49 +0100)]
Update SlopeTrack for the new track rendering system

13 years agoRemove some of the old explicit track rendering code
Nick Gasson [Sun, 30 May 2010 21:33:00 +0000 (22:33 +0100)]
Remove some of the old explicit track rendering code

13 years agoNew static-mesh rendering for points
Nick Gasson [Sun, 30 May 2010 21:30:48 +0000 (22:30 +0100)]
New static-mesh rendering for points

13 years agoStart making track part of the static scenery
Nick Gasson [Sun, 30 May 2010 19:12:27 +0000 (20:12 +0100)]
Start making track part of the static scenery

13 years agoSupport rotating objects when mesh buffers are merged
Nick Gasson [Sun, 30 May 2010 16:37:35 +0000 (17:37 +0100)]
Support rotating objects when mesh buffers are merged

13 years agoMerge scenery into map quad mesh buffers
Nick Gasson [Sun, 30 May 2010 13:02:35 +0000 (14:02 +0100)]
Merge scenery into map quad mesh buffers

13 years agoDelay compiling mesh buffers until first use
Nick Gasson [Sun, 30 May 2010 11:19:22 +0000 (12:19 +0100)]
Delay compiling mesh buffers until first use

13 years agoRegenerate house2 model with hard edges
Nick Gasson [Sun, 30 May 2010 11:17:54 +0000 (12:17 +0100)]
Regenerate house2 model with hard edges

13 years agoLoad models into a single mesh
Nick Gasson [Sun, 30 May 2010 11:08:43 +0000 (12:08 +0100)]
Load models into a single mesh

13 years agoUse VBO colours rather than materials
Nick Gasson [Sun, 30 May 2010 11:04:07 +0000 (12:04 +0100)]
Use VBO colours rather than materials

13 years agoTweak threshold for merging mesh vertices
Nick Gasson [Wed, 19 May 2010 18:14:49 +0000 (19:14 +0100)]
Tweak threshold for merging mesh vertices

13 years agoDisplay triangle count in window title
Nick Gasson [Wed, 19 May 2010 07:48:25 +0000 (08:48 +0100)]
Display triangle count in window title

13 years agoRemove redundant calls to glEnable
Nick Gasson [Tue, 18 May 2010 21:18:45 +0000 (22:18 +0100)]
Remove redundant calls to glEnable

13 years agoTweak fog start distance
Nick Gasson [Tue, 18 May 2010 21:18:20 +0000 (22:18 +0100)]
Tweak fog start distance

13 years agoAlways use VBOs when available
Nick Gasson [Tue, 18 May 2010 20:30:21 +0000 (21:30 +0100)]
Always use VBOs when available

14 years agoMinor tweaks to buildings r0.2.0
Nick Gasson [Sun, 18 Apr 2010 15:22:21 +0000 (16:22 +0100)]
Minor tweaks to buildings

14 years agoAllow scaling buildings
Nick Gasson [Sun, 18 Apr 2010 15:16:56 +0000 (16:16 +0100)]
Allow scaling buildings

14 years agoNew demo map
Nick Gasson [Sun, 18 Apr 2010 15:10:01 +0000 (16:10 +0100)]
New demo map

14 years agoAdd GCC 4.5 STL profiling option
Nick Gasson [Sun, 18 Apr 2010 14:46:27 +0000 (15:46 +0100)]
Add GCC 4.5 STL profiling option

14 years agoAdd demo map
Nick Gasson [Sun, 28 Mar 2010 12:29:54 +0000 (13:29 +0100)]
Add demo map

14 years agoAlways transform to correct height on points
Nick Gasson [Sun, 28 Mar 2010 12:25:51 +0000 (13:25 +0100)]
Always transform to correct height on points

14 years agoHide station window for the time being
Nick Gasson [Sun, 28 Mar 2010 12:25:14 +0000 (13:25 +0100)]
Hide station window for the time being

14 years agoAdjust fog for large view distances
Nick Gasson [Sun, 28 Mar 2010 12:17:56 +0000 (13:17 +0100)]
Adjust fog for large view distances

14 years agoFix rendering of crossover track
Nick Gasson [Sun, 28 Mar 2010 11:47:07 +0000 (12:47 +0100)]
Fix rendering of crossover track

14 years agoMake fog stretch for far clip plane
Nick Gasson [Sun, 28 Mar 2010 11:33:46 +0000 (12:33 +0100)]
Make fog stretch for far clip plane

14 years agoBump version
Nick Gasson [Sun, 28 Mar 2010 11:12:34 +0000 (12:12 +0100)]
Bump version

14 years agoRemove debug messages
Nick Gasson [Sun, 28 Mar 2010 11:04:19 +0000 (12:04 +0100)]
Remove debug messages

14 years agoRemove follow queue code
Nick Gasson [Sun, 28 Mar 2010 11:02:13 +0000 (12:02 +0100)]
Remove follow queue code

14 years agoMake trucks pull the train down hill
Nick Gasson [Sun, 28 Mar 2010 10:57:53 +0000 (11:57 +0100)]
Make trucks pull the train down hill

14 years agoFix braking and stopping (again)
Nick Gasson [Sun, 28 Mar 2010 10:13:24 +0000 (11:13 +0100)]
Fix braking and stopping (again)

14 years agoFix resistance equation
Nick Gasson [Sun, 28 Mar 2010 10:02:24 +0000 (11:02 +0100)]
Fix resistance equation

14 years agoCache meshes for S-bends
Nick Gasson [Sun, 28 Mar 2010 09:55:41 +0000 (10:55 +0100)]
Cache meshes for S-bends

14 years agoOnly do track transforms in one place
Nick Gasson [Sun, 28 Mar 2010 08:48:47 +0000 (09:48 +0100)]
Only do track transforms in one place

14 years agoRender curved rails within tile bounds
Nick Gasson [Sun, 28 Mar 2010 08:39:15 +0000 (09:39 +0100)]
Render curved rails within tile bounds

14 years agoCorrect placement of S-bend sleepers
Nick Gasson [Sun, 28 Mar 2010 08:23:07 +0000 (09:23 +0100)]
Correct placement of S-bend sleepers

14 years agoCompute offsets of Bezier curves to keep rails at constant separation
Nick Gasson [Sat, 27 Mar 2010 22:29:54 +0000 (22:29 +0000)]
Compute offsets of Bezier curves to keep rails at constant separation

14 years agoRender sleepers in S-bend track
Nick Gasson [Sat, 27 Mar 2010 21:36:00 +0000 (21:36 +0000)]
Render sleepers in S-bend track

14 years agoCompute tiles covered by S-bends
Nick Gasson [Sat, 27 Mar 2010 21:11:05 +0000 (21:11 +0000)]
Compute tiles covered by S-bends

14 years agoAdd transform function for S-bends
Nick Gasson [Sat, 27 Mar 2010 20:35:45 +0000 (20:35 +0000)]
Add transform function for S-bends

14 years agoSave and load S-bends
Nick Gasson [Sat, 27 Mar 2010 17:45:26 +0000 (17:45 +0000)]
Save and load S-bends

14 years agoCorrect rendering of S-bends
Nick Gasson [Sat, 27 Mar 2010 17:15:23 +0000 (17:15 +0000)]
Correct rendering of S-bends

14 years agoBasic rendering of S-bends
Nick Gasson [Sun, 21 Mar 2010 21:04:39 +0000 (21:04 +0000)]
Basic rendering of S-bends

14 years agoGet the editor to generate S-bends
Nick Gasson [Sun, 21 Mar 2010 19:47:43 +0000 (19:47 +0000)]
Get the editor to generate S-bends

14 years agoAdd stub class for S-bend track
Nick Gasson [Sun, 21 Mar 2010 18:16:59 +0000 (18:16 +0000)]
Add stub class for S-bend track

14 years agoOptimise calls to Font::text_width
Nick Gasson [Sun, 21 Mar 2010 12:55:54 +0000 (12:55 +0000)]
Optimise calls to Font::text_width

14 years agoRemove the `resetMarks` function to improve performance
Nick Gasson [Sun, 21 Mar 2010 12:36:46 +0000 (12:36 +0000)]
Remove the `resetMarks` function to improve performance

14 years agoAdd a hill to the goods demo map
Nick Gasson [Sun, 21 Mar 2010 12:02:19 +0000 (12:02 +0000)]
Add a hill to the goods demo map

14 years agoAllow erasing stations
Nick Gasson [Sun, 21 Mar 2010 11:55:43 +0000 (11:55 +0000)]
Allow erasing stations

14 years agoAdd `reverse' status label
Nick Gasson [Sun, 21 Mar 2010 11:54:01 +0000 (11:54 +0000)]
Add `reverse' status label

14 years agoFix stopping at stations
Nick Gasson [Sun, 21 Mar 2010 11:48:28 +0000 (11:48 +0000)]
Fix stopping at stations

14 years agoDisplay speed as an absolute value
Nick Gasson [Sun, 21 Mar 2010 10:48:53 +0000 (10:48 +0000)]
Display speed as an absolute value

14 years agoMake trees a bit smaller
Nick Gasson [Sun, 21 Mar 2010 09:38:35 +0000 (09:38 +0000)]
Make trees a bit smaller

14 years agoSeperate trucks a bit
Nick Gasson [Sat, 20 Mar 2010 18:12:17 +0000 (18:12 +0000)]
Seperate trucks a bit

14 years agoFix bug in SlopeTrack gradient calculation
Nick Gasson [Sat, 20 Mar 2010 17:49:31 +0000 (17:49 +0000)]
Fix bug in SlopeTrack gradient calculation

14 years agoFix gradient calculations
Nick Gasson [Sat, 20 Mar 2010 17:39:36 +0000 (17:39 +0000)]
Fix gradient calculations

14 years agoTweak the lighting model a tiny bit
Nick Gasson [Sat, 20 Mar 2010 16:20:53 +0000 (16:20 +0000)]
Tweak the lighting model a tiny bit

14 years agoAdd smoothing tool
Nick Gasson [Sat, 20 Mar 2010 16:18:11 +0000 (16:18 +0000)]
Add smoothing tool

14 years agoMake IRollingStock::length return a float
Nick Gasson [Tue, 16 Mar 2010 08:31:05 +0000 (08:31 +0000)]
Make IRollingStock::length return a float

14 years agoTidy up some float/double conversion warnings
Nick Gasson [Tue, 16 Mar 2010 08:21:15 +0000 (08:21 +0000)]
Tidy up some float/double conversion warnings

14 years agoMerge branch 'master' of ssh://vds/home/nick/git/traingame
Nick Gasson [Tue, 16 Mar 2010 07:45:39 +0000 (07:45 +0000)]
Merge branch 'master' of ssh://vds/home/nick/git/traingame

14 years agoFix regression in Points::transform
Nick Gasson [Mon, 15 Mar 2010 21:17:26 +0000 (21:17 +0000)]
Fix regression in Points::transform

14 years agoCompute effect of gravity correctly
Nick Gasson [Sat, 6 Mar 2010 17:48:34 +0000 (17:48 +0000)]
Compute effect of gravity correctly