Commit Graph

121 Commits (15af1051be4279a5a8532c2e5e4005f7a31a79f1)

Author SHA1 Message Date
Andrew Copland 6a4781c933 Add initial JSON project and files to VS2012 and VS2013Express.
Also copy the makefiles that RobN did so it might even work on Linux!
2013-08-27 21:31:41 +01:00
Robert Norris bdab7ef083 add Rémi Boutemy (RStorm78) to AUTHORS 2013-07-29 07:14:54 +10:00
kko 511b8b9493 Enforce end-of-line normalization via gitattributes 2013-07-10 18:04:49 -04:00
kko 463fc6d2c7 New ship "Pumpkinseed"
Stats may need some tweaking, as always.
2013-07-01 08:42:12 -04:00
John Bartholomew 06b3bb9437 list PicoDDS/GTL in the third-party software section of AUTHORS.txt 2013-06-01 14:08:42 +01:00
Robert Norris 97737e88a8 jobswarm never actually made it 2013-05-06 23:20:51 +10:00
Andrew Copland 2d4a0e677e Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into JustLookingAgain 2013-05-04 16:00:08 +01:00
Robert Norris 77dcc53251 build system changes to support new release versioning 2013-05-04 10:25:30 +10:00
John Bartholomew bf21cb3927 Merge remote-tracking branch 'valin/pgimeno' 2013-05-02 14:36:56 +01:00
Andrew Copland 8483c8d4b6 Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into JustLookingAgain 2013-04-26 09:01:14 +01:00
John Bartholomew 82519c500a add Oleg Ovcharenko (UncleVasya) to the AUTHORS list 2013-04-25 12:34:12 +01:00
Robert Norris 93c19dfeb1 Merge branch 'master' into threaded-terrain 2013-04-22 07:45:37 +10:00
kko d90b2d6840 Add DerpyHooves to AUTHORS 2013-04-18 18:45:55 -04:00
Robert Norris e9b990316c jobswarm credit 2013-04-18 16:50:35 +10:00
Robert Norris ef3fa383dc version bumps for 33 freeze 2013-04-05 20:31:13 +11:00
John Bartholomew 8a3bc4fd35 Merge remote-tracking branch 'valin/czech_lang' 2013-03-05 15:19:33 +00:00
Robert Norris 475400f897 remove WorldFont 2013-03-03 11:07:33 +11:00
Robert Norris 55490eeedb what is a "Lua model script"? 2013-03-03 11:01:06 +11:00
Robert Norris 72b35d7c12 added Florian Schmidt (tramsch) 2013-03-03 09:32:15 +11:00
Robert Norris 6e9561eaf7 version bumps for 32 freeze 2013-03-01 22:52:35 +11:00
Robert Norris 119c024c42 Merge remote-tracking branch 'zordey/master' 2013-03-01 22:44:05 +11:00
Robert Norris 7f1ccf1c8a Merge remote-tracking branch 'abramhindle/master' 2013-02-28 18:30:41 +11:00
shadmar faefc1938c Added Solcommand to AUTHORS for Kanara 2013-02-14 17:05:21 +11:00
Robert Norris cb38211bb0 add Connor Findlay (Chronothan) 2013-02-13 10:09:02 +11:00
Robert Norris f8d3be40d1 add Robert Pallier (ImTheFish) 2013-02-03 10:11:19 +11:00
Robert Norris d861b2bdaf version bumps for alpha 31 freeze 2013-02-01 21:32:58 +11:00
Robert Norris 757dd9d0d1 Merge remote-tracking branch 'jmf/master' 2013-01-27 08:54:49 +11:00
Robert Norris ebb753ccdf doc version bumps for 30 2013-01-11 13:08:14 +11:00
Robert Norris f7758217ed Merge remote-tracking branch 'johnbartholomew/cyrillic-support-2' 2013-01-04 22:33:12 +11:00
John Bartholomew e842323853 add DejaVu Sans and Sans-Mono 2013-01-04 01:46:32 +00:00
John Bartholomew f2ab7a540e Merge remote-tracking branch 'bitplane/gui-fixes' 2013-01-02 21:40:04 +00:00
Robert Norris 91b8586653 happy new year 2013-01-01 12:36:52 +11:00
Brian Ronald 5ad8f54ae3 Merge remote-tracking branch 'karakalo/show-distances-in-adverts'
Added Chip Richards to AUTHORS.txt - welcome, caracal!
2012-12-30 14:07:14 +00:00
Robert Norris 7fc203dfc6 Merge branch 'debian-packaging' 2012-12-29 08:36:17 +11:00
John Bartholomew 7bcca28f06 Merge branch 'shadmar-fix_particles_always_use_blend_alpha_one' 2012-12-28 15:39:31 +00:00
Robert Norris 553deab945 add assimp to the credits 2012-12-12 18:29:54 +11:00
Robert Norris b485a909fe doc version bumps 2012-12-07 20:20:25 +11:00
John Bartholomew 979bb5c438 Merge branch 'misc_fixes' 2012-12-04 11:15:33 +00:00
Robert Norris a9497a8744 Merge branch 'new-ui-icons' 2012-12-03 07:34:56 +11:00
Robert Norris a8440d767d link back to icon set homepage 2012-12-01 22:20:31 +11:00
John Bartholomew ada5b46bf0 Merge remote-tracking branch 'twelvebaud/master' 2012-11-21 02:48:18 +00:00
Robert Norris 27fa77991e import wpzoom icon set 2012-11-18 20:16:01 +11:00
Robert Norris f8d4eea2c6 version bumps for 28 freeze 2012-11-02 14:40:51 +11:00
Robert Norris b3ab98b21d rename font to Orbiteer 2012-11-02 14:27:37 +11:00
John Bartholomew afdeb21838 add skapusniak to the AUTHORS list 2012-10-22 19:08:52 +01:00
Robert Norris f6372cccc0 Merge branch 'master' into new-ui 2012-10-17 09:33:56 +11:00
John Bartholomew ad48a255f5 Merge branch 'fix-1581' 2012-10-15 18:47:16 +01:00
Robert Norris 37fe0663f8 Merge branch 'master' into new-ui 2012-10-08 07:28:12 +11:00
Robert Norris 3c90541311 version bumps for 27 freeze 2012-10-05 16:51:15 +10:00
Robert Norris b03afafd13 license for Orbitron font 2012-09-28 08:16:50 +10:00