Commit Graph

162 Commits (master)

Author SHA1 Message Date
Karl F 9e44b09314 Happy new year!
HAPPY MERRY 2021!
2021-01-03 19:40:16 +01:00
Arda 46fa4231b2
Improved station traffic control communications (#4987)
* Station comms on launch request
* Ground stations provide local grav and atmo press info on landing request
* Warn about traffic on station approach
* Modular station approach messages
* Show local gravity and atmosphere on ground station lobby
* Talk to player on entering and exiting station controlled space
* Reduce lawEnforcedRange to 50km

* Refactor docking clearance API
- Expose a few SpaceStation methods to Lua
- Refactor LuaEvent to support pushing zero to three args to Lua
- Add formatters for Gravity(g) and Pressure(atm)

Co-authored-by: Webster Sheets <webster@web-eworks.com>
2020-11-12 13:03:03 -05:00
Webster Sheets 37c96041e1
Refactor Body inheritance tree to remove Object and CityOnPlanet (#4995)
* Remove CityOnPlanet from Object hierarchy

* Remove Object from the inheritance hierarchy

* Rename Object -> ObjectType
2020-11-11 19:33:04 -05:00
Webster Sheets d9e8532e0e clang-format changes 2020-08-02 17:35:09 -04:00
Webster Sheets b71787c942 Major changes to WorldView screen functions
- Body::GetTargetIndicatorPosition now returns local-space coordinates
- CameraContext has a getter for parent frame, renamed GetCamFrame to GetTempFrame, added GetCameraOrient/Position
- Implemented matrix4x4 utilities to construct from orient+pos, fast inverse transform for position vectors
- Fixed bug where mouse would be locked if held while docking
- Preliminary work on ShipViewController, made WorldView::shipView an unique_ptr (why didn't I do it that way in the first place?)
- Cleaned up some cruft from WorldView and moved to appropriate locations
- Completely changed the way WorldSpaceToScreenSpace etc. works, now no longer requires camera frame
- Added WorldView::RelSpaceToScreenSpace, meant for pigui to use for displaying e.g. body:GetPositionRelTo(player)
- WorldSpaceToScreenSpace now operates on frame-relative coordinates, use RelSpaceToScreenSpace for player-relative coordinates
2020-08-02 17:35:09 -04:00
Karl F 436db08636 Happy new decade!
May you live long and prosper!
2020-01-01 10:47:46 +01:00
mike-f1 4f1eaa41d3 Update all files to store and use FrameId instead of raw pointers 2019-11-16 17:54:14 +01:00
mike-f1 e6403fc1ad Decouple includes; Remove some unused variable; Fix an equation in Space.cpp 2019-10-20 11:19:45 +02:00
mike-f1 42c37fab84 Delete default ctor for SpaceStation and Projectile, use a ctor for load 2019-02-03 20:43:52 +01:00
mike-f1 e804893c12 Clean includes of SpaceStation, HyperspaceCloudm, Planet, NavLights, HudTrail and CityOnPlanet 2019-01-22 20:11:26 +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
Webster Sheets 3a3a13edec Update pioneer to use the new save system. 2018-10-11 11:45:57 -04: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
John Bartholomew 7c3a13a0c0 Remove almost all includes of Serializer.h, include GameSaveError.h where necessary. 2017-12-26 13:02:26 +00:00
Peter 54196f07ad Add :space_station_type to CustomSystemBody
You can now use :space_station_type("new_ground") etc. to specify
the exact type of station model to use. The name is the json filename
without the extension.
2017-04-27 12:48:50 +02:00
mike-f1 585432975f Slowly position ship to landing tag when landing on planetary bases. 2017-02-24 15:33:23 +01:00
mike-f1 8aa2cc8a28 Collision with docking surface entirely moved on SpaceStation 2017-02-06 23:57:44 +01:00
mike-f1 64443ab6bc Slowly position ship to landing tag when landing on planetary bases. #3901 2017-01-27 18:58:08 +01:00
Andrew Copland 74d50958fe MERRY HAPPY 2017 2017-01-04 15:11:15 +00:00
Peter 1e1221ec35 add "override" to silence warnings in clang 2016-10-07 00:03:41 +02:00
Andrew Copland fea5ac26b2 MERRY HAPPY 2016 2016-01-29 11:31:54 +00:00
Karl F ad4aa02c7f Merge branch 'lawAndOrder_to_lua', #3254 2015-11-02 10:21:24 +01:00
Andrew Copland d5abb5f5cf Remove unused member. 2015-10-11 18:44:22 +01:00
Karl F 8de6c68ff1 remove SpaceStation::DoLawAndOrder
To be implemented in Lua instead
2015-08-13 17:22:42 +02:00
nick-the-ninja 724eb89d47 Removing old serialisation code in body classes, Game and Space. Added JSON serialisation code to classes Player and Space. Pioneer would not have saved and loaded correctly without it. 2015-02-17 22:54:23 +00:00
nick-the-ninja d7b73e5992 Added JSON serialisation code for DynamicBody and SpaceStation. 2015-02-16 23:47:01 +00:00
Robert Norris 9f95339a9d MERRY HAPPY 2014-12-31 23:05:37 +11:00
Andrew Copland 81a5fa45a8 Update the SpaceStationType code to use the JSON definition files.
Refactor into class with private members at same time.
2014-11-20 19:26:57 +00:00
Andrew Copland 4f9b820f5c Remove the BayGroup naming convention. Attempt to make things Ports, PortPaths or Bays to reduce confusion. 2014-09-06 15:05:57 +01:00
Andrew Copland 7238cb3759 Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into better_docking 2014-07-27 21:31:37 +01:00
John Bartholomew d672cfe09f remove various unused methods and variables 2014-07-20 15:28:12 +01:00
Andrew Copland ae0601369a Better docking initial commit.
Uses single point for the pad location, an offset called "pad_offset" set in the lua, and a single entrance locator.
All other points required for docking and launching are generated from these.
2014-07-20 15:19:18 +01:00
Robert Norris 0c3f3ea39a slight include cleanup 2014-01-27 08:28:45 +11:00
Robert Norris e612b53aef set model labels on stations and cargo. #2680 2014-01-26 21:29:29 +11:00
Robert Norris 6dc4283eb6 happy new year 2014-01-02 14:43:38 +11:00
Robert Norris 7f453624e6 remove MarketAgent, Lua can do it all now 2013-12-21 16:27:54 +11:00
Robert Norris 110a231f11 remove C++ station UI 2013-12-21 16:27:54 +11:00
Andrew Copland 7c29ce9686 GetFreeDockingPort must have a ship passed in, assets if it doesn't.
SwapDockedShipsPort gets the ship from the oldPort parameter, must also be valid.
2013-11-18 18:55:41 +00:00
Andrew Copland e3c07c6da7 Update the docking to fix a bug spawning of ships in docking bays they don't fit inside. 2013-11-08 22:45:38 +00:00
John Bartholomew 6b6b9c643b replace all instances of Scoped{Ptr,Array} with unique_ptr
Includes a few very minor use cleanups too:

- *foo.Get() is simpler as just *foo
- foo.Get()[idx] is simpler as just foo[idx]
- NULL -> nullptr
- Valid() doesn't have a direct counterpart in unique_ptr; just
  use the pointer in a bool context (it has an explicit conversion
  to bool)
2013-10-30 20:43:27 +00:00
Robert Norris c68c64317c remove RefList, its unused 2013-05-09 07:35:49 +10:00
Robert Norris 85e2dc10a6 replace NULL with plain old 0 as the C++ gods intended 2013-05-09 07:35:48 +10:00
John Bartholomew 6d97a83ef9 fix gcc warnings: -Wreorder, -Wnarrowing and -Wparentheses
-Wreorder in SpaceStation::shipDocking_t
-Wnarrowing in Camera shadow setup code
-Wparentheses in SectorView system leg drawing logic
2013-04-12 11:34:57 +01:00
kko b16cb2e6ab Fix VS2010 build & uninitialized values 2013-03-31 09:31:23 -04:00
Martin Bays ad1571c66f Merge branch 'master' into eclipse
Conflicts:
	src/SpaceStation.h
2013-03-30 12:22:53 -04:00
Andrew Copland 46f5e931c4 After some discussion and review:
ModelViewer.cpp - change some scope/indentation and iterator usage/location.
ShipAICmd - fixed up a speeling mistook ;)
SpaceStation.h - Added a clearer description as to the reason for the limit on the number of docking bays.
2013-03-29 14:38:48 +00:00
Martin Bays 4c0c5cede5 incorporate SpaceStation atmosphere lighting in ModelBody 2013-03-17 03:22:20 -04:00
Andrew Copland 8fd6a02c9f Conflict city, think it's all resolved now. 2013-02-26 10:39:36 +00:00
Andrew Copland 2c8034f647 Merge branch 'master' of github.com:fluffyfreak/pioneer into new4BaySpaceStation
Conflicts:
	data/models/stations/hoop_spacestation/hoop_spacestation.model
	data/stations/hoop.lua
	src/SpaceStation.cpp
	src/SpaceStation.h
2013-02-26 08:55:07 +00:00