Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: daid/EmptyEpsilon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: EE-2016.05.22
Choose a base ref
...
head repository: daid/EmptyEpsilon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: EE-2016.06.02
Choose a head ref

Commits on May 17, 2016

  1. Merge pull request #11 from daid/master

    maj master
    Fouindor committed May 17, 2016
    Copy the full SHA
    87d3db8 View commit details

Commits on May 20, 2016

  1. Basic pack logging.

    oznogon committed May 20, 2016
    Copy the full SHA
    e8af1d7 View commit details
  2. Copy the full SHA
    df8d67e View commit details

Commits on May 22, 2016

  1. Merge pull request #252 from oznogon/pack-gen-log

    Basic pack logging.
    daid committed May 22, 2016
    Copy the full SHA
    6503bba View commit details
  2. Merge pull request #253 from oznogon/patch-2

    Catch new & old typos in nebulae & black holes
    daid committed May 22, 2016
    Copy the full SHA
    fa80ad0 View commit details

Commits on May 23, 2016

  1. Move music to clients and add option to toggle music.

    -   Move threat estimate logic from server to client.
    -   Move music playback from server to client. (Resolves #212)
    -   Create music_enabled option.
        -   0: Client never plays music during game.
        -   1: Client always plays music during game.
        -   2 (default): Client plays music only when main screen.
    -   Add music_enabled selector to option menu.
    oznogon committed May 23, 2016
    Copy the full SHA
    86ffa22 View commit details
  2. Copy the full SHA
    2b7baed View commit details
  3. Copy the full SHA
    713d87c View commit details
  4. Edit and add ship comms.

    -   Fix typos and edit ship comms text.
    -   Add faction comms for Ktlitans.
    oznogon committed May 23, 2016
    Copy the full SHA
    894a729 View commit details
  5. Edit station, reinforcement, and supply drop comms.

    -   Move station services into a services object similar
        to weapons.
    -   Use variables for supply drop and reinforcement costs.
        Costs are not changed, but are a little easier to modify.
    -   Fix typos and edit station comms scripts.
    oznogon committed May 23, 2016
    Copy the full SHA
    97a7ab6 View commit details
  6. Merge pull request #256 from oznogon/comms-edits

    Edit ship and station comms scripts
    daid committed May 23, 2016
    Copy the full SHA
    4533f9e View commit details
  7. Copy the full SHA
    2ce7254 View commit details
  8. Merge pull request #255 from oznogon/client-music

    Move music to clients and add option to toggle music
    daid committed May 23, 2016
    Copy the full SHA
    ec82c5b View commit details

Commits on May 24, 2016

  1. Copy the full SHA
    d80787a View commit details

Commits on May 25, 2016

  1. Merge pull request #257 from oznogon/database-div_distance

    Adjust database screen div distance
    nallath committed May 25, 2016
    Copy the full SHA
    1fda7f3 View commit details
  2. Merge pull request #12 from daid/master

    maj master
    Fouindor committed May 25, 2016
    Copy the full SHA
    d48235c View commit details
  3. Fixed #258

    Fouindor committed May 25, 2016
    Copy the full SHA
    40f9504 View commit details

Commits on May 26, 2016

  1. Copy the full SHA
    0a3f806 View commit details
  2. Copy the full SHA
    a5411c0 View commit details
  3. Merge pull request #259 from Fouindor/master

    fixed #258
    daid committed May 26, 2016
    Copy the full SHA
    e758653 View commit details

Commits on May 27, 2016

  1. Add window title to cmake file.

    daid committed May 27, 2016
    2
    Copy the full SHA
    680846f View commit details
  2. 1
    Copy the full SHA
    ebd3482 View commit details
  3. Change the shield damage factor when there is more power in the shiel…

    …d system. Fix system<->shield link when there are more then 2 shields.
    daid committed May 27, 2016
    Copy the full SHA
    bc1dfb9 View commit details
  4. Make the combat maneuvering two dimensional allowing for boosting and…

    … strafing at the same time. This makes for a cleaner UI.
    
    Also slightly improve the weapons UI when the shield frequency feature is disabled.
    daid committed May 27, 2016
    Copy the full SHA
    a7fe16e View commit details

Commits on May 28, 2016

  1. Add icon for hvli weapon. Change how system damage is done when you g…

    …et hit. Instead of distributing a single hit on 5 random systems, damage 1 system.
    daid committed May 28, 2016
    Copy the full SHA
    a96f9d1 View commit details
  2. Add a button to the science station to quickly open the database to t…

    …he ship type you have selected.
    daid committed May 28, 2016
    Copy the full SHA
    7fe4f7a View commit details

Commits on May 29, 2016

  1. Copy the full SHA
    0fa56fc View commit details

Commits on May 30, 2016

  1. Added a change log

    OldDragon2A committed May 30, 2016
    Copy the full SHA
    503b442 View commit details
  2. Copy the full SHA
    daa80e1 View commit details
  3. Copy the full SHA
    bb496de View commit details
  4. Copy the full SHA
    d8a7a16 View commit details
  5. Copy the full SHA
    491772e View commit details

Commits on May 31, 2016

  1. Copy the full SHA
    5c5c50f View commit details
  2. Copy the full SHA
    693292e View commit details
  3. Copy the full SHA
    b312fe9 View commit details
  4. Revise tweak panel UI.

    -   Standardize spacing, selector, and slider sizes.
    -   Expand turn speed slider range from 25 to 35 to accomodate new ships.
    -   Convert missile storage and amount settings from selectors to sliders.
    -   Convert warp and jump drive toggles from selectors to toggle buttons.
    oznogon committed May 31, 2016
    Copy the full SHA
    4c96062 View commit details
  5. Copy the full SHA
    8dbb8c3 View commit details
  6. Merge pull request #262 from OldDragon2A/master

    Added a change log
    nallath committed May 31, 2016
    Copy the full SHA
    2412fa1 View commit details
  7. Merge pull request #265 from oznogon/gm-screen-gui-spacing

    Revise tweak panel UI on GM screen.
    nallath committed May 31, 2016
    Copy the full SHA
    6f1a140 View commit details
  8. Merge pull request #266 from oznogon/gm-creation-buttons

    Add buttons to GM screen.
    nallath committed May 31, 2016
    Copy the full SHA
    af12106 View commit details
  9. Copy the full SHA
    34ad186 View commit details
  10. Expand top-down controls.

    -   Allow for an unlocked camera.
        -   Add keyboard controls for panning and zooming.
        -   Add mouse wheel zoom controls.
    -   Add a selector for picking a player ship to lock onto.
    oznogon committed May 31, 2016
    Copy the full SHA
    2a24525 View commit details
  11. Hide camera lock controls by default, and add keyboard controls.

    -   Hide GUI controls for selecting player ships and locking the camera.
    -   Toggle GUI visibility with the H key.
    -   Cycle back and forth through the list of player ships with the J and K keys.
    -   Toggle camera locking with the L key.
    oznogon committed May 31, 2016
    Copy the full SHA
    c10f13d View commit details
  12. Merge pull request #267 from oznogon/top-down-ui

    Expand top-down controls.
    daid committed May 31, 2016
    Copy the full SHA
    10bd391 View commit details
  13. Add SIL OFL for Bebas Neue.

    oznogon committed May 31, 2016
    Copy the full SHA
    484d84e View commit details

Commits on Jun 1, 2016

  1. Merge pull request #269 from oznogon/bebas-ofl

    Add SIL OFL v1.1 for Bebas Neue.
    daid committed Jun 1, 2016
    Copy the full SHA
    155bebd View commit details
  2. Copy the full SHA
    d98a2cf View commit details
  3. Copy the full SHA
    ec385dc View commit details
  4. Copy the full SHA
    a4d963f View commit details
  5. Merge pull request #270 from oznogon/single-pilot-controls

    Add maneuvers and fix comms button on single-pilot screen.
    daid committed Jun 1, 2016
    Copy the full SHA
    4072f63 View commit details
Showing with 21,064 additions and 317 deletions.
  1. +244 −0 CHANGELOG.md
  2. +1 −0 CMakeLists.txt
  3. +1 −0 EmptyEpsilon.cbp
  4. +304 −0 logs/index.html
  5. +9,789 −0 logs/jquery.js
  6. +3 −0 packs/pack_gen.py
  7. +41 −0 resources/gui/fonts/LICENSE
  8. BIN resources/gui/icons/weapon-hvli.png
  9. BIN resources/room_background.png
  10. BIN resources/room_door.png
  11. +35 −25 scripts/comms_ship.lua
  12. +40 −27 scripts/comms_station.lua
  13. +2 −2 scripts/comms_supply_drop.lua
  14. +8 −3 scripts/scenario_03_edgeofspace.lua
  15. +2 −2 scripts/science_db.lua
  16. +0 −11 src/epsilonServer.cpp
  17. +0 −2 src/epsilonServer.h
  18. +1 −0 src/featureDefs.h
  19. +14 −7 src/gameStateLogger.cpp
  20. +126 −0 src/gui/gui2_slider.cpp
  21. +30 −0 src/gui/gui2_slider.h
  22. +9 −0 src/main.cpp
  23. +24 −10 src/menus/optionsMenu.cpp
  24. +18 −1 src/repairCrew.cpp
  25. +2 −0 src/repairCrew.h
  26. +12 −17 src/screenComponents/combatManeuver.cpp
  27. +2 −4 src/screenComponents/combatManeuver.h
  28. +72 −37 src/screenComponents/databaseView.cpp
  29. +4 −0 src/screenComponents/databaseView.h
  30. +1 −0 src/screenComponents/missileTubeControls.cpp
  31. +67 −37 src/screenComponents/radarView.cpp
  32. +4 −0 src/screenComponents/radarView.h
  33. +5 −3 src/screenComponents/rawScannerDataRadarOverlay.cpp
  34. +4 −1 src/screenComponents/rawScannerDataRadarOverlay.h
  35. +5 −1 src/screenComponents/shieldsEnableButton.cpp
  36. +15 −0 src/screenComponents/snapSlider.cpp
  37. +10 −0 src/screenComponents/snapSlider.h
  38. +16 −8 src/screens/crew1/singlePilotScreen.cpp
  39. +1 −1 src/screens/crew4/tacticalScreen.cpp
  40. +2 −1 src/screens/crew6/helmsScreen.cpp
  41. +29 −8 src/screens/crew6/scienceScreen.cpp
  42. +10 −3 src/screens/crew6/scienceScreen.h
  43. +14 −1 src/screens/crew6/weaponsScreen.cpp
  44. +17 −0 src/screens/crewStationScreen.cpp
  45. +2 −0 src/screens/crewStationScreen.h
  46. +15 −0 src/screens/gm/gameMasterScreen.cpp
  47. +1 −0 src/screens/gm/gameMasterScreen.h
  48. +62 −53 src/screens/gm/tweak.cpp
  49. +4 −4 src/screens/gm/tweak.h
  50. +16 −1 src/screens/mainScreen.cpp
  51. +2 −0 src/screens/mainScreen.h
  52. +113 −16 src/screens/topDownScreen.cpp
  53. +5 −0 src/screens/topDownScreen.h
  54. +10 −0 src/spaceObjects/shipTemplateBasedObject.cpp
  55. +1 −0 src/spaceObjects/shipTemplateBasedObject.h
  56. +26 −31 src/spaceObjects/spaceship.cpp
  57. +34 −0 www/index.html
  58. +9,789 −0 www/jquery.js
244 changes: 244 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
# Change Log

## [Unreleased]
### Added
- 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
- 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
- shield damage factor when there is more power in the shield system
- replaced std::stoi with toInt to be more consistent
- database screen div distance
- moved music to the clients
- ship and station communication scripts
### Fixed
- small fixes to the game state logger
- Fix system <-> shield link when there are more than 2 shields

## [2016-05-22]
### Added
- station descriptions
- name of missile tube on the firing button
- show the ship destroyed dialog even if the game is paused
- log the game state every X sections for post game analytics
- engine emittors for more models
- player controled _Flavia_
- _StarHammer_ corvette
- beam weapon and engine positions on some models
- player variant of the Piranha
- headless options
- defense platform to replace weapons platform
- allow tweaking missile tube details and availability at load time
- allow game master to change callsigns
- 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
- faction descriptions
- moved descriptions in the database to the rightmost column
- ship descriptions
- direction facing labeling
- prevent AI from firing missiles on scan probes
- improve AI missile behavior
- new power/collant request functions in the tutorial
- model sizes
- beam weapon ranges
- allow scripts to set the amount of crew memebers in a ship template
- 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
- do not modify the small\_objects map while iterating over it
- ready button not always enabled on ship selection
- HLVI firing in opposite direction
- nebula positioning

## [2016-05-07]
### Added
- try to support uDMX hardware
- sniper type cruiser
- show the direction to waypoints outside radar range
- waypoint color is configurable
- game master can manually spawn enemy waves and random allies in the basic scenario
- blank scenario with no enemies and no victory condition
- game master fucntion to manually award victory
- 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
- draw the alert overlay behind controls
- docking is now defined by which classes are allowed to dock with a ship
- 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
- missile AI only fires the tubes with a targeting solution
- AI only tries to jump with the drive is charged
- main screen controls
- station selection overlap
- broadcast to friendlies

## [2016-04-30]
### Changed
- km with "distance unit"
- 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
- compile warning

## [2016-04-28]
### Added
- icon to show missle tube direction
- corvette class ships *disabled*
- player variant of the corvette class ship *disabled*
- frigate variations *disabled*
- abort the game on script errors in important files
- ship templates can be copied
- quick debug button to show all ship models in a single overview
- all colors of the new models to the model\_data
- allow combat manuvering data to be set on active ships
- added functions to remove game master function buttons
- allow the amount of repair crew to be set per ship template and at runtime
- functions to get the current radar range
- 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
- append callsign when broadcasting
- msgamedev model to point in the proper direction
- slight improvement to the database view when there are lots of items
- science database uses a tree structure
- how the probe link is implemented in science
- player cruiser and missile cruiser use the directional tubes
- mines are fired in the direction of the tube
- missile path projections are only shown when loaded
- 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
- database scroll bar overlapping with database entry
- label in game master screen for laser damage
- asking a friendlies status made it defend the player
- do not drain energy from docked ship when energy is full
- player spaceships and stations from being incorrectly reported as not used models
- margin calculations
- game master script buttons overlayed with ship orders

## [2016-04-12]
### Added
- allow the game master to close communications
- allow safe destory of GuiElements
- allow clipboard paste in text fields
- function to shutdown the game
- function to get what the game master has selected.
- examples of how to use the addGMFunction
- option to set margins on controls
- function to change the scenario to a different one.
- log to a file in windows
- allow the user to specify the serial port for DMX with or without /dev/ on linux
- server can register with the online master server
- browsing for LAN and internet servers
- server password
- 4 new ship models
- scan probe model
- logging to show which model data deinitions are not used by ship templates
- 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
- changed the default release log level to info
- use a different icon for the warp and jump drives
- server screen uses less magic numbers
- return to the scenario selection instead of closing the server
- 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
- changes to server name were never applied
- scroll bar look
- touchscreen calibration
- main screen first person view rotating like an idiot

## [2016-04-07]
### Added
- indication that chat has changed on game master chat dialogs that are minimized
- image for the resize corner
- include ship tweaks when exporting from the game master screen with F5
- icons for _Tactical_ and _Single Pilot_
- option to tweak ships from the game master interface
- indicators ticks for power and coolant
- function to broadcast faction messages
- AI ships inform when taking new orders
- state to let the communication officer to know when the other side closed communication
- option to abort docking
- scan state for ships
- icons for each support OS
- 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
- game master can have multiple sessions
- updated icons for stations
- updated logo on the main menu
- more realistic asteroid texture
- new cursor design
- resized button icons to fit better
- round beam range on 100m intervals
- game master screen now has multiple pages
- broadcast function has three thresholds: allies, neutral, all
- new shield, hull and self destruct icons
- increased the sharpness of the skybox
- updated the star field image
- images for active/disabled/hovered buttons
- 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
[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
[2016-04-28]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.04.12...EE-2016.04.28
[2016-04-12]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.04.07...EE-2016.04.12
[2016-04-07]: https://github.com/daid/EmptyEpsilon/compare/EE-2016.02.29...EE-2016.04.07
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -303,6 +303,7 @@ foreach(SP_SOURCE
list(APPEND SOURCES ${SERIOUS_PROTON_DIR}${SP_SOURCE})
endforeach()

add_definitions(-DWINDOW_TITLE="EmptyEpsilon")
add_definitions(-DVERSION_NUMBER=${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH})
if(ENABLE_CRASH_LOGGER)
add_definitions(-DENABLE_CRASH_LOGGER)
1 change: 1 addition & 0 deletions EmptyEpsilon.cbp
Original file line number Diff line number Diff line change
@@ -170,6 +170,7 @@
<Add option="-std=c++11" />
<Add option="-Wall" />
<Add option="-DENABLE_CRASH_LOGGER" />
<Add option='-DWINDOW_TITLE=\&quot;EmptyEpsilon\&quot;' />
<Add directory="../SeriousProton/src" />
<Add directory="src" />
</Compiler>
Loading