Commit Graph

113 Commits (master)

Author SHA1 Message Date
Karl F 9e44b09314 Happy new year!
HAPPY MERRY 2021!
2021-01-03 19:40:16 +01:00
Karl F 436db08636 Happy new decade!
May you live long and prosper!
2020-01-01 10:47:46 +01:00
Webster Sheets 7534cc2bca Move set-speed control to an axis binding, remove WorldView::ChangeFlightState. 2019-06-01 13:45:36 -04:00
Arda Güler d4bee3b034 Atmospheric flight (#4556)
* Simple atmospheric flight calculations

* Remove unnecessary normalize operation

* Replace some values

* Initial ship values

* AoA bugfix

* Final tweak, hopefully

* Rewrite lift and drag calculations, update ship values, add vec3.Lerp.

* Fix lift-AoA relation

* Rename functions

* Code comments and delete unnecessary new line

* New ship values

* Better default calculations.

* Update comments.

* Don't use Inverse()

* Fix timeaccel-torque thing
2019-04-28 14:48:20 +01:00
mike-f1 1de66bf587 Include decouple, second round 2019-02-15 21:57:17 +01:00
Webster Sheets 5cdaefad6a Run clang-format over the entire code base.
Fix hidden header-inclusion-order dependency errors.
Update .clang-format for v7.0.1.
2019-01-05 17:09:05 -05:00
Karl F d2ab921b62 Happy New Year!
Awesome sauce (for next year):
find . -type f -exec sed -i 's/2008-2018 Pioneer Developers'/'2008-2019 Pioneer Developers/g' {} \;

closes #4507
2019-01-03 15:28:42 +01:00
Garmelon 4cb9390882 Acceleration cap (#4378)
* Limit acceleration in propulsion

* Load acceleration cap from ship.json files

* Fix fuel consumption when acceleration capped

I changed this line when I tried out a different approach, and never
changed it back afterwards...

* Fix autopilot bugs

* Add some comments
2018-09-05 13:31:53 +01:00
Karl F 7225e9c723 Happy New Year!
Ten years in the making now, but how can we improve upon perfection
for ten more years?
2018-01-01 21:22:12 +01:00
Andrew Copland c3b74c1a6d Crush the ship if it can't take the pressure as, optionally, defined in the ship type. 2017-05-01 20:50:03 +01:00
mike-f1 a54eb2f0d1 Thruster color can be modified globally or per direction 2017-03-16 17:11:58 +01:00
Andrew Copland cdd057e30c Merge pull request #3906 from robothauler/roles
Choose enemy ships by role, not hull mass.
2017-02-23 14:31:16 +00:00
mike-f1 2013fae968 Make ship code modular
Closes #3914
Solves #2012
2017-02-07 17:47:46 +01:00
Armin Kretschmer 8f0604b266 Make roles available to lua 2017-01-15 08:11:47 +01:00
Andrew Copland 74d50958fe MERRY HAPPY 2017 2017-01-04 15:11:15 +00:00
Andrew Copland cbfd3e14f2 Add thruster_upgrade data to the ships json files. Use upgrades in angular thrust too. 2016-10-09 11:41:37 +01:00
Andrew Copland fea5ac26b2 MERRY HAPPY 2016 2016-01-29 11:31:54 +00:00
Robert Norris 9f95339a9d MERRY HAPPY 2014-12-31 23:05:37 +11:00
Andrew Copland 748769be2b Ok, just use pointers, remove const, please build it gcc 2014-11-22 17:03:48 +00:00
Andrew Copland 75e06d723a Fallback to the Lua definitions, this should allow ships from mods to magically work despite using the old format and generates the new JSON file to ease updating them. 2014-11-22 15:55:55 +00:00
Andrew Copland 41d41098f3 Switch to using json file loading, disable but don't remove old lua code - need to handle the transition. 2014-11-20 22:43:49 +00:00
John Bartholomew 209e8abbe8 store ship base-price as a double in C++ (to match Lua)
fixes #3129
2014-08-15 19:16:19 +01:00
John Bartholomew bb29226e43 remove unnecessary includes of EquipType.h 2014-07-20 15:28:12 +01:00
John Bartholomew f99183cd4b remove ShipType::equipSlotCapacity array 2014-07-20 15:28:12 +01:00
John Bartholomew d672cfe09f remove various unused methods and variables 2014-07-20 15:28:12 +01:00
Simon Chopin fbdc9b3543 Shiptype: store the slot informations in an map<string, int>
This allows the system to decouple ship definition from the rest of the
Lua, thus returning to the previous state and easing any future
migration of the ship definition file format.

Conflicts:
	src/LuaModelViewer.cpp
	src/Pi.cpp
	src/Ship.cpp
	src/ShipType.cpp
	src/ShipType.h
2014-06-26 15:55:56 +02:00
Simon Chopin 65d393b125 Remove shipdef.defaultHyperdrive and replace it by shipdef.hyperdriveClass
This new attribute isn't an equipment type but a simple integer
representing the class of hyperdrives. This allows us to loosen
the link between equipment and ship types.
2014-04-11 19:17:24 +02:00
Robert Norris e23fc46880 Merge remote-tracking branch 'fluffyfreak/cockpit3d' into cockpit3d 2014-01-02 19:17:25 +11:00
Robert Norris 6dc4283eb6 happy new year 2014-01-02 14:43:38 +11:00
Andrew Copland 577d37edc9 Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into cockpit3d
Conflicts:
	src/ShipType.cpp
2013-12-30 16:10:28 +00:00
Robert Norris 92f7f80995 ship classes and icons 2013-12-21 16:27:55 +11:00
Robert Norris ef27b36fb6 ship manufacturer icons 2013-12-21 16:27:53 +11:00
Andrew Copland 8865e4eccf Single commit back-port of Salwans 3D Cockpit feature from Paragon. 2013-12-14 23:12:18 +00:00
John Bartholomew c7a5effce8 move GetFuelUseRate from Ship into ShipType 2013-10-16 21:50:17 +01:00
Robert Norris dd0e24de3d make enum tables optionally public. only expose public ones to lua 2013-05-10 09:04:21 +10:00
Robert Norris e0b526cfc6 use kanara for police and combat test 2013-02-12 21:45:37 +11:00
kko 53752b773b Some lmrmodel -> model renaming 2013-02-02 11:58:19 -05:00
Robert Norris fae2675f6e add min_crew and max_crew attributes to shipdef and expose to lua via ShipType 2013-01-26 08:38:29 +11:00
John Bartholomew 9c6891a3bb remove dead thrusterFuelUse ShipType member; add comment on GetFuelUseRate 2013-01-15 19:23:48 +00:00
irigi 6c5aec94ff store effectiveExhaustVelocity instead of thrusterFuelUse internally 2013-01-15 19:17:42 +00:00
Robert Norris 91b8586653 happy new year 2013-01-01 12:36:52 +11:00
Robert Norris abc0209f95 type->id everywhere 2012-10-31 15:27:22 +11:00
Robert Norris 659c446973 make Ship.shipType return ship id instead of pretty name 2012-10-31 14:54:18 +11:00
Robert Norris 878044413c remove all alternate camera points. ships get one, where the cockpit camera used to be 2012-10-18 07:17:33 +11:00
John Bartholomew fd9296aa60 use LuaConstants for dual laser orientation and scrap default separation 2012-10-15 06:05:28 +01:00
GizmoR13 eae8b9ba35 Double laser additional options 2012-10-03 08:05:48 +01:00
John Bartholomew edaafb177e Merge branch 'new_cameras' 2012-09-23 16:38:21 +01: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
GizmoR13 4d806293a4 New cameras 2012-09-11 05:02:33 +01:00