Commit Graph

19 Commits (master)

Author SHA1 Message Date
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 ec410f31d8 Update includes to point to new lua/ directory 2020-01-20 18:13:45 -05: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 75956b9fd0 Decouple includes of Sfx.* and trade dependency from Ship with dependency from ModelBody
Forward declare Space in Ship.h; Make things compiling again

Decouple WorldView.h; Some other decouple here and there

Decouple Renderer no more included in RenderState; Model not including directly its childs
2019-05-21 17:50:50 +02:00
mike-f1 ae1e52d1ab Remove LoadFromJson in Body, instead use dedicated ctor; modify related children classes; remove some include here and there 2019-02-03 20:46:19 +01:00
mike-f1 7a77bcb47d Close default ctor for Beam and use a ctor on load 2019-02-03 20:45:45 +01:00
mike-f1 722205d1ea Decouple some other include 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
Andrew Copland 4be499f98f Fix the unused variable warnings caused by (Json::type_error &e) 2018-10-17 21:38:23 +01:00
Webster Sheets 3a3a13edec Update pioneer to use the new save system. 2018-10-11 11:45:57 -04:00
Andrew Copland f5c103b4cd Avoid storing zero vectors and identity Quaternions 2018-09-25 12:22:54 +01:00
John Bartholomew 67dcbcecf6 Move JsonUtils.h/cpp from contrib/json/ to src/
These files aren't part of the jsoncpp library and are custom for Pioneer.
They also directly include various other Pioneer source files.
2018-08-26 09:55:14 +01:00
Andrew Copland 064c80d800 Removing dead commented out code 2018-08-18 20:17:15 +02:00
Andrew Copland caf813754c Better rendering of the beam, fixup the textures used etc 2018-08-18 20:17:15 +02:00
Andrew Copland 49abfa4f9b Give the beam a brief lifetime, but disable any collision testing to avoid repeat impacts 2018-08-18 20:17:15 +02:00
Andrew Copland de93d1babd Fixup the Beam so it hits a target, with thanks to JohnJ 2018-08-18 20:17:15 +02:00
Andrew Copland d628655784 Updating to work with latest code changes 2018-08-18 20:17:15 +02:00
Andrew Copland 3f7e231d76 New Beam weapons class. 2018-08-18 20:17:15 +02:00