Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Warzone2100/warzone2100
base: v3.1_beta7
...
head fork: Warzone2100/warzone2100
compare: v3.1_beta8
Commits on Mar 18, 2012
@cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta7." a6b9d6d
@cybersphinx cybersphinx Update files to translate. b63f7a0
@cybersphinx cybersphinx Update translations. 3262432
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update translations.
  Update files to translate.
09c5d84
Commits on Mar 19, 2012
@nanotech nanotech OS X Crash Dialog: Open the /user's/ log folder.
Tilde roots are ignored in file urls.
153bd91
@nanotech nanotech OS X Crash Dialog: Open log folders after Trac.
Better chance of the log folders not getting
hidden behind a large browser window.
6003273
Commits on Mar 20, 2012
@perim perim Fix problem with trucks not being available before HQ. This closes
ticket:3344 and closes ticket:3337 and adds new qtscript function
enableTemplate(). Original patch by vexed.
7291bb9
@perim perim Fix problem with continent generation, where rightmost and bottommost
tiles would be treated as passable. Closes ticket:3269. Thanks to NoQ
for debugging.
3bd70ae
@perim perim Update changelog d89dbd0
Commits on Mar 23, 2012
@vexed vexed Don't display repair icon if we are hovering the mouse over ourselves…
…, and we are damaged.

fixes ticket:3242
1fae454
@vexed vexed Try to switch to windowed mode if user is in FS mode on LOG_FATAL err…
…ors. This may, or may not work on some platforms. (http://www.libsdl.org/docs/html/sdlwmtogglefullscreen.html) "Toggles the application between windowed and fullscreen mode, if supported."

closes ticket:3144
8ed5fe5
Commits on Mar 24, 2012
@perim perim 3.1: Fix production of barbarian foot soldiers. They were classified as
heavy bodies, when factory only could produce light bodies. Closes ticket:3358
scavfact.js: Remove useless conversions to world coordinates. Closes ticket:3356
951abc1
@vexed vexed Fix border on tooltips 451201e
@vexed vexed Try to fix the output of netlogs. 8db07f4
@vexed vexed Fix the lock icon to always show it being locked when a password is set.
Remove the box when we don't use a password & in skirmish games.

refs ticket:3357
bd6c1d2
Commits on Mar 25, 2012
@Cyp Cyp Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD. 73f089c
@Cyp Cyp Distinguish between wrong version, wrong mod and full game.
Using IMAGE_NOJOIN, IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD, respectively.
dc6a4b3
@Cyp Cyp Subtract closed slots from displayed max players.
For example, in a 6 player map with 2 players and 2 closed slots, show 2/4 instead
of 4/6.
0c5aebf
Commits on Mar 26, 2012
@vexed vexed Add debug command "damage me" to facilitate debugging issues related to
damage level.
Note: you can't kill a droid / structure with this command.
Used to debug retreat levels & autorepair issues & ...
2f1e063
@vexed vexed Handle host drop errors.
Restart the background screen on errors (instead of looking at a small map preview)

fixes ticket:3313
0de4f38
@vexed vexed Don't bother even checking to send maps if not host. 556bbc0
@Cyp Cyp Avoid mixing up droid orders during lag.
Droid were sorted (in order to better compress net data) and queued, each game tick.
During lag, multiple build orders could be queued, and executed in an unintended order
due to being sorted. Queueing droid orders immediately after processing user input
should fix this, while maintaining net data size efficiency.
83f7ade
@cybersphinx cybersphinx Disable unit design when HQ gets destroyed in mp.
Fixes #3342.
466880e
@cybersphinx cybersphinx Make unit design/radar depend on the existence of an HQ, not the base…
… setting.
d0fc1e5
@cybersphinx cybersphinx Update translations. 183bb53
@cybersphinx cybersphinx Spanish translation update by Saberuneko.
Closes #3361.
a018ecd
Commits on Mar 28, 2012
@cybersphinx cybersphinx Actually use the include from our included quesoglc.
Fixes #3098.
fad926f
Commits on Mar 29, 2012
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes: (22 commits)
  Actually use the include from our included quesoglc.
  Spanish translation update by Saberuneko.
  Update translations.
  Make unit design/radar depend on the existence of an HQ, not the base setting.
  Disable unit design when HQ gets destroyed in mp.
  Avoid mixing up droid orders during lag.
  Don't bother even checking to send maps if not host.
  Handle host drop errors. Restart the background screen on errors (instead of looking at a small map preview)
  Add debug command "damage me" to facilitate debugging issues related to damage level. Note: you can't kill a droid / structure with this command. Used to debug retreat levels & autorepair issues & ...
  Subtract closed slots from displayed max players.
  Distinguish between wrong version, wrong mod and full game.
  Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD.
  Fix the lock icon to always show it being locked when a password is set. Remove the box when we don't use a password & in skirmish games.
  Try to fix the output of netlogs.
  Fix border on tooltips
  Try to switch to windowed mode if user is in FS mode on LOG_FATAL errors. This may, or may not work on some platforms. (http://www.libsdl.org/docs/html/sdlwmtogglefullscreen.html) "Toggles the application between windowed and fullscreen mode, if supported."
  Don't display repair icon if we are hovering the mouse over ourselves, and we are damaged.
  Update changelog
  Fix problem with continent generation, where rightmost and bottommost tiles would be treated as passable. Closes ticket:3269. Thanks to NoQ for debugging.
  Fix problem with trucks not being available before HQ. This closes ticket:3344 and closes ticket:3337 and adds new qtscript function enableTemplate(). Original patch by vexed.
  ...
5e1740a
@dak180 dak180 Make the FetchPrebuilt script smarter about replacing incorrect tarba…
…lls.
fa67c45
Commits on Mar 30, 2012
@Cyp Cyp Fix clockwise skidding.
Droids (mainly hover and VTOLs) would skid when turning anti-clockwise, but not when
turning clockwise.
8283ac4
Commits on Mar 31, 2012
@Cyp Cyp Synchronise game random seed randomly at game start.
The generated synchronised pseudorandom number sequence will now vary from game to game.
ea243df
@Cyp Cyp Synchronise barrel and artefact placement.
Artefacts are now dropped by factories, again. Even if the structure was destroyed
without using debug mode.
29966c5
@dak180 dak180 Update the mac documents package. 7170a60
@dak180 dak180 Update Png to 1.5.10. 359a035
@Cyp Cyp Avoid orders given to tanks of wrong player. 995d124
@vexed vexed Don't assert when babas burn to death, and the pointer is still in th…
…e active list (apsDroidLists)

or that pointer is still "in use" by another droid, and also clean up the messages and attribute them to LOG_DEATH.

refs: 3905de3
fe80d02
@vexed vexed Fix screen shake to only shake on things that are explosive by nature,
(power plants, factories, etc), and not on walls.
Change shake time to be in proportion to what was destroyed, minimal
time for features (skyscrapers), to a longer time for a laSat blast.
3384267
@vexed vexed Fix release builds, busted in fe80d02 f6fe0b7
Commits on Apr 01, 2012
@Cyp Cyp Restore missing check, so artefacts are only dropped by factories.
Check went missing in 29966c5. (Although the entire
function was skipped before 29966c5.)
aaeaa41
Commits on Apr 04, 2012
@vexed vexed Don't prevent the use of the scroll wheel when the build / research /…
… design / whatever window isn't up yet.
37a8ee7
@vexed vexed Don't spawn artifacts in campaign games, that is only done via script…
…s, since they serve a specific function in the campaign.

fixes ticket:3375
8e48e9e
@vexed vexed Don't scale the font, just use the regular size when displaying meter. 7665041
@vexed vexed Make it more obvious the game is free to anyone who wants it.
Thanks to Kreuvf for the wording.
f2dd8a0
@vexed vexed Revert back to flashing the intel button by default. (New players to …
…the game have no idea what "New Intelligence Report" meant if they don't have the vids installed)
361212d
Commits on Apr 09, 2012
@cybersphinx cybersphinx Remove trailing commas from the research messages.
Also remove the workaround to remove the resulting empty strings
introduced in 9799722. Refs #3039.
c01be76
@cybersphinx cybersphinx Prevent % in research messages from breaking translations.
Translate research messages on loading, and replace %% with %. Research
messages should now use %% for % in ambiguous cases. Fixes #3376.
5659911
@cybersphinx cybersphinx Polish translation update by Emdek.
Closes #1347.
c0d7331
@cybersphinx cybersphinx Update translations. f5f61d0
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update translations.
  Polish translation update by Emdek.
  Prevent % in research messages from breaking translations.
  Remove trailing commas from the research messages.
  Revert back to flashing the intel button by default. (New players to the game have no idea what "New Intelligence Report" meant if they don't have the vids installed)
  Make it more obvious the game is free to anyone who wants it. Thanks to Kreuvf for the wording.
  Don't scale the font, just use the regular size when displaying meter.
  Don't spawn artifacts in campaign games, that is only done via scripts, since they serve a specific function in the campaign.
  Don't prevent the use of the scroll wheel when the build / research / design / whatever window isn't up yet.
  Restore missing check, so artefacts are only dropped by factories.
  Fix release builds, busted in fe80d02
  Fix screen shake to only shake on things that are explosive by nature, (power plants, factories, etc), and not on walls. Change shake time to be in proportion to what was destroyed, minimal time for features (skyscrapers), to a longer time for a laSat blast.
  Don't assert when babas burn to death, and the pointer is still in the active list (apsDroidLists) or that pointer is still "in use" by another droid, and also clean up the messages and attribute them to LOG_DEATH.
  Avoid orders given to tanks of wrong player.
  Update Png to 1.5.10.
  Update the mac documents package.
  Synchronise barrel and artefact placement.
  Synchronise game random seed randomly at game start.
  Fix clockwise skidding.
  Make the FetchPrebuilt script smarter about replacing incorrect tarballs.
079087a
Commits on Apr 10, 2012
@dak180 dak180 Use Clang wherever possible. a00bab1
Commits on Apr 11, 2012
@perim perim Keep default secondary order from droid initialization if no replacem…
…ent order found in savegame. Should fix ticket:3359
be37535
Commits on Apr 19, 2012
@cybersphinx cybersphinx Hungarian translation update by mtomi78.
Closes #3412.
b9d6e17
@cybersphinx cybersphinx Map fixes and updates: GreatRift, MizaMaze, Wheel.
Thanks to NoQ. Closes #2857, refs #3317.
0ad1b22
Commits on Apr 22, 2012
@perim perim Fix save game load crash due to dangling, dead target from structures. 7c3e66d
@cybersphinx cybersphinx Polish translation update by Emdek.
Closes #1347.
a67868f
@cybersphinx cybersphinx Hungarian translation update by mtomi78.
Closes #3412.
188b4ac
@cybersphinx cybersphinx Brazilian translation update by Tucalipe.
Closes #3415.
74bd1b1
@cybersphinx cybersphinx VA-based fallback for terrain renderer.
Patch adds VA-based fallback for terrain render, thus lowering OpenGL
requirements from 1.4+vbo ext to 1.2 for this component. TCMask uses
texture crossbar feature from 1.4 (or 1.3+ext). Patch by I-NoD.
Refs #3248.
fb42df2
@cybersphinx cybersphinx Split --fallbackmode into --noshaders and --novbos.
Closes #3248.
d9e35f1
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Brazilian translation update by Tucalipe.
  Hungarian translation update by mtomi78.
  Polish translation update by Emdek.
  Fix save game load crash due to dangling, dead target from structures.
  Map fixes and updates: GreatRift, MizaMaze, Wheel.
  Hungarian translation update by mtomi78.
  Keep default secondary order from droid initialization if no replacement order found in savegame. Should fix ticket:3359
  Use Clang wherever possible.
6ed2964
@cybersphinx cybersphinx Skip oil resources that would crash the game in the map preview.
Refs #3247.
1974546
@cybersphinx cybersphinx Turkish translation update by Ayhan Görgülü.
Closes #3417.
1312836
@cybersphinx cybersphinx Update player number for lint.cpp and the map conversion tools. bfbe5bb
@cybersphinx cybersphinx Update ChangeLog. 8714011
@Cyp Cyp Make pink/purple and orange/yellow more distinguishable on radar. ceb0505
@cybersphinx cybersphinx German translation update by Kreuvf.
Closes #3418.
2be5c08
@cybersphinx cybersphinx Update ChangeLog. e7a6428
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  German translation update by Kreuvf.
  Make pink/purple and orange/yellow more distinguishable on radar.
  Update ChangeLog.
  Update player number for lint.cpp and the map conversion tools.
  Turkish translation update by Ayhan Görgülü.
a7a007a
@dak180 dak180 Update the mac doc bundle. dfae0b1
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update the mac doc bundle.
bbe4066
@cybersphinx cybersphinx Update translations. 5996b89
@cybersphinx cybersphinx Update version numbers for 3.1 beta8. 7dc7d95