warzone2100:mainline.git
5 years agoUpdate version numbers for 3.1 rc2. v3.1_rc2
cybersphinx [Mon, 20 Aug 2012 22:30:54 +0000 (00:30 +0200)]
Update version numbers for 3.1 rc2.

5 years agoUpdate translations.
cybersphinx [Mon, 20 Aug 2012 22:25:44 +0000 (00:25 +0200)]
Update translations.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 20 Aug 2012 06:10:39 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoForce code signing to happen last.
dak180 [Sun, 19 Aug 2012 20:45:53 +0000 (16:45 -0400)]
Force code signing to happen last.

5 years agoFrench translation update by Amiral JCDG.
cybersphinx [Sun, 19 Aug 2012 17:04:26 +0000 (19:04 +0200)]
French translation update by Amiral JCDG.

Closes #3671.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Sat, 18 Aug 2012 12:19:06 +0000 (14:19 +0200)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Default to xz compression for make dist.
  Update translations.

5 years agoDefault to xz compression for make dist.
cybersphinx [Sun, 10 Jun 2012 21:21:25 +0000 (23:21 +0200)]
Default to xz compression for make dist.

Also set xz options to the xz default -6, since the automake default -e
is noticeably slower without noticeably better compression. Fixes #3492.

5 years agoDisable translations below 80% on the mac.
dak180 [Sat, 18 Aug 2012 11:57:25 +0000 (07:57 -0400)]
Disable translations below 80% on the mac.

Refs #3136.

5 years agoDisable translations below 80%.
cybersphinx [Sat, 18 Aug 2012 11:00:16 +0000 (13:00 +0200)]
Disable translations below 80%.

Closes #3136.

5 years agoUpdate translations.
cybersphinx [Sat, 18 Aug 2012 10:43:12 +0000 (12:43 +0200)]
Update translations.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 13 Aug 2012 06:10:18 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoUse std::multiset::iterator instead of std::set::iterator with std::multiset.
Cyp [Sat, 11 Aug 2012 05:09:38 +0000 (07:09 +0200)]
Use std::multiset::iterator instead of std::set::iterator with std::multiset.

Apparently, the iterators were compatible, in some library implementations.

5 years agoRevert "Add last part of net patch (needs updated server code)."
vexed [Tue, 17 Jul 2012 01:58:07 +0000 (21:58 -0400)]
Revert "Add last part of net patch (needs updated server code)."

This reverts commit 329572779ae2e383b6bd668078ee4ecffe173dc4.

5 years agoRevert "Fix reported [-Werror=format] issue."
vexed [Tue, 17 Jul 2012 01:57:25 +0000 (21:57 -0400)]
Revert "Fix reported [-Werror=format] issue."

This reverts commit 0bfee185a38c1a354c14b33a064d13d81a03962f.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 10 Aug 2012 06:10:04 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoUpdate ChangeLog
Per Inge Mathisen [Wed, 8 Aug 2012 12:38:08 +0000 (14:38 +0200)]
Update ChangeLog

5 years agoFix missing decals in Rocky Mountains tileset that were specially made for it
Per Inge Mathisen [Wed, 8 Aug 2012 11:09:09 +0000 (13:09 +0200)]
Fix missing decals in Rocky Mountains tileset that were specially made for it
but never mentioned in the rockiedecals.txt file. It also fixes the ground
types of certain urban and rocky tiles to resemble the old 2.3 terrain more
exactly. Patch by NoQ. Closes ticket:3621

5 years agoRevert "Update translations."
cybersphinx [Tue, 7 Aug 2012 22:30:43 +0000 (00:30 +0200)]
Revert "Update translations."

This reverts commit adbabfa2cc333b7a8f681afd70d97aec325bce12.

5 years agoRevert "Update version numbers for 3.1 rc1."
cybersphinx [Tue, 7 Aug 2012 22:30:41 +0000 (00:30 +0200)]
Revert "Update version numbers for 3.1 rc1."

This reverts commit aa20a4f55edf825c3a26749652a8d93cdddee285.

5 years agoUpdate version numbers for 3.1 rc1. v3.1_rc1
cybersphinx [Tue, 7 Aug 2012 22:30:05 +0000 (00:30 +0200)]
Update version numbers for 3.1 rc1.

5 years agoUpdate translations.
cybersphinx [Tue, 7 Aug 2012 22:24:48 +0000 (00:24 +0200)]
Update translations.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Mon, 6 Aug 2012 18:22:13 +0000 (20:22 +0200)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.
  Add header for std::sort.

5 years agoAdd files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.
Cyp [Mon, 6 Aug 2012 17:19:34 +0000 (19:19 +0200)]
Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.

Fixes ticket:3646.

5 years agoAdd header for std::sort.
Cyp [Mon, 6 Aug 2012 06:58:50 +0000 (08:58 +0200)]
Add header for std::sort.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 6 Aug 2012 06:10:04 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoWarn when uplink and/or lassat is disabled.
Cyp [Sun, 5 Aug 2012 21:03:24 +0000 (23:03 +0200)]
Warn when uplink and/or lassat is disabled.

5 years agoSplit frontend*.png and intfac*.png into individual images.
Cyp [Sun, 5 Aug 2012 20:15:12 +0000 (22:15 +0200)]
Split frontend*.png and intfac*.png into individual images.

The images are now combined into texture pages at runtime.

This should simplify adding/removing images.

5 years agoCorrectly handle interface image texture pages which are not 256x256.
Cyp [Sun, 5 Aug 2012 05:07:16 +0000 (07:07 +0200)]
Correctly handle interface image texture pages which are not 256x256.

Game logo now appears full size.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 3 Aug 2012 06:10:07 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoAssert on collision of hashes of resource types or filenames.
Cyp [Thu, 2 Aug 2012 22:03:17 +0000 (00:03 +0200)]
Assert on collision of hashes of resource types or filenames.

This should be a minor improvement over silently retreiving the wrong resource on filename hash collisions.

5 years agoNo longer save default map, max players and map hash. Patch originally by vexed....
Per Inge Mathisen [Thu, 2 Aug 2012 19:18:07 +0000 (21:18 +0200)]
No longer save default map, max players and map hash. Patch originally by vexed. Closes ticket:3618

5 years agoMerge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes
Per Inge Mathisen [Wed, 1 Aug 2012 08:07:44 +0000 (10:07 +0200)]
Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes

5 years agoRemove unused lines of code from display.cpp
Per Inge Mathisen [Wed, 1 Aug 2012 08:06:52 +0000 (10:06 +0200)]
Remove unused lines of code from display.cpp

5 years agoMake improvements to the case where there is no codesign id.
dak180 [Tue, 31 Jul 2012 18:33:55 +0000 (14:33 -0400)]
Make improvements to the case where there is no codesign id.

5 years agoUse codesigning for the mac builds.
dak180 [Tue, 31 Jul 2012 01:43:14 +0000 (21:43 -0400)]
Use codesigning for the mac builds.

Requires the presence of 'macosx/configs/CS-ID.xcconfig' containing a valid codesign id listed in a CODE_SIGN_IDENTITY property.

5 years agoUpdate the changelog
Per Inge Mathisen [Mon, 30 Jul 2012 21:07:11 +0000 (23:07 +0200)]
Update the changelog

5 years agoUpdate nullbot to latest version. Rename nullbot include files to avoid spurious...
Per Inge Mathisen [Mon, 30 Jul 2012 21:04:51 +0000 (23:04 +0200)]
Update nullbot to latest version. Rename nullbot include files to avoid spurious qslint errors.

5 years agoDo not use std::string in a memory structure that is memset().
Per Inge Mathisen [Mon, 30 Jul 2012 20:16:16 +0000 (22:16 +0200)]
Do not use std::string in a memory structure that is memset().
Patch by tnmurphy, closes ticket:3620

5 years agoqt: Use QImage instead of QImageReader to load mouse cursor images.
Cyp [Mon, 30 Jul 2012 18:09:18 +0000 (20:09 +0200)]
qt: Use QImage instead of QImageReader to load mouse cursor images.

Some combination of QImageReader, QImage, QPixmap, QCursor and the wzfs wz:: virtual file system apparently doesn't
work in Qt 4.8.2 (but works in Qt 4.8.1).

The following error was printed (multiple times) to the shell:
QCursor: Cannot create bitmap cursor; invalid bitmap(s)

Fixes ticket:3562.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 30 Jul 2012 06:10:12 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoRun astyle over transport code to make it readable.
Per Inge Mathisen [Sat, 28 Jul 2012 12:14:25 +0000 (14:14 +0200)]
Run astyle over transport code to make it readable.

5 years agoRun astyle over mission code to make it readable.
Per Inge Mathisen [Sat, 28 Jul 2012 12:08:01 +0000 (14:08 +0200)]
Run astyle over mission code to make it readable.

5 years agoRemove dead code
Per Inge Mathisen [Sat, 28 Jul 2012 12:02:05 +0000 (14:02 +0200)]
Remove dead code

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 23 Jul 2012 06:10:05 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoDon't rename AI players.
Cyp [Sat, 14 Jul 2012 05:53:03 +0000 (07:53 +0200)]
Don't rename AI players.

With multiple AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, Nexus_3, or similar.

5 years agoFix reading of scavenger parameter in challenge files. Reported by KukY, closes ticke...
Per Inge Mathisen [Sat, 21 Jul 2012 17:45:23 +0000 (19:45 +0200)]
Fix reading of scavenger parameter in challenge files. Reported by KukY, closes ticket:3630

5 years agoUpdate glew to 1.8.0.
dak180 [Fri, 20 Jul 2012 17:03:50 +0000 (13:03 -0400)]
Update glew to 1.8.0.

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 16 Jul 2012 06:10:15 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoFix reported [-Werror=format] issue.
vexed [Mon, 16 Jul 2012 02:29:51 +0000 (22:29 -0400)]
Fix reported [-Werror=format] issue.

5 years agoNullBot by NoQ
vexed [Sun, 15 Jul 2012 19:30:59 +0000 (15:30 -0400)]
NullBot by NoQ

5 years agoAdd last part of net patch (needs updated server code).
vexed [Sun, 22 Jan 2012 02:12:25 +0000 (22:12 -0400)]
Add last part of net patch (needs updated server code).

5 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 13 Jul 2012 06:10:03 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoUpdate png to 1.5.12.
dak180 [Wed, 11 Jul 2012 02:46:06 +0000 (22:46 -0400)]
Update png to 1.5.12.

5 years agoFix reverse balanced tree lookup
Linus Lüssing [Mon, 2 Jul 2012 21:46:49 +0000 (23:46 +0200)]
Fix reverse balanced tree lookup

"Rechts ist da, wo der Daumen links ist."

Fixes ticket:3589.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
5 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 6 Jul 2012 06:10:02 +0000 (08:10 +0200)]
Merge branch 'bugfixes' into 3.1

5 years agoUpdate custom translations.
cybersphinx [Thu, 5 Jul 2012 20:20:38 +0000 (22:20 +0200)]
Update custom translations.

5 years agoTurkish translation update by Ayhan Görgülü.
cybersphinx [Thu, 5 Jul 2012 20:16:50 +0000 (22:16 +0200)]
Turkish translation update by Ayhan Görgülü.

Closes #3591.

5 years agoCatalan translation update by mecatxis.
cybersphinx [Thu, 5 Jul 2012 20:14:14 +0000 (22:14 +0200)]
Catalan translation update by mecatxis.

Closes #3582.

5 years agoFrench translation update by Amiral JCDG.
cybersphinx [Thu, 5 Jul 2012 20:12:06 +0000 (22:12 +0200)]
French translation update by Amiral JCDG.

Closes #3577.

5 years agoGerman translation update by Kreuvf.
cybersphinx [Thu, 5 Jul 2012 20:08:00 +0000 (22:08 +0200)]
German translation update by Kreuvf.

Closes #3564.

5 years agoPolish translation update by Emdek.
cybersphinx [Thu, 5 Jul 2012 19:59:39 +0000 (21:59 +0200)]
Polish translation update by Emdek.

Closes #1347.

5 years agoBump MAX_TERRAIN_TILES from 100 to 512.
Cyp [Thu, 5 Jul 2012 19:44:55 +0000 (21:44 +0200)]
Bump MAX_TERRAIN_TILES from 100 to 512.

5 years agoMerge branch 'bugfixes' into 3.1
safety0ff [Sat, 30 Jun 2012 01:24:59 +0000 (21:24 -0400)]
Merge branch 'bugfixes' into 3.1

5 years agoFix moving repair delivery points.
safety0ff [Sat, 30 Jun 2012 01:07:52 +0000 (21:07 -0400)]
Fix moving repair delivery points.

Closes #3581.

5 years agoMerge branch 'bugfixes' into 3.1
Cyp [Fri, 29 Jun 2012 15:10:11 +0000 (17:10 +0200)]
Merge branch 'bugfixes' into 3.1

Conflicts:
lib/ivis_opengl/screen.cpp

5 years agoReset research pending state even if research facility is destroyed.
Cyp [Fri, 29 Jun 2012 07:59:26 +0000 (09:59 +0200)]
Reset research pending state even if research facility is destroyed.

Destroyed research facilities can no longer permanently hog a research.

Steps to reproduce: Enable debug mode, slow down game speed to 0, destroy facility with Alt+K, start research, speed
  up game to normal speed. Research remained missing even after the facility exploded.

Fixes ticket:3570.

5 years agoDo not halt production on template becoming redundant.
Cyp [Fri, 29 Jun 2012 07:44:21 +0000 (09:44 +0200)]
Do not halt production on template becoming redundant.

Production would halt until the redundant tank was manually removed from the build order.

5 years agoAdd a bit of overly-paranoid checking, to detect hard drive failures, or similar.
Cyp [Fri, 29 Jun 2012 07:01:42 +0000 (09:01 +0200)]
Add a bit of overly-paranoid checking, to detect hard drive failures, or similar.

5 years agoAlways initialize shader usage setting.
safety0ff [Wed, 27 Jun 2012 13:33:58 +0000 (09:33 -0400)]
Always initialize shader usage setting.

5 years agoAdd settings / UI support for shaders without tex_env_crossbar (added in 64a3cc1).
safety0ff [Wed, 27 Jun 2012 02:03:22 +0000 (22:03 -0400)]
Add settings / UI support for shaders without tex_env_crossbar (added in 64a3cc1).

5 years agoDon't require texture_env_crossbar for shaders.
safety0ff [Tue, 26 Jun 2012 14:11:45 +0000 (10:11 -0400)]
Don't require texture_env_crossbar for shaders.

Refs. #3575.

5 years agoAnd even more log spam to help track down current issues.
vexed [Tue, 26 Jun 2012 02:32:40 +0000 (22:32 -0400)]
And even more log spam to help track down current issues.

5 years agoLet's not hide error messages, and add more debugging to track down a few
vexed [Tue, 26 Jun 2012 02:31:25 +0000 (22:31 -0400)]
Let's not hide error messages, and add more debugging to track down a few
issues

5 years agoRevert "Fix blueprint alignment and snap modules."
safety0ff [Sat, 23 Jun 2012 19:26:56 +0000 (15:26 -0400)]
Revert "Fix blueprint alignment and snap modules."

This reverts commit 581d65411e714bec6c5b0e783dbaa705ff6a38c4.

5 years agoFix minor memory leak on loading/unloading transporters.
Cyp [Sat, 23 Jun 2012 14:39:24 +0000 (16:39 +0200)]
Fix minor memory leak on loading/unloading transporters.

DROID::sMove.asPath is set to NULL on unloading droids, but was never freed.

Also, clear any remaining pathfinding job for the droid on loading transporter.

5 years agoFix uninitialised variable usage on removing repair facilities.
Cyp [Sat, 23 Jun 2012 14:24:14 +0000 (16:24 +0200)]
Fix uninitialised variable usage on removing repair facilities.

See previous commit.

5 years agoqtscript: Add new function that returns unit limit(s).
Per Inge Mathisen [Sat, 23 Jun 2012 11:06:58 +0000 (13:06 +0200)]
qtscript: Add new function that returns unit limit(s).

5 years agoFix compilation on non-x86 platforms.
safety0ff [Thu, 21 Jun 2012 22:43:29 +0000 (18:43 -0400)]
Fix compilation on non-x86 platforms.

Refs. #3558.

5 years agoFix dangling pointer when structures are destroyed and you are repositioning the...
safety0ff [Thu, 21 Jun 2012 22:34:04 +0000 (18:34 -0400)]
Fix dangling pointer when structures are destroyed and you are repositioning the delivery point.

Untangles delivery points code from building placement code.
You can no longer "quick queue" units from the debug menu.

Fixes #2041.

5 years agoFix blueprint alignment and snap modules.
safety0ff [Thu, 21 Jun 2012 22:22:55 +0000 (18:22 -0400)]
Fix blueprint alignment and snap modules.

Closes #3466.

5 years agoCleanup: Remove unused mendVtol() function and fix excess indentation.
Cyp [Thu, 21 Jun 2012 09:26:02 +0000 (11:26 +0200)]
Cleanup: Remove unused mendVtol() function and fix excess indentation.

5 years agoRename DROID::sMove.iAttackRuns[i] to DROID::asWeaps[i].usedAmmo.
Cyp [Thu, 21 Jun 2012 10:04:08 +0000 (12:04 +0200)]
Rename DROID::sMove.iAttackRuns[i] to DROID::asWeaps[i].usedAmmo.

The sMove structure is cleared when unloading from transports, and it makes no sense to think of used ammo as pathfinding-related, anyway.

Fixes ticket:3554.

5 years agoDon't require OpenGL extensions to be reported, if present in the reported OpenGL...
Cyp [Thu, 21 Jun 2012 07:31:02 +0000 (09:31 +0200)]
Don't require OpenGL extensions to be reported, if present in the reported OpenGL version.

5 years agoSave and load map hashes in config file.
Cyp [Wed, 20 Jun 2012 09:26:54 +0000 (11:26 +0200)]
Save and load map hashes in config file.

This prevents a zero hash from being sent by the host when the user has not selected the map between starting the
program and hosting. This also means remembering exactly which map was last used, even if multiple maps have the
same name.

5 years agoRevert "Update translations."
cybersphinx [Tue, 19 Jun 2012 23:49:00 +0000 (01:49 +0200)]
Revert "Update translations."

This reverts commit 8d8539fba9757da4dc12f60056fb1f19ea1a9ff6.

5 years agoRevert "Update version numbers for 3.1 beta11."
cybersphinx [Tue, 19 Jun 2012 23:48:59 +0000 (01:48 +0200)]
Revert "Update version numbers for 3.1 beta11."

This reverts commit e8a51a2ec434b683c938797cdb80612e0866c52e.

5 years agoUpdate version numbers for 3.1 beta11. v3.1_beta11
cybersphinx [Tue, 19 Jun 2012 23:17:02 +0000 (01:17 +0200)]
Update version numbers for 3.1 beta11.

5 years agoUpdate translations.
cybersphinx [Tue, 19 Jun 2012 23:13:23 +0000 (01:13 +0200)]
Update translations.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Tue, 19 Jun 2012 23:11:30 +0000 (01:11 +0200)]
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.

5 years agoUpdate translations.
cybersphinx [Tue, 19 Jun 2012 23:11:15 +0000 (01:11 +0200)]
Update translations.

5 years agoUpdate the mac doc bundle.
dak180 [Tue, 19 Jun 2012 23:01:40 +0000 (19:01 -0400)]
Update the mac doc bundle.

5 years agoUpdate ChangeLog.
cybersphinx [Tue, 19 Jun 2012 22:54:07 +0000 (00:54 +0200)]
Update ChangeLog.

5 years agoRemove unused variable, and fix some narrowing stuff.
cybersphinx [Tue, 19 Jun 2012 21:17:10 +0000 (23:17 +0200)]
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.

5 years agoFix loading of campaign savegames.
Cyp [Tue, 19 Jun 2012 08:31:34 +0000 (10:31 +0200)]
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 15c04ab10f87de89ca7dcae2813834bd1a03247b.

5 years agoMerge branches 'screenscalehack' and 'bugfixes' into 3.1
Cyp [Tue, 19 Jun 2012 07:42:52 +0000 (09:42 +0200)]
Merge branches 'screenscalehack' and 'bugfixes' into 3.1

Conflicts with 'bugfixes':
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
src/clparse.cpp

5 years agoDon't convert to a platform specific string here, it causes bad things to happen.
vexed [Tue, 19 Jun 2012 02:57:42 +0000 (22:57 -0400)]
Don't convert to a platform specific string here, it causes bad things 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. "

5 years agoUpdate ChangeLog.
Cyp [Mon, 18 Jun 2012 23:56:26 +0000 (01:56 +0200)]
Update ChangeLog.

5 years agoHandle different maps with identical names, instead of a desynch.
Cyp [Mon, 18 Jun 2012 15:24:06 +0000 (17:24 +0200)]
Handle different maps with identical names, instead of a desynch.

Fixes ticket:3531 and ticket:3180.

5 years agoAdd shader toggle UI.
safety0ff [Mon, 18 Jun 2012 23:44:38 +0000 (19:44 -0400)]
Add shader toggle UI.

5 years ago"Fix" object selection bounding boxes and clicking on terrain, by scaling by a random...
Cyp [Mon, 18 Jun 2012 20:05:52 +0000 (22:05 +0200)]
"Fix" object selection bounding boxes and clicking on terrain, by scaling by a random factor.

This shouldn't work, but works in the sense that two wrongs make a right, two bugs make a feature.