From: cybersphinx <ch...@gm...> - 2012-02-29 04:11:31
|
Branch: refs/heads/3.1 Home: https://github.com/Warzone2100/warzone2100 Commit: f6dce9d6322f8d2309922dc58a31ce21c4bdaafe https://github.com/Warzone2100/warzone2100/commit/f6dce9d6322f8d2309922dc58a31ce21c4bdaafe Author: Cyp <cy...@wz...> Date: 2012-02-27 (Mon, 27 Feb 2012) Changed paths: M lib/gamelib/animobj.cpp M src/combat.cpp M src/component.cpp M src/droid.cpp M src/feature.cpp M src/move.cpp M src/multibot.cpp M src/multiplay.cpp M src/multistruct.cpp M src/objmem.cpp M src/projectile.cpp M src/projectiledef.h M src/structure.cpp Log Message: ----------- 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. Commit: 2a33cd129b52b013c188ae812511064f24b9c651 https://github.com/Warzone2100/warzone2100/commit/2a33cd129b52b013c188ae812511064f24b9c651 Author: Cyp <cy...@wz...> Date: 2012-02-27 (Mon, 27 Feb 2012) Changed paths: M src/multimenu.cpp Log Message: ----------- Show allied unit counts. Simplify displayMultiPlayer(), fix some duplicate and some quintuplicate code. Commit: 19be9fc3b707b2cca8b53553d38662704f5be1b3 https://github.com/Warzone2100/warzone2100/commit/19be9fc3b707b2cca8b53553d38662704f5be1b3 Author: cybersphinx <ch...@gm...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/Makefile.am Log Message: ----------- Don't remove autorevision.h on make clean, take 2. Seems 13fba992e76fcaecc25d58e6086f0217b2acba04 breaks building when no autorevision.h exists. Commit: 0b7605c4ee9464f5966a31d6523fb7e248f4323a https://github.com/Warzone2100/warzone2100/commit/0b7605c4ee9464f5966a31d6523fb7e248f4323a Author: Cyp <cy...@wz...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/move.cpp Log Message: ----------- 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. Commit: ce3e76cd62293c107ce8c82ec564d39dad6779ee https://github.com/Warzone2100/warzone2100/commit/ce3e76cd62293c107ce8c82ec564d39dad6779ee Author: Cyp <cy...@wz...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/action.cpp M src/action.h M src/move.cpp M src/order.cpp M src/structure.cpp Log Message: ----------- Clean up actionVTOLLandingPos() interface. Program logic should be unchanged. Commit: 9dcf5bdf4eb4d590ea15e1c5201ceefe0819a5dc https://github.com/Warzone2100/warzone2100/commit/9dcf5bdf4eb4d590ea15e1c5201ceefe0819a5dc Author: Cyp <cy...@wz...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/move.cpp Log Message: ----------- Do not land all 150 VTOLs on the same tile. Commit: 2d938a0323e5c47ce4a41c9fb6c5a0d42eb9593d https://github.com/Warzone2100/warzone2100/commit/2d938a0323e5c47ce4a41c9fb6c5a0d42eb9593d Author: Cyp <cy...@wz...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/order.cpp M src/order.h M src/transporter.cpp M src/transporter.h Log Message: ----------- 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. Commit: 06e161a4d90a589549d5f3a3c64ac8abf07fc0ea https://github.com/Warzone2100/warzone2100/commit/06e161a4d90a589549d5f3a3c64ac8abf07fc0ea Author: Cyp <cy...@wz...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/order.cpp Log Message: ----------- 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. Commit: 2042b60e4f144b483b12164d67f99adf4e915ac0 https://github.com/Warzone2100/warzone2100/commit/2042b60e4f144b483b12164d67f99adf4e915ac0 Author: cybersphinx <ch...@gm...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M po/pl.po Log Message: ----------- Polish translation update by Emdek. Closes #1347. Again. Commit: a26aa5f3ad89312e47b026bcfe1b44271b47faef https://github.com/Warzone2100/warzone2100/commit/a26aa5f3ad89312e47b026bcfe1b44271b47faef Author: cybersphinx <ch...@gm...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M po/fr.po Log Message: ----------- French translation update by Amiral JCDG. Commit: addcb20ff0155e8a2bf2810c917c7a6b8f0e5403 https://github.com/Warzone2100/warzone2100/commit/addcb20ff0155e8a2bf2810c917c7a6b8f0e5403 Author: vexed <ve...@wz...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M src/Makefile.am A src/cursorselection M src/display.cpp Log Message: ----------- 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. Commit: caeca032ef311ddece306c2cc0b0af1a997bf289 https://github.com/Warzone2100/warzone2100/commit/caeca032ef311ddece306c2cc0b0af1a997bf289 Author: cybersphinx <ch...@gm...> Date: 2012-02-28 (Tue, 28 Feb 2012) Changed paths: M lib/gamelib/animobj.cpp M lib/gamelib/gtime.h M lib/ivis_opengl/screen.cpp M po/fr.po M po/pl.po M src/Makefile.am M src/action.cpp M src/action.h M src/combat.cpp M src/component.cpp A src/cursorselection M src/display.cpp M src/droid.cpp M src/feature.cpp M src/move.cpp M src/multibot.cpp M src/multimenu.cpp M src/multiplay.cpp M src/multistruct.cpp M src/objmem.cpp M src/order.cpp M src/order.h M src/projectile.cpp M src/projectiledef.h M src/qtscript.cpp M src/structure.cpp M src/transporter.cpp M src/transporter.h Log Message: ----------- 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." Compare: https://github.com/Warzone2100/warzone2100/compare/9e6c534...caeca03 |