Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alpha5 #336

Open
wants to merge 145 commits into
base: master
Choose a base branch
from
Open

Alpha5 #336

wants to merge 145 commits into from

Commits on Feb 12, 2014

  1. New vertex buffer class

    kko committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    c581aff View commit details
    Browse the repository at this point in the history

  2. added news event for commodities on BBS

    @impaktor
    impaktor committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    e4564a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2014

  1. Remove Renderer::DrawSurface

    kko committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    8f8c436 View commit details
    Browse the repository at this point in the history

  2. Port background milkyway to vertexbuffer

    kko committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    3023460 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2014

  1. Port starfield to vertex buffer

    kko committed Feb 14, 2014
    Configuration menu
    Copy the full SHA
    c725780 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2014

  1. Port skybox to VertexBuffer

    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    317aea3 View commit details
    Browse the repository at this point in the history

  2. Port model system to use VertexBuffer

    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    74b44ae View commit details
    Browse the repository at this point in the history

  3. Update shields staticmesh usage

    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    eb9063e View commit details
    Browse the repository at this point in the history

  4. Indices are Uint16, but index count is Uint32 

    Noticed this when ground_station crashed
    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    fd02959 View commit details
    Browse the repository at this point in the history

  5. Remove StaticMesh, Surface and related junk

    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    3c87675 View commit details
    Browse the repository at this point in the history

  6. Allow storing offsets in vertex description

    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    bc3e41e View commit details
    Browse the repository at this point in the history

  7. Add extra checks to buffer mapping

    kko committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    f6b2359 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2014

  1. Use glMapBuffer when reading/writing static buffers

    kko committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    35a626b View commit details
    Browse the repository at this point in the history

  2. Vertexbuffer: update makefile.am (blindly)

    kko committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    e08e93a View commit details
    Browse the repository at this point in the history

  3. Move more enums to graphics/Types.h so they don't clutter Renderer.h

    kko committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    1238065 View commit details
    Browse the repository at this point in the history

  4. Add comments

    kko committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    b59167c View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into nicer-vertexbuffer

    kko committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    ec2a698 View commit details
    Browse the repository at this point in the history

  6. Add ability to predefine stride in vertex buffer desc, respect custom… 

    … offsets when calculating stride
    kko committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    732739e View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2014

  1. Remove the assert on hyperspace target being a system path 

    It is now obsolete, as one can specify at which star one wants to jump.
    @laarmen
    laarmen committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    530ab2f View commit details
    Browse the repository at this point in the history

  2. New API to make (almost) uncondional jumps 

    This commit adds new InitiateHyperjump and AbortHyperjump methods to
Ship, with only the minimal consistency checking (not in hyperspace
already, and not jumping towards the current system), as well as a way
to use an arbitrary Lua function to abort the jump during the countdown.

The plan is to make these methods available from Lua, and to implement
all Hyperspace-related policies in Lua (waiting on pioneerspacesim#1719, as usual). In
the end, I plan on removing CheckHyperSpaceTo and friends.

In order to make this work, I had to add a temporary flag to
the HyperspaceOut structure to tell the various checking functions not
to deal with considerations of fuel or range when the hyperjump has been
initiated by the new methods. This flag will definitely be on its way
along with all the fuel-related code in an hopefully near future.
    @laarmen
    laarmen committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    79f7227 View commit details
    Browse the repository at this point in the history

  3. LuaShip: Expose InitiateHyperjumpTo and AbortHyperjump to Lua

    @laarmen
    laarmen committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    c9176b5 View commit details
    Browse the repository at this point in the history

  4. Go back in time when getting out of hyperspace to avoid rounding error

    @laarmen
    laarmen committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    28286a4 View commit details
    Browse the repository at this point in the history

  5. Add a new CheckHyperjumpCapability() method to Ship 

    and use it to still do the simple checks before jumping into hyperspace.
    @laarmen
    laarmen committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    b71ede7 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/lua_hyperjump'

    @laarmen
    laarmen committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    852586b View commit details
    Browse the repository at this point in the history

  7. Make it compile

    @fluffyfreak
    fluffyfreak committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    9c3a094 View commit details
    Browse the repository at this point in the history

  8. Merge pull request pioneerspacesim#2768 from fluffyfreak/no-or 

    Make it compile again
    @fluffyfreak
    fluffyfreak committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    5c78066 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    2e5acf8 View commit details
    Browse the repository at this point in the history

  2. separate widget border width from inner padding

    @robn
    robn committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    a6a0383 View commit details
    Browse the repository at this point in the history

  3. VS2012 doesn't support = delete.

    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    74cfd5f View commit details
    Browse the repository at this point in the history

  4. Merge pull request pioneerspacesim#2769 from fluffyfreak/fixvs2012-eq… 

    …-delete

VS2012 doesn't support `= delete`.
    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    f9ac5c8 View commit details
    Browse the repository at this point in the history

  5. Copy n' waste error fixed

    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    169d9fa View commit details
    Browse the repository at this point in the history

  6. update

    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    f71c430 View commit details
    Browse the repository at this point in the history

  7. Merge pull request pioneerspacesim#2770 from fluffyfreak/fix_copywaste 

    Copy n' waste error fixed
    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    0d77b8a View commit details
    Browse the repository at this point in the history

  8. Moved and templated interpolation.

    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    62c7cdd View commit details
    Browse the repository at this point in the history

  9. Slight changes to alter the way it calculates each step of the vertices.

    @fluffyfreak
    fluffyfreak committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    6b26d6e View commit details
    Browse the repository at this point in the history

  10. utils.lua: Add an inherits function to ease OO development 

    This will get used in pioneerspacesim#1719 to implement lua-side hyper{drive, space,
jump}.
    @laarmen
    laarmen committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    2e8fd8b View commit details
    Browse the repository at this point in the history

  11. utils: inherits: Add a "name" parameter

    @laarmen
    laarmen committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    389fceb View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2014

  1. Merge remote-tracking branch 'origin/master' into nicer-vertexbuffer

    kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    d98534a View commit details
    Browse the repository at this point in the history

  2. Set initial index data to zeros instead of undefined

    kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    64e40c5 View commit details
    Browse the repository at this point in the history

  3. Fixup printf for new Output function log GLDebug messages to output.txt

    @fluffyfreak
    fluffyfreak authored and kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    94d96a7 View commit details
    Browse the repository at this point in the history

  4. Update VS2012 and 2013 project files

    @fluffyfreak
    fluffyfreak authored and kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    f684bb5 View commit details
    Browse the repository at this point in the history

  5. Apparently this caused a warning with msvc

    kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    98f46c8 View commit details
    Browse the repository at this point in the history

  6. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    258df44 View commit details
    Browse the repository at this point in the history

  7. Be more careful with attribute offsets

    kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    7856ca5 View commit details
    Browse the repository at this point in the history

  8. Fix an old assert

    kko committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    ef5369a View commit details
    Browse the repository at this point in the history

  9. normalise whitespace in Changelog.txt

    @johnbartholomew
    johnbartholomew committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    3f4a286 View commit details
    Browse the repository at this point in the history

  10. don't provide implementations of disabled Sector copy & assignment 

    Fixes GCC -Wreturn-type warning and prevents accidental use of the
copy-constructor or assignment operator (use will result in link failure
at build time).
    @johnbartholomew
    johnbartholomew committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    cf6f57e View commit details
    Browse the repository at this point in the history

  11. Merge pull request pioneerspacesim#2771 from fluffyfreak/minor-patch-… 

    …optimisation

Patch alteration and math util
    @fluffyfreak
    fluffyfreak committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    727136f View commit details
    Browse the repository at this point in the history

  12. Removing legacy versions of Visual Studio 2010 and 2012

    @fluffyfreak
    fluffyfreak committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    862f936 View commit details
    Browse the repository at this point in the history

  13. remove debug printouts and less probability for news creation

    @impaktor
    impaktor committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    9a209ef View commit details
    Browse the repository at this point in the history

  14. add .dirstamp (from src/graphics(gl2/) to .gitignore

    @impaktor
    impaktor committed Feb 19, 2014
    Configuration menu
    Copy the full SHA
    4c3196c View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2014

  1. Model loader: log warning & workaround for missing indices

    kko committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    3406063 View commit details
    Browse the repository at this point in the history

  2. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    37d1531 View commit details
    Browse the repository at this point in the history

  3. fix the makefile

    @fluffyfreak
    fluffyfreak authored and kko committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    66dcef8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request pioneerspacesim#2762 from Luomu/nicer-vertexbuffer 

    Merging - New Vertex buffer class
    @fluffyfreak
    fluffyfreak committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    49697a0 View commit details
    Browse the repository at this point in the history

  5. Update with Luomu new vertex buffer class changes

    @fluffyfreak
    fluffyfreak committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    6611365 View commit details
    Browse the repository at this point in the history

  6. Rename StarSystem::rootBody to m_rootBody.

    lwho committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    613ca1e View commit details
    Browse the repository at this point in the history

  7. Give all non-static members of SystemBody an m_ prefix.

    lwho committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    5dfc8a5 View commit details
    Browse the repository at this point in the history

  8. Make SystemBody attributes private.

    lwho committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    b32021b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'cleanup_starsystem'

    lwho committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    58b950b View commit details
    Browse the repository at this point in the history

  10. Fix reordered initialization.

    lwho committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    d70493c View commit details
    Browse the repository at this point in the history

  11. Fix shadowed variable.

    lwho committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    cd4dce8 View commit details
    Browse the repository at this point in the history

  12. regenerate enums table for missing HYPERJUMP_INITIATED enum

    @robn
    robn committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    fda187c View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    bb0fa71 View commit details
    Browse the repository at this point in the history

  2. add Table padding options, deciding how extra space is distributed

    @robn
    robn committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    628c9ff View commit details
    Browse the repository at this point in the history

  3. reimplement SmartTable with a between-padded Table

    @robn
    robn committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    d162b80 View commit details
    Browse the repository at this point in the history

  4. use a between-padded table for the crew list

    @robn
    robn committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    156fed1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ui-table-column-alignment'

    @robn
    robn committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    795c4bd View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2014

  1. Fix excessive mass of asteroids (fixes pioneerspacesim#2781).

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    3d00921 View commit details
    Browse the repository at this point in the history

  2. don't drop columns from the total width if they're missing from a sin… 

    …gle row. pioneerspacesim#2778
    @robn
    robn committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    d1e258d View commit details
    Browse the repository at this point in the history

  3. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    292f72e View commit details
    Browse the repository at this point in the history

  4. IterationProxy for controlled access to embedded containers.

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    11a6f95 View commit details
    Browse the repository at this point in the history

  5. Switch access to SystemBody::m_children to IterationProxy interface.

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    4536a48 View commit details
    Browse the repository at this point in the history

  6. Switch access to Space::m_bodies to IterationProxy interface.

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    7cfcd02 View commit details
    Browse the repository at this point in the history

  7. Switch access to Frame::m_children to IterationProxy interface.

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    b88d4c9 View commit details
    Browse the repository at this point in the history

  8. Switch access to UI::Container::m_widgets to IterationProxy interface.

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    1d43830 View commit details
    Browse the repository at this point in the history

  9. Switch access to Lang::Resource::m_strings to IterationProxy interface.

    lwho committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    4e6c6b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2014

  1. Merge branch 'master' of https://github.com/pioneerspacesim/pioneer i… 

    …nto remove-vs2012

Conflicts:
	win32/vc2012/graphics/graphics.vcxproj
	win32/vc2012/graphics/graphics.vcxproj.filters
    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    ab94f72 View commit details
    Browse the repository at this point in the history

  2. Merge pull request pioneerspacesim#2772 from fluffyfreak/remove-vs2012 

    DISCUSS - Removing Visual Studio 2010 and 2012
    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    c117080 View commit details
    Browse the repository at this point in the history

  3. Updated COMPILING.txt to remove 2008, 2010 and 2012 references to Vis… 

    …ual Studio products.

Also update the changelog
    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    e81ee8a View commit details
    Browse the repository at this point in the history

  4. Merge pull request pioneerspacesim#2784 from fluffyfreak/update-compi… 

    …ling

Merging
    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    9f4f703 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'iteration_proxy'

    lwho committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    27f85c4 View commit details
    Browse the repository at this point in the history

  6. Automatically manage the cancellation of jobs with RAII.

    lwho committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    007991f View commit details
    Browse the repository at this point in the history

  7. Avoid calling JobClient::RemoveJob from ~JobHandle, as that means it … 

    …*is* just being removed.
    lwho committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    00d6632 View commit details
    Browse the repository at this point in the history

  8. Added Profile configuration for Visual Studio

    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    58e0168 View commit details
    Browse the repository at this point in the history

  9. Updated the git ignore list to remove Profile folders.

    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    d38408e View commit details
    Browse the repository at this point in the history

  10. Removed unused ScopedTimer struct.

    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    393feac View commit details
    Browse the repository at this point in the history

  11. Add MsgTimer struct, used it on another branch to time loading stages.

    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    c4ac5be View commit details
    Browse the repository at this point in the history

  12. Update dependencies in premake4.lua, add release-symbols option

    kko committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    4104981 View commit details
    Browse the repository at this point in the history

  13. deduct reputation if unable to pay crew

    @impaktor
    impaktor committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    5fb1320 View commit details
    Browse the repository at this point in the history

  14. add some reputation when donating money

    @impaktor
    impaktor committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    4db7545 View commit details
    Browse the repository at this point in the history

  15. Merge pull request pioneerspacesim#2758 from lwho/job_auto_cancel 

    Merged (pioneerspacesim#2758)
    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    9bb9695 View commit details
    Browse the repository at this point in the history

  16. Update Changelog.txt

    @fluffyfreak
    fluffyfreak committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    78b4924 View commit details
    Browse the repository at this point in the history

  17. always recompute columns on layout request

    @robn
    robn committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    9b125fb View commit details
    Browse the repository at this point in the history

  18. relayout single containers after content change

    @robn
    robn committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    0f9b80a View commit details
    Browse the repository at this point in the history

  19. convert keybinding config to use a table instead of grids

    @robn
    robn committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    63c267d View commit details
    Browse the repository at this point in the history

  20. human-readable changelog thanks

    @robn
    robn committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    7809c24 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    404987c View commit details
    Browse the repository at this point in the history

  2. expand empty grid rows so they can be used properly as spacers

    @robn
    robn committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    56a397a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'reputation_crew'

    @impaktor
    impaktor committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    c803960 View commit details
    Browse the repository at this point in the history

  4. expose basic table scroll controls to lua

    @robn
    robn committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    a435eaf View commit details
    Browse the repository at this point in the history

  5. Merge pull request pioneerspacesim#2785 from fluffyfreak/VSProfileConfig 

    Added a Profile Config to VS2013
    @fluffyfreak
    fluffyfreak committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    36ec646 View commit details
    Browse the repository at this point in the history

  6. Update Changelog.txt

    @fluffyfreak
    fluffyfreak committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    a79eb79 View commit details
    Browse the repository at this point in the history

  7. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    916c48a View commit details
    Browse the repository at this point in the history

  8. Make static data tables in StarSystem const.

    lwho committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    47685c1 View commit details
    Browse the repository at this point in the history

  9. Make StarSystem attributes private.

    lwho committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    d599c58 View commit details
    Browse the repository at this point in the history

  10. Update changelog

    lwho committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    4281823 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    6e38538 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    4f9d3d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    635289f View commit details
    Browse the repository at this point in the history

  2. fix a few typos in newsevent flavours

    @impaktor
    impaktor committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    bca1f59 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'NewsEventCommodity'

    @impaktor
    impaktor committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    619c2b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2014

  1. Switch over to using the new VertexBuffer type and passing the materi… 

    …al into it's draw method rather than setting it all outside of it.
    @fluffyfreak
    fluffyfreak committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    68abbae View commit details
    Browse the repository at this point in the history

  2. Remove the assertion of an non-existant variable!

    @fluffyfreak
    fluffyfreak committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    5fcf6f7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'fluffyfreak/terrainVB'

    Kimmo Kotajärvi committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    f7e8abc View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 2, 2014
    Configuration menu
    Copy the full SHA
    0cf2fb1 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2014

  1. add transifex resource for NewsEventCommodity

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    fe813f9 View commit details
    Browse the repository at this point in the history

  2. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    3de5936 View commit details
    Browse the repository at this point in the history

  3. allow position when updating a texture

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    540f401 View commit details
    Browse the repository at this point in the history

  4. flatten Font in TextureFont, no need to separate them anymore

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    0f1e768 View commit details
    Browse the repository at this point in the history

  5. keep the stroker around, we'll need it

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    f0a988c View commit details
    Browse the repository at this point in the history

  6. take outline flag directly from the descriptor

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    fe0da0b View commit details
    Browse the repository at this point in the history

  7. single glyph bake and atlas update

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    e3517d3 View commit details
    Browse the repository at this point in the history

  8. make glyph struct conform to conventions

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    2fdb535 View commit details
    Browse the repository at this point in the history

  9. load glyphs on demand

    @robn
    robn committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    6364058 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2014

  1. Merge remote-tracking branch 'robn/font-incremental'

    Kimmo Kotajärvi committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    58ee40d View commit details
    Browse the repository at this point in the history

  2. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    a6ebb47 View commit details
    Browse the repository at this point in the history

  3. support horizontally-expanding widgets in table rows

    @robn
    robn committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    9b17395 View commit details
    Browse the repository at this point in the history

  4. put volume controls into a table. closes pioneerspacesim#2798

    @robn
    robn committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    0e51b78 View commit details
    Browse the repository at this point in the history

  5. remove unused ChatForm, should have been removed in @110a231f

    @robn
    robn committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    dc2f266 View commit details
    Browse the repository at this point in the history

  6. Update for text and pioneer project file removals.

    @fluffyfreak
    fluffyfreak committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    e1c6ea5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request pioneerspacesim#2800 from fluffyfreak/fixvs2013 

    Update for text and pioneer project file removals.
    @fluffyfreak
    fluffyfreak committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    33ec2ca View commit details
    Browse the repository at this point in the history

  8. Fix compilation with gcc-4.7 by deleting copy constructor/assignment … 

    …of JobHandle (fixes pioneerspacesim#2799).
    lwho committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    fdc9b5b View commit details
    Browse the repository at this point in the history

  9. Fix signed/unsigned comparison.

    lwho committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    f8727a6 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    96ca7d7 View commit details
    Browse the repository at this point in the history

  2. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    3a545fc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/lua_inherit'

    @laarmen
    laarmen committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    02b36fc View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2014

  1. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    64c0b2d View commit details
    Browse the repository at this point in the history

  2. don't initialise sector cache at start, temp workaround for pioneersp… 

    …acesim#2802
    @robn
    robn committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    cae3e4d View commit details
    Browse the repository at this point in the history

  3. don't try to render the glyph if there's no bitmap to render. fixes p… 

    …ioneerspacesim#2804
    @robn
    robn committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    c1a5598 View commit details
    Browse the repository at this point in the history

  4. auto-commit: translation updates

    @pioneerbuild
    pioneerbuild committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    de747e6 View commit details
    Browse the repository at this point in the history

  5. Alpha 5 changes: 

    * new ship exhaust trails
* new ship; civilian corvette
* new npc ship; passenger liner
* new npc ship; ultraheavy tanker
* new ship; civilian fighter
* new shields for all ships
* fixed mission spawning bug
* updates to missions and reputation
    @Salwan
    Salwan committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    69f9eb8 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/master' into sync 

    Conflicts:
	.gitignore
	data/ui/InfoView/CrewRoster.lua
	data/ui/Settings.lua
	src/Background.cpp
	src/Background.h
	src/Camera.cpp
	src/Makefile.am
	src/SystemInfoView.cpp
	src/SystemView.cpp
	src/WorldView.cpp
	src/galaxy/Sector.h
	src/galaxy/StarSystem.cpp
	src/graphics/Makefile.am
	src/graphics/Renderer.h
	src/graphics/RendererGL2.cpp
	src/graphics/RendererGL2.h
	win32/vc2012/graphics/graphics.vcxproj
	win32/vc2012/graphics/graphics.vcxproj.filters
	win32/vc2012/pioneer.vcxproj
	win32/vc2012/pioneer.vcxproj.filters
    @Salwan
    Salwan committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    8b26db3 View commit details
    Browse the repository at this point in the history

  7. Compilation errors handled

    @Salwan
    Salwan committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    3e8bca3 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2014

  1. Merge remote-tracking branch 'upstream/master' into sync 

    Conflicts:
	.gitignore
	data/ui/InfoView/CrewRoster.lua
	data/ui/Settings.lua
	src/Background.cpp
	src/Background.h
	src/Camera.cpp
	src/Makefile.am
	src/SystemInfoView.cpp
	src/SystemView.cpp
	src/WorldView.cpp
	src/galaxy/Sector.h
	src/galaxy/StarSystem.cpp
	src/graphics/Makefile.am
	src/graphics/Renderer.h
	src/graphics/RendererGL2.cpp
	src/graphics/RendererGL2.h
	win32/vc2012/graphics/graphics.vcxproj
	win32/vc2012/graphics/graphics.vcxproj.filters
	win32/vc2012/pioneer.vcxproj
	win32/vc2012/pioneer.vcxproj.filters
    @Salwan
    Salwan committed Mar 9, 2014
    Configuration menu
    Copy the full SHA
    2460ff8 View commit details
    Browse the repository at this point in the history