Commit Graph

114 Commits (master)

Author SHA1 Message Date
John Jordan d373dfbc1a Further radius sanitisation 2012-11-26 23:40:03 +00:00
John Jordan bb6687dc99 Mostly working except station-chasing 2012-11-23 04:27:38 +00:00
John Jordan 3b9b41fe06 velocity problems? 2012-11-19 05:25:00 +00:00
John Jordan a6c5e4470f Rendering mostly working at least 2012-11-18 18:13:47 +00:00
John Jordan 0a9052df9c Endpoint of zero-size rot frames attempt 2012-11-17 01:07:15 +00:00
John Jordan c6fa573cc7 Frame.cpp and Body.cpp compiling with 3x3 matrices 2012-11-13 03:03:39 +00:00
Robert Norris efbce7648a update license paths 2012-09-16 10:59:15 +10:00
Robert Norris e9f4448bba add copyright notices to all the code 2012-09-16 09:45:04 +10:00
Robert Norris 367985d8cf build out now LuaEvent interface and fix various bugs to get things working 2012-08-30 10:33:54 +10:00
Robert Norris 1ea2f7f4db remove Lua event queue wrapper objects. now that they're identified by string this can be much simpler 2012-08-29 08:30:50 +10:00
John Bartholomew 151cdc20b4 remove trailing whitespace from all files under src/ 2012-07-04 20:13:48 +01:00
John Bartholomew b9691213aa change Frame::GetLabel to return a const std::string& 2012-04-01 18:31:16 +01:00
kko be77f6954f Merge remote-tracking branch 'origin/master' into renderer
Conflicts:
	src/SectorView.cpp
	src/SectorView.h
	src/WorldView.cpp
2012-02-02 08:39:36 -05:00
Taiki Kim 2407f7871b New camera mode: 'Sidereal View' 2012-01-26 12:00:45 -08:00
kko bc9ae3fcab Remove Body::m_renderer and keep passing Renderer around 2012-01-19 11:13:06 -05:00
kko e040341af5 Pass renderer to bodies 2012-01-19 11:04:23 -05:00
kko 17aba9e7e8 Draw planet rings with DrawTriangleStrip 2012-01-18 12:47:59 -05:00
kko dc6242c248 Position target indicator on docking port, if permission has been granted. 2011-12-02 11:10:21 -05:00
Robert Norris 252d1e9fd3 rename SpaceManager to Game, for I have discovered the long-sought-after Game object. this fills me with wonder and fear 2011-11-19 21:44:33 +11:00
Robert Norris a8818c376c pass the space to the serializer/save methods for consistency with load. in reality we want less of this, not more 2011-11-18 16:41:00 +11:00
Robert Norris 28ec40678e pass the space down to bodies so they can find their frames etc 2011-11-18 08:38:06 +11:00
Robert Norris d5411447ec swap over all the old index lookup calls 2011-11-17 19:34:50 +11:00
John Bartholomew 8808fd10c0 Merge branch 'issue-750-merge' into camera-refactor-merge
Conflicts:
	src/WorldView.cpp
	src/WorldView.h
2011-10-30 18:58:44 +00:00
John Bartholomew 167c037745 Merge branch 'master' into issue-750-merge
Conflicts:
	src/gui/GuiScreen.cpp
2011-10-30 18:52:15 +00:00
John Bartholomew baeae02cd6 Merge branch 'master' into camera-refactor-merge 2011-10-30 17:51:02 +00:00
John Bartholomew 1c67330734 Remove unused Body::m_onscreen 2011-10-30 13:03:17 +00:00
John Bartholomew 936dc2880f Add Body::Body::GetInterpolatedPositionRelTo(const Body*) const 2011-10-30 10:36:39 +00:00
Robert Norris 4aed8075bb remove body onscreen/projected state stuff 2011-10-28 17:49:50 +11:00
John Bartholomew 0b223e4a7c Clean up oddly inefficient calculation order in Body::OrientOnSurface 2011-10-28 06:50:22 +01:00
Robert Norris 92f3d655c4 allocate all the lua stuff on the heap at game start 2011-09-20 08:11:46 +10:00
Robert Norris 76b89c2495 lua frame changed event 2011-06-23 16:00:54 +10:00
Darren Salt 70944debf9 Clean up casts: convert to C++-style. 2011-05-12 20:29:02 +01:00
John Jordan 40a1a9b18a Autopilot atmosphere/collision/orbit fixes 2011-03-17 06:32:20 +00:00
Robert Norris 0f801cd08b more debug output silenced 2011-03-13 20:36:32 +11:00
John Jordan 905e9af110 Various navigation bugfixes 2011-03-07 01:14:46 +00:00
John Jordan 8eaebc20e7 Screw it, this mostly works 2011-02-28 04:46:48 +00:00
John Jordan 1f2126c2de About to violate space station frames 2011-02-27 23:31:08 +00:00
John Jordan 4e6670ab4e Autopilot mostly working at 100000x 2011-02-21 06:55:28 +00:00
Snaar 4938d0f826 Remove static Cross function from vector3. 2011-02-17 22:11:10 -05:00
tom 3cbac7e241 temporal aliasing fix: interpolate frame of reference positions for rendering (fixes planet jitter) 2011-02-14 01:02:28 +00:00
Tom 6a6b5f569d lots more timestep fix work. cities have disappeared and things start off pretty weird when docked... 2010-11-16 00:04:43 +00:00
tompox 6b779da388 autopilot space station docking. phew, that was harder than it should have been. next to chain 'fly to vicinity of' with docking
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@664 e632f14b-6550-0410-b89e-a82653faca30
2010-09-05 15:09:32 +00:00
tompox 6a7855a2eb save games in sections so it will be easier to import old savefiles in the future. this breaks compatibility with savefiles before this commit
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@641 e632f14b-6550-0410-b89e-a82653faca30
2010-08-03 10:28:18 +00:00
tompox 388cc95128 make serialize and unserialize functions use reader and writer objects (needed to serializing C objects from lua isn't such a pain -- but it is generally a better idea anyway)
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@593 e632f14b-6550-0410-b89e-a82653faca30
2010-05-22 17:26:25 +00:00
tompox 9b6d5cd6ba police when you do something bad. their AI is awful but one thing at a time
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@567 e632f14b-6550-0410-b89e-a82653faca30
2010-03-16 16:51:50 +00:00
tompox 347874217e hyperspace cloud analyzer. arrival clouds are not created yet so you can't follow ships
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@475 e632f14b-6550-0410-b89e-a82653faca30
2009-11-04 15:06:36 +00:00
tompox 4cb5b3c819 missiles. cpanel mfunc widget to fire them
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@458 e632f14b-6550-0410-b89e-a82653faca30
2009-10-29 15:45:19 +00:00
tompox c60dd53e0c faster particle sfx crap.
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@450 e632f14b-6550-0410-b89e-a82653faca30
2009-10-22 10:35:34 +00:00
tompox d037364097 replace beam lasers with projectiles (unfinished), as space combat is miserable with point and zap. reduce verbosity throughout the turd. fiddle with AI.
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@391 e632f14b-6550-0410-b89e-a82653faca30
2009-09-12 17:25:15 +00:00
tompox a19c76455f initial crappy work on autopilot flying to places. made time accel limited by proximity to stuff, but attempted to make it a non-irritating way to implement it. we shall wee
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@388 e632f14b-6550-0410-b89e-a82653faca30
2009-09-11 15:48:41 +00:00
tompox 1c70b370d0 make that last commit actually work...
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@261 e632f14b-6550-0410-b89e-a82653faca30
2009-05-03 23:27:59 +00:00
tompox 75d9ce8d40 speed relative to target. fiddle with planet draw distance. make check (tests.cpp).
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@260 e632f14b-6550-0410-b89e-a82653faca30
2009-05-03 20:38:45 +00:00
tompox bbb24f8db3 cargo page and cargo jettisoning
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@193 e632f14b-6550-0410-b89e-a82653faca30
2009-01-09 20:42:20 +00:00
tompox 519b99fb0e fiddle with vector class and touch lots of users
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@190 e632f14b-6550-0410-b89e-a82653faca30
2009-01-04 18:04:28 +00:00
tompox 3304ba0096 oops. AI stuff useful for player autopilot, so roll it into Ship.cpp
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@160 e632f14b-6550-0410-b89e-a82653faca30
2008-11-17 15:49:14 +00:00
tompox 98619ea421 start of ship AI stuff
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@159 e632f14b-6550-0410-b89e-a82653faca30
2008-11-17 01:10:16 +00:00
tompox f715f267f3 explosion effects when ships die
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@157 e632f14b-6550-0410-b89e-a82653faca30
2008-11-14 11:11:51 +00:00
tompox 91f5375e2a saving/loading game works but incomplete (ship equipment, ...)
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@131 e632f14b-6550-0410-b89e-a82653faca30
2008-09-19 02:23:48 +00:00
tompox 58253569cb a lot of savegame preliminary work
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@130 e632f14b-6550-0410-b89e-a82653faca30
2008-09-18 14:00:12 +00:00
tompox a6eeb23993 Body::OrientOnSurface for putting things on planets. fix ToggleButton. tiny start to ground-based starports.
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@116 e632f14b-6550-0410-b89e-a82653faca30
2008-08-31 12:18:53 +00:00
tompox e3d42870b1 initial rotating frames work
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@94 e632f14b-6550-0410-b89e-a82653faca30
2008-08-14 21:34:50 +00:00
pwroberts 32d333920d Added body death and associated cleanup. Call Space::KillBody() to kill a body.
Added temporary "kill target" control, bound to End key.
Separated target into nav target and combat target. Currently only nav target is used.
Fixed: Target selection occurred while firing laser.
Fixed: Space stations destroyed their ODE geoms twice.



git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@41 e632f14b-6550-0410-b89e-a82653faca30
2008-07-07 22:19:53 +00:00
pwroberts 260f9d4d3e Added targets to Ships
Added select target with mouse in main view
Added green target indicator
Increased line width of laser
Frame initialisation fix
Store on-screen position in Body



git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@28 e632f14b-6550-0410-b89e-a82653faca30
2008-06-29 21:46:11 +00:00
tompox 96342f3df7 initial import
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@1 e632f14b-6550-0410-b89e-a82653faca30
2008-06-24 10:17:31 +00:00