CHANGELOG.md

@@ -2,14 +2,41 @@
 
 ## [Unreleased]
 ### Added
+- combat manuever controls for the tactical screen
+
+### Changed
+- move ops communication buttons to avoid overlapping the radar
+- synchronize the science zoom slider behavior with the mouse wheel zoom
+
+### Fixed
+- hardware blick effect, could not set on\_value
+- prevent ops communication buttons from appearing in the database view
+
+
+## [2016-06-02]
+### Added
+- example of HTTP API
+- basic log viewer using HTML and Javascript
+- combat manuevers controls for single pilot screen
+- SIL OFL for _Bebas Neue_
+- toggle GUI visibility with <kbd>H</kbd> and camera locking with <kbd>L</kbd>
+- top-down controls for zooming and panning
+- selector for picking a players ship to lock onto
+- button to copy a scenario script to clipboard
+- buttons to create an asteroid or supply drop for the game master
+- missile tube indicators for helm
+- raw scanner overlay for science probe view
 - button to the science station to open the database to the selected ship
 - icon for the HVLI
 - window title to cmake file
 - option to toggle music
 - faction communications for _Ktlitans_
 - status requests respond with missile counts
 - basic pack logging
+
 ### Changed
+- engineering ship room image #271
+- tweaks to the panel UI (see [4c96062155cd33433ff5b40a8c3fbb12b1815af1](https://github.com/daid/EmptyEpsilon/commit/4c96062155cd33433ff5b40a8c3fbb12b1815af1))
 - damage is done to a single sytem instead of 5 random systems
 - combat maneuvering is now two dimensional allowing boosting and strafing at the same time
 - improved the weapons UI when the shield frequency feature is disabled
@@ -18,7 +45,12 @@
 - database screen div distance
 - moved music to the clients
 - ship and station communication scripts
+
 ### Fixed
+- communications button on single pilot screen
+- logging on stations
+- game state log entry being converted to bool
+- _Edge of Space_ scenario was modifying the player ship incorrectly
 - small fixes to the game state logger
 - Fix system <-> shield link when there are more than 2 shields
 
@@ -40,6 +72,7 @@
 - strike craft to replace strikeship and advanaced striker
 - light transport frigate to replace the Tug
 - extra set of 3d models for use as frigates
+
 ### Changed
 - use the new ship templates in the scenarios
 - alert overlay is more minimal
@@ -56,6 +89,7 @@
 - relay can drag waypoints to change their position.
 - limit waypoints to 9
 - use pngcrush to reduce file sizes
+
 ### Fixed
 - repair things not showing up in the tutorial
 - hardware event Docking
@@ -76,6 +110,7 @@
 - commented the scenario code
 - freighters
 - clicking on no target will unselect the current target in the weapons console
+
 ### Changed
 - moved the shield frequency configuration to weapons
 - power management shows the actual and requested levels
@@ -84,8 +119,10 @@
 - improved the link-to-science feedback on relay
 - tutorial text
 - reverse missile weapon rows
+
 ### Removed
 - custom template in the PvP scenario
+
 ### Fixed
 - broadcast & station selection button
 - hacked ships communications pointing to old script in _Ghost from the Past_ scenario
@@ -101,8 +138,10 @@
 - waypoint renderingo
 - better use of forward declarations
 - different icon for missile tube that can only launch mines
+
 ### Removed
 - gui2.h *catch all* header
+
 ### Fixed
 - science cannot select targets when probe view is active
 - multiple communications to the same object at the same time
@@ -125,6 +164,7 @@
 - draw the engine/tube/beam positions in the rotating model view when debugging
 - allow the beam weapon energy and heat to be set per beam
 - missile tubes have a direction
+
 ### Changed
 - increase system power usage
 - power and coolant take time to change
@@ -139,9 +179,11 @@
 - station selection from row of buttons to a drop down
 - transparent wormhole images
 - higher resolution blackhole image
+
 ### Removed
 - custom ship templates from the _Ghost from the Past_ scenario
 - obsolete functions
+
 ### Fixed
 - crash when models are ot found
 - slight layout
@@ -174,6 +216,7 @@
 - damage/power indicator for beam info
 - engineering column icons
 - show current frequency on the beam and shield curves in engineering
+
 ### Changed
 - improve the dynamic layout of the ship selection screen for wide screens
 - improve the dynamic layout of the serer start screen using the new column auto layout
@@ -184,6 +227,7 @@
 - improve science radar positions on wide screens
 - improve the layout of engineering controls
 - system icons updated
+
 ### Fixed
 - unfocusElement which only worked for the top level element of the tree
 - possibly fixes keyboard related crashes
@@ -209,6 +253,7 @@
 - joystick controls for 3/4 player tactical screens
 - allow for direct and hex value entry
 - per station settings for which weapons they supply
+
 ### Changed
 - cursor blinks in text emptry field
 - constrain resizable dialogs to the window
@@ -228,14 +273,16 @@
 - images for regular/focused text inputs
 - updated colors
 - alpha transparency for UI elements
+
 ### Fixed
 - text centering
 - shield icon using speed icon
 - inverted pause button
 - create button visible through the cancel button on game master screen
 - clicking outside the radar circle but inside its reactangle caused callbacks
 
-[Unreleased]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.05.22...HEAD
+[Unreleased]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.06.02...HEAD
+[2016-06-02]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.05.22...EE-2016.06.02
 [2016-05-22]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.05.07...EE-2016.05.22
 [2016-05-07]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.04.30...EE-2016.05.07
 [2016-04-30]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.04.28...EE-2016.04.30

CMakeLists.txt

@@ -57,6 +57,7 @@ set(SOURCES
 	src/missileWeaponData.cpp
 	src/factionInfo.cpp
 	src/mesh.cpp
+	src/scenarioInfo.cpp
 	src/repairCrew.cpp
 	src/GMScriptCallback.cpp
 	src/tutorialGame.cpp
@@ -67,6 +68,7 @@ set(SOURCES
 	src/menus/optionsMenu.cpp
 	src/menus/shipSelectionScreen.cpp
 	src/menus/autoConnectScreen.cpp
+	src/screens/cinematicViewScreen.cpp
 	src/screens/crewStationScreen.cpp
 	src/screens/topDownScreen.cpp
 	src/screens/windowScreen.cpp
@@ -123,6 +125,8 @@ set(SOURCES
 	src/screenComponents/signalQualityIndicator.cpp
 	src/screenComponents/mainScreenControls.cpp
 	src/screenComponents/databaseView.cpp
+	src/screenComponents/shipsLogControl.cpp
+	src/screenComponents/onScreenKeyboard.cpp
 	src/gui/colorConfig.cpp
 	src/gui/mouseRenderer.cpp
 	src/gui/scriptError.cpp

EmptyEpsilon.cbp

@@ -11,7 +11,7 @@
 				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
-				<Option parameters="fullscreen=0 screen43=0 touchscreen=0 autoconnect=0 touchcalib=0 " />
+				<Option parameters="fullscreen=0 screen43=0 touchscreen=0 autoconnect=0 touchcalib=0 instance_name=DEBUG" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-DDEBUG" />
@@ -39,7 +39,7 @@
 				<Option object_output=".obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option parameters="fullscreen=0 screen43=0 touchscreen=0" />
+				<Option parameters="fullscreen=0 screen43=0 touchscreen=0 instance_name=RELEASE" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-g" />
@@ -284,6 +284,7 @@
 		<Unit filename="../SeriousProton/src/clipboard.h" />
 		<Unit filename="../SeriousProton/src/collisionable.cpp" />
 		<Unit filename="../SeriousProton/src/collisionable.h" />
+		<Unit filename="../SeriousProton/src/dtoa/dtoa_milo.h" />
 		<Unit filename="../SeriousProton/src/engine.cpp" />
 		<Unit filename="../SeriousProton/src/engine.h" />
 		<Unit filename="../SeriousProton/src/event.cpp" />
@@ -585,6 +586,8 @@
 		<Unit filename="src/preferenceManager.h" />
 		<Unit filename="src/repairCrew.cpp" />
 		<Unit filename="src/repairCrew.h" />
+		<Unit filename="src/scenarioInfo.cpp" />
+		<Unit filename="src/scenarioInfo.h" />
 		<Unit filename="src/scienceDatabase.cpp" />
 		<Unit filename="src/scienceDatabase.h" />
 		<Unit filename="src/screenComponents/aimLock.cpp" />
@@ -621,6 +624,8 @@
 		<Unit filename="src/screenComponents/missileTubeControls.h" />
 		<Unit filename="src/screenComponents/noiseOverlay.cpp" />
 		<Unit filename="src/screenComponents/noiseOverlay.h" />
+		<Unit filename="src/screenComponents/onScreenKeyboard.cpp" />
+		<Unit filename="src/screenComponents/onScreenKeyboard.h" />
 		<Unit filename="src/screenComponents/openCommsButton.cpp" />
 		<Unit filename="src/screenComponents/openCommsButton.h" />
 		<Unit filename="src/screenComponents/powerDamageIndicator.cpp" />
@@ -649,6 +654,8 @@
 		<Unit filename="src/screenComponents/shipDestroyedPopup.h" />
 		<Unit filename="src/screenComponents/shipInternalView.cpp" />
 		<Unit filename="src/screenComponents/shipInternalView.h" />
+		<Unit filename="src/screenComponents/shipsLogControl.cpp" />
+		<Unit filename="src/screenComponents/shipsLogControl.h" />
 		<Unit filename="src/screenComponents/signalQualityIndicator.cpp" />
 		<Unit filename="src/screenComponents/signalQualityIndicator.h" />
 		<Unit filename="src/screenComponents/snapSlider.cpp" />
@@ -659,6 +666,8 @@
 		<Unit filename="src/screenComponents/viewport3d.h" />
 		<Unit filename="src/screenComponents/warpControls.cpp" />
 		<Unit filename="src/screenComponents/warpControls.h" />
+		<Unit filename="src/screens/cinematicViewScreen.cpp" />
+		<Unit filename="src/screens/cinematicViewScreen.h" />
 		<Unit filename="src/screens/crew1/singlePilotScreen.cpp" />
 		<Unit filename="src/screens/crew1/singlePilotScreen.h" />
 		<Unit filename="src/screens/crew4/engineeringAdvancedScreen.cpp" />

README.md

@@ -1,31 +1,40 @@
-EmptyEpsilon
-============
+![EmptyEpsilon logo](https://raw.githubusercontent.com/daid/EmptyEpsilon/master/resources/logo_full.png)
 
-Started as a Open source 'clone' of Spaceship Artemis - A bridge simulator. But has already deviated from the old spaceship artemis. It supports a game-master mode and multiple AI factions. We strive to get this working on all major platforms (Windows, Linux and Mac) but only windows support is guarenteed. 
-
-The game is built on top of the SeriousProton engine and uses SFML for most of the heavy lifting. 
-
-If there is anyone willing to contribute, we're mostly looking for awesome models, sound effects and music. The game will be tested regulary by some of our trusty colleagues. 
+Started as a cross-platform, open-source "clone" of [Artemis Spaceship Bridge Simulator](http://artemis.eochu.com/), **EmptyEpsilon** has already deviated from Artemis with new features and gameplay, including a Game Master mode and multiple AI factions. We strive to get EmptyEpsilon working on all major platforms (Windows, Linux, and OS X), but only Windows support is guaranteed.
 
+The game is written in C++ with the [SeriousProton](https://github.com/daid/SeriousProton) engine and uses [SFML](http://www.sfml-dev.org/) for most of the heavy lifting.
 
 Contributing
 ===========
-Some general contributing rules.<br>
-1. This project is a dictatorship. Yes it's open source, but we'd much rather spend time on building what we like then arguing with people. <br>
-2. Be precise in your issues; Why do you post the issue, what do you expect, what is happening, why is your feature worth time, what operating system, etc. Issues that are not clear will be subject to rule 1. with extreme prejudice.<br>
-3. Despite the above two, input/ feedback / people playing this game is very much valued. If you have ideas/suggestings/ want to donate beer, drop a line.<br>
 
-Contributing (Donation)
-===========
-If you don't have the skills to help coding / create models, but you do want to give something back, you can always donate a bit. All donations will go directly towards buying better assets for the game (in this case; more/better 3D models). You can find the instructions on; http://daid.github.io/EmptyEpsilon/
-
-Contributing (Coder)
-============
-If you are a coder and want to contribute, there are a few things to take into account. <br>
-1. The code is a undocumented mess at this point. We're working on fixing that.<br>
-2. We use the following convention; member values are seperated with underscores, classes are with HighCamelCase and functions with lowCamelCase.<br>
-3. Use a single pull request to change a single thing. Want to change multiple things? Multiple requests.<br>
-
-Contributing (Artist)
-==============
-There is no clear goal where this game is going. This means that there is no formal game / art / asset design. If you have something that you would like to see in this game (or want to make something), drop us a line. We'd love to see what you can do and how this game can improve.
+If there is anyone willing to contribute, we're mostly looking for awesome models, sound effects, and music. The game is tested regulary by some of our trusty colleagues.
+
+Some general contribution rules:
+
+1.  This project is a dictatorship. Yes, it's open source, but we'd much rather spend time on building what we like than arguing with people.
+
+2.  Be precise when filing issues. Explain why you posted the issue, what you expect, what is happening, why is your feature worth the time to develop it, what operating system is affected, etc. Unclear issues are subject to rule 1 with extreme prejudice.
+
+3.  Despite the above two, we very much value input, feedback, and suggestions from people playing EmptyEpsilon. If you have ideas or want to donate beer, drop us a line.
+
+### Donations
+
+If you don't have the skills to help code or create models but want to give something back, you can always donate a bit. All donations go directly toward buying better assets for the game (in this case, more and better 3D models). You can find the instructions at <http://daid.github.io/EmptyEpsilon/>.
+
+### Coding
+
+If you are a coder and want to contribute, there are a few things to take into account.
+
+1.  The code is a undocumented mess at this point. We're working on fixing that.
+
+2.  We use the following conventions:
+
+    -   Member values use underscores to separate words (`zoom_level`).
+    -   Classes use HighCamelCase (`GuiSlider`).
+    -   Functions use lowCamelCase (`getZoomLevel`).
+
+3.  Use a single pull request to change a single thing. Want to change multiple things? File multiple requests.
+
+### Art
+
+There is no clear goal where this game is going. This means that there is no formal game, art, or asset design. If you have something that you would like to see in this game (or want to make something), drop us a line. We'd love to see what you can do and how you can help improve the game.