Permalink
Commits on Jun 19, 2012
  1. Update translations.

    cybersphinx committed Jun 19, 2012
  2. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Update translations.
      Update the mac doc bundle.
      Update ChangeLog.
      Remove unused variable, and fix some narrowing stuff.
      Fix loading of campaign savegames.
    cybersphinx committed Jun 19, 2012
  3. Update translations.

    cybersphinx committed Jun 19, 2012
  4. Update the mac doc bundle.

    dak180 committed Jun 19, 2012
  5. Update ChangeLog.

    cybersphinx committed Jun 19, 2012
  6. Remove unused variable, and fix some narrowing stuff.

    src/multiint.cpp:404:52: error: narrowing conversion of ‘(rand() % 256)’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Werror=narrowing]
    
    Fixes #3552.
    cybersphinx committed Jun 19, 2012
  7. Fix loading of campaign savegames.

    Apparently, the game.map variable is set to "Sk-Rush" in campaign. And the actual map name is saved somewhere else.
    
    Broken in 15c04ab.
    Cyp committed Jun 19, 2012
  8. Merge branches 'screenscalehack' and 'bugfixes' into 3.1

    Conflicts with 'bugfixes':
    	lib/ivis_opengl/screen.cpp
    	lib/ivis_opengl/screen.h
    	src/clparse.cpp
    Cyp committed Jun 19, 2012
  9. Don't convert to a platform specific string here, it causes bad thing…

    …s to happen.
    
    "const char * PHYSFS_getRealDir 	( 	const char *  	filename 	 )
    Figure out where in the search path a file resides.
    The file is specified in platform-independent notation. "
    vexed committed Jun 19, 2012
Commits on Jun 18, 2012
  1. Update ChangeLog.

    Cyp committed Jun 18, 2012
  2. Handle different maps with identical names, instead of a desynch.

    Fixes ticket:3531 and ticket:3180.
    Cyp committed Jun 18, 2012
  3. Add shader toggle UI.

    Safety0ff committed Jun 18, 2012
  4. "Fix" object selection bounding boxes and clicking on terrain, by sca…

    …ling by a random factor.
    
    This shouldn't work, but works in the sense that two wrongs make a right, two bugs make a feature.
    Cyp committed Jun 18, 2012
  5. Merge branch 'bugfixes' into 3.1

    automerge committed with cybersphinx Jun 18, 2012
Commits on Jun 17, 2012
  1. Add tools/image to the tarballs.

    Closes #3528.
    dak180 committed Jun 17, 2012
  2. Add SHA-256 implementation.

    Cyp committed Jun 17, 2012
  3. Swap Rush-T[23] map with 4c-Rush2-T[23] map, such that the map order …

    …does not depend on tech level.
    Cyp committed Jun 17, 2012
  4. qtscript: Set .stattype of a Laser Satellite building to correct ID. …

    …Closes ticket:3506
    perim committed Jun 17, 2012
  5. Do not dereference NULL on referencing non-existent structure in stru…

    …ctureweapons.txt.
    
    Fixes ticket:3543.
    Cyp committed Jun 17, 2012
  6. Make sure we do not overwrite sensible defaults with non-sensible ones

    when reading rearm pad data from savegame files. Closes ticket:3518
    perim committed Jun 17, 2012
  7. Do archaic OpenGL driver workaround before trying to enable shaders, …

    …as well as after the workaround is clobbered.
    Cyp committed Jun 17, 2012
  8. Update the mac doc bundle.

    dak180 committed Jun 17, 2012
  9. Pngs should be crushed, a lot.

    Preferably before being committed.
    dak180 committed Jun 17, 2012
Commits on Jun 16, 2012
  1. Merge branch 'bugfixes' into 3.1

    vexed committed Jun 16, 2012