Skip to content

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Feb 25, 2012
@dak180 dak180 Add a note to prevent repeats of c6a37b4. bd44c3f
@dak180 dak180 Update the MapUtilities xcode project. a1fc808
@dak180 dak180 Add an xcode project to run the tests.
Also makes the qslint command line program.
c91f51a
Commits on Feb 26, 2012
@vexed vexed Create new droid type, DROID_SUPERTRANSPORTER.
fixes ticket:3196
fcede64
@cybersphinx cybersphinx Don't remove autorevision.h on make clean.
Otherwise building from a tarball fails after make (dist)clean.
13fba99
@cybersphinx cybersphinx Russian translation update by Vadim S. Sabinich.
Closes #3221.
f627fd8
@cybersphinx cybersphinx German translation update by Kreuvf.
Closes #3205.
6f5bf39
@vexed vexed Apply rest of the patch that was mistakenly left out of
fcede64
Thanks to cybersphinx for the heads up.
6bc90e6
@vexed vexed Scale the transporter & Super Transporter on the scoreboard screen.
Fixes ticket:3210
475d1e6
Commits on Feb 28, 2012
@vexed vexed Fix transporter check for SP games.
Add some FIXME comments when we properly fix the campaign scripts.
Expose DROID_SUPERTRANSPORTER to the script engine
Fix gifting of the Super Transporter, along with some other fixes.
Fixes ticket:3224
9e63fe3
@cybersphinx cybersphinx Revert "qtscript: Do not call destroyed event twice for each object."
This reverts commit a51de16.
Fixes #3175.
4f72225
@cybersphinx cybersphinx Enable the OpenGL 1.4/VBO fallback on Macs.
Removes some ifdefs that were cargo culted along for years. Rejoice,
Intel GMA 950 users! Refs #3166.
b38b2f5
@cybersphinx cybersphinx cleanup: Remove redundant QScriptEngines. 4e00759
@cybersphinx cybersphinx cleanup: Remove unused define. e5e0f72
@vexed vexed Merge branch 'bugfixes' into 3.1 9e6c534
@Cyp Cyp Try to be more consistent with gameTime usage.
When updating the game state, we now determine what happened in the interval
[gameTime - deltaGameTime + 1; gameTime]. The time gameTime - deltaGameTime is now
considered to be in the past, so the game state may be modified at time
gameTime - deltaGameTime + 1, at the earliest.

During GAME_* message processing, deltaGameTime is 0, however it is still considered
valid to change the game state at gameTime - deltaGameTime + 1, since that will lie
within the following update interval.

Refs ticket:3175.
f6dce9d
@Cyp Cyp Show allied unit counts.
Simplify displayMultiPlayer(), fix some duplicate and some quintuplicate code.
2a33cd1
@cybersphinx cybersphinx Don't remove autorevision.h on make clean, take 2.
Seems 13fba99 breaks building when no
autorevision.h exists.
19be9fc
@Cyp Cyp Reduce tank dancing.
In moveShuffleDroid(), do not iterate over all of own droids on map (optimisation), but
include other player's droids (change).

In moveReachedWayPoint(), increase tolerance of final waypoint, if the droid's path is
blocked, since the most likely cause of the blockage is other droids trying to going to
the same place.

Patrol is no longer useless in groups of 4-or-so or more droids.

Fixes ticket:2996.
0b7605c
@Cyp Cyp Clean up actionVTOLLandingPos() interface.
Program logic should be unchanged.
ce3e76c
@Cyp Cyp Do not land all 150 VTOLs on the same tile. 9dcf5bd
@Cyp Cyp Make "Go to Transport" button work sensibly.
Droids now go to the nearest transport that they can fit in. Even if they're not
cyborgs. And even if there's a transporter on the other side of the map that they
could go to, instead of going to the one standing right next to them.
2d938a0
@Cyp Cyp Do not complain to all players in game, on attempted loading of tank …
…on cyborg transport.

Announcing to everyone makes surprise attacks with transports harder, if accidentally
telling a tank to go onto a transport.
06e161a
Commits on Feb 29, 2012
@cybersphinx cybersphinx Polish translation update by Emdek.
Closes #1347. Again.
2042b60
@cybersphinx cybersphinx French translation update by Amiral JCDG. a26aa5f
@vexed vexed Explain how the cursor system works a bit better, and make it easier …
…to edit these blasted things.

Created a external file called cursorselection, that can be loaded into a spreadsheet for easy editing.
addcb20
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Explain how the cursor system works a bit better, and make it easier to edit these blasted things. Created a external file called cursorselection, that can be loaded into a spreadsheet for easy editing.
  French translation update by Amiral JCDG.
  Polish translation update by Emdek.
  Do not complain to all players in game, on attempted loading of tank on cyborg transport.
  Make "Go to Transport" button work sensibly.
  Do not land all 150 VTOLs on the same tile.
  Clean up actionVTOLLandingPos() interface.
  Reduce tank dancing.
  Don't remove autorevision.h on make clean, take 2.
  Show allied unit counts.
  Try to be more consistent with gameTime usage.
  cleanup: Remove unused define.
  cleanup: Remove redundant QScriptEngines.
  Enable the OpenGL 1.4/VBO fallback on Macs.
  Revert "qtscript: Do not call destroyed event twice for each object."
caeca03
@dak180 dak180 Add the cursorselection file to the xcode project. 180cd3a
Commits on Mar 02, 2012
@vexed vexed Don't display the demolish cursor over unbuilt structures.
fixes ticket:3118
9909551
@vexed vexed Try not to allow multiple mouse presses when trying to kick people ou…
…t of game.

closes ticket:3209
bc65f97
@vexed vexed Don't assume we are still in demolish mode if not a droid type that c…
…an't do that.

fixes ticket:2106
6cc205c
Commits on Mar 03, 2012
@Cyp Cyp Allow Super+click as alternative to Meta+click or Alt+click.
The Qt and SDL backends seem to call the Tux key Meta and Super, respectively. This
makes Tux+click work with the SDL backend.
28f0503
Commits on Mar 04, 2012
@Cyp Cyp Fix dead pointer usage following lone droids dying during repair at r…
…epair facility.

Despite checking for REPAIR_FACILITY::psObj->died, REPAIR_FACILITY::psObj was not reliably
set to NULL afterwards. This probably resulted in hard-to-reproduce desynchs.

Hopefully fixes ticket:3237.
6817a99
@Cyp Cyp Show milliseconds, if game speed is set to very slow.
Useful for keeping track of game state updates when debugging. Game state updates happen
every 100 ms, at time 00:00.002, 00:00.102, 00:00.202, etc….
3a1568d
@dak180 dak180 Add pie(state|types).h to the xcode project. 2665e23
@buginator buginator Muzzle flash fix for Assault Cannon & Cluster/HEAP Bomb projectile's …
…texture fix

and
fix TCmask for Plasmite Flamer AA Flak Cannon Sunburst AA Rocket Array

Closes ticket:3243.

Author: Black Project

(cherry picked from commit 54646f0)

Conflicts:

	data/base/components/weapons/trmair2.pie
	data/base/components/weapons/trmair3.pie
	data/base/effects/fxvulcan.pie
9d8e7ce
@Cyp Cyp Don't waste 200 ms before droids start moving.
The droid no longer spends 100 ms changing psDroid->sMove.Status from MOVEWAITROUTE to
MOVENAVIGATE plus 100 ms changing from MOVENAVIGATE to MOVEPOINTTOPOINT, before starting
to move.

This changes the average response time of trucks to a move order from 450 ms to 250 ms.
f36cb96
Commits on Mar 09, 2012
@dak180 dak180 Fix and reorganize dependencies for the mac builds of the tests.
Also eliminate a few useless warnings.
4840937
@dak180 dak180 Add qslint to the Warzone app bundle.
This should help mac modders test their scripts.

Also run the tests when making the dmgs.
d05472d
@dak180 dak180 Get rid of useless warnings, take 2.
Xcode hates comments.
1ef7c6c
Commits on Mar 10, 2012
@cybersphinx cybersphinx linux: Make gdb backtrace all threads.
Refs #3228.
a766d00
@cybersphinx cybersphinx cleanup: Put bHosted into multiint.h. e8f9fe2
@cybersphinx cybersphinx Don't try to send limit data before hosting a game.
Fixes #3197.
10d6ddd
@cybersphinx cybersphinx dpkg: No more mods.
Fixes #3249.
ece0236
@cybersphinx cybersphinx maint: Update mailing list address. fa90933
@cybersphinx cybersphinx Prevent division by zero in interpolateSpacetime().
Fixes #3037.
0f67521
@cybersphinx cybersphinx cleanup: Constify and match interpolatePos and interpolateAngle. e1291dc
@cybersphinx cybersphinx Remove useless duplicate line.
Introduced in 9a005ac. Refs #3264.
0d06f97
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes: (21 commits)
  Remove useless duplicate line.
  cleanup: Constify and match interpolatePos and interpolateAngle.
  Prevent division by zero in interpolateSpacetime().
  maint: Update mailing list address.
  dpkg: No more mods.
  Don't try to send limit data before hosting a game.
  cleanup: Put bHosted into multiint.h.
  linux: Make gdb backtrace all threads.
  Get rid of useless warnings, take 2.
  Add qslint to the Warzone app bundle.
  Fix and reorganize dependencies for the mac builds of the tests.
  Don't waste 200 ms before droids start moving.
  Muzzle flash fix for Assault Cannon & Cluster/HEAP Bomb projectile's texture fix and fix TCmask for Plasmite Flamer AA Flak Cannon Sunburst AA Rocket Array
  Add pie(state|types).h to the xcode project.
  Show milliseconds, if game speed is set to very slow.
  Fix dead pointer usage following lone droids dying during repair at repair facility.
  Allow Super+click as alternative to Meta+click or Alt+click.
  Don't assume we are still in demolish mode if not a droid type that can't do that. fixes ticket:2106
  Try not to allow multiple mouse presses when trying to kick people out of game. closes ticket:3209
  Don't display the demolish cursor over unbuilt structures. fixes ticket:3118
  ...
bc79512
@cybersphinx cybersphinx dpkg: Update package version number for 3.1. a0b35f7
@Cyp Cyp Check sender/receiver. af5f329
@Cyp Cyp When targetting using sensors, use action target of droids doing DACT…
…ION_OBSERVE.

Previous behaviour was to use order target, independently of whether the droid was doing DORDER_OBSERVE.

Artillery no longer shoots at oil barrels being picked up by sensor tanks.

Fixes ticket:1281.
42017f5
@Cyp Cyp Make destroyed half built structures burn half time.
Except in the case of derricks, or in the case of adding oil wells in debug mode where
the structure was, this is just a visual change.

Clean up destroyStruct() slightly.
f6ddbf1
@Cyp Cyp Return power on changing template in production.
If changing a template which was currently in production, the production was cancelled
without returning the power.

Fixes ticket:3266.
2985840
Commits on Mar 11, 2012
@Cyp Cyp Let AIs pick up barrels and artifacts if using DORDER_RECOVER.
Fixes ticket:3251.
8949148
@Cyp Cyp Fix divide-by-0 in updateFire() on effect with zero lifespan.
Probably triggered by f6ddbf1 on destruction of 0%-built
derrick.
d1675c4
@Cyp Cyp Disable target prediction for droids that are trying to drive through…
… stuff.

This implies that if the droid suddenly figures out how to tunnel through the wall it
was trying to drive through for the last half hour, the shot will miss.
a94bd66
Commits on Mar 12, 2012
@Cyp Cyp Try to avoid pointers to stack getting saved.
Also, fix a harmless out of bounds »myUnusedPointer = &myVector[myVector.size()]«.

Introduced in d818ff5.

Hopefully fixes ticket:3200.
da9d427
@Emdek Emdek Squeeze out additional 50 pixels for menu texts (preserving 640x480 c…
…ompatibility)

Refs #2650.
fc0348a
@Emdek Emdek Make keyboard mapping editor more consistent with menu d364a00
@Emdek Emdek Make in game options a bit wider (to give more room for translations)…
… and improve sound options margins

Refs #2650.
f24ce24
@Emdek Emdek Better descriptions for the unit colour options.
Also moves the rotating radar option into graphics options.
unitcolouroptions5.diff, closes #3265.
4a6be03
@cybersphinx cybersphinx French translation update by Amiral JCDG.
Closes #3276.
2c093a6
@cybersphinx cybersphinx Update translations. c363c62
@cybersphinx cybersphinx Clear out blueprints when ending a game.
Fixes #3181.
8c034fe
@cybersphinx cybersphinx Don't let the radar handle already processed events.
Fixes #3179.
6e0c364
@cybersphinx cybersphinx Display game speed as decimals, not fractions.
Also add 0.5. Refs #3277.
f05142c
@vexed vexed Use lower-res textures as default. 589b5ab
@cybersphinx cybersphinx Update ChangeLog. 5d69236
@dak180 dak180 Get rid of useless warnings, take 2. ddd61cb
@cybersphinx cybersphinx Properly scale the transports in the research list.
Refs #3277.
7f6ad1d
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1 0718856
@dak180 dak180 Update the mac doc bundle. e0aadce
@dak180 dak180 Merge branch 'bugfixes' into 3.1
* topic/bugfixes:
  Update the mac doc bundle.
ab101da
@cybersphinx cybersphinx Update version numbers for 3.1_beta5. f2ec5b4