Menu
▾
▴
[Warzone2100-commits] [Warzone2100/warzone2100] ad018a: Don't desynch in debug mode when pressing 'A' or '...
|
From: automerge <cr...@wz...> - 2012-04-30 06:10:23
|
Branch: refs/heads/3.1 Home: https://github.com/Warzone2100/warzone2100 Commit: ad018a364374da43f9b0ab90952fe0070c69c82a https://github.com/Warzone2100/warzone2100/commit/ad018a364374da43f9b0ab90952fe0070c69c82a Author: Cyp <cy...@wz...> Date: 2012-04-27 (Fri, 27 Apr 2012) Changed paths: M src/keybind.cpp M src/structure.cpp Log Message: ----------- Don't desynch in debug mode when pressing 'A' or 'W'. Accidentally pressing the 'A' and 'W' keys in debug mode lowers and raises the terrain by an unnoticable amount, causing mysterious hard-to-reproduce and hard-to-debug desynchs some time later, when a droid crosses the affected tile. Steps to reproduce: Start a multiplayer game, and set all players to autogame for easy debugging (this requires enabling debug mode). In one of the clients, press Control+A to select all units, using a keyboard where the Control key sometimes but rarely fails. Scroll around the map, or do something else, until a droid crosses the tile where the mouse cursor happened to be when Control+A was pressed. Watch the game mysteriously go out of synch due to an apparent miscalculation in the droid position. Try to debug what went wrong with the droid position. Also, remove redundant test in buildFlatten(). Commit: b9cc7702b7dc7ff3781f32f69b9cac110ebd6b98 https://github.com/Warzone2100/warzone2100/commit/b9cc7702b7dc7ff3781f32f69b9cac110ebd6b98 Author: Cyp <cy...@wz...> Date: 2012-04-27 (Fri, 27 Apr 2012) Changed paths: M src/loop.cpp Log Message: ----------- Flush net data immediately after sending GAME_GAME_TIME. This allows accelerated multiplayer games to run faster. Probably also reduces game latency slightly. Commit: 8f9134624991b986a1e5cd86fc4cd85ec8ee55a4 https://github.com/Warzone2100/warzone2100/commit/8f9134624991b986a1e5cd86fc4cd85ec8ee55a4 Author: Cyp <cy...@wz...> Date: 2012-04-28 (Sat, 28 Apr 2012) Changed paths: M lib/netplay/netsocket.cpp Log Message: ----------- Add (int) cast, for C++11 compatibility. Fixes ticket:3401. Commit: 0ad220b334cabb17d356e0132fc07c36624455da https://github.com/Warzone2100/warzone2100/commit/0ad220b334cabb17d356e0132fc07c36624455da Author: vexed <ve...@wz...> Date: 2012-04-28 (Sat, 28 Apr 2012) Changed paths: M src/keybind.cpp M src/multigifts.cpp M src/multigifts.h Log Message: ----------- Make 'autogame' work in *debug* mp games. fixes ticket:3369 Commit: 21326496e1b4348ec96a96e268d138394aef183c https://github.com/Warzone2100/warzone2100/commit/21326496e1b4348ec96a96e268d138394aef183c Author: vexed <ve...@wz...> Date: 2012-04-28 (Sat, 28 Apr 2012) Changed paths: M src/droid.cpp M src/objmem.cpp Log Message: ----------- Change objmemDestroy() to return a bool. When we have droids that are "dead" but still have actions/orders concerning them, we delay killing them completely (as in, free their memory /cleanup routines) until those actions/orders are cleared on the next cycle. Use logging of life, death, and memory to see what is going on. fixes ticket:3419 ref:3338 Commit: e50d51339eb55f6990b97ad4e28722b6a4eea23c https://github.com/Warzone2100/warzone2100/commit/e50d51339eb55f6990b97ad4e28722b6a4eea23c Author: vexed <ve...@wz...> Date: 2012-04-28 (Sat, 28 Apr 2012) Changed paths: A data/base/components/weapons/scavmra.pie M data/base/stats/weapons.txt M data/base/wrf/piestats.wrf A data/mp/components/weapons/scavmra.pie M data/mp/stats/weapons.txt M data/mp/wrf/piestats.wrf Log Message: ----------- Fixes Scavenger MRAs Patch by NoQ Original model by Berg Fixes ticket:3365 Commit: 5e3d4bcb388f36c86dd26b5f9783c7574c5a4901 https://github.com/Warzone2100/warzone2100/commit/5e3d4bcb388f36c86dd26b5f9783c7574c5a4901 Author: Cyp <cy...@wz...> Date: 2012-04-28 (Sat, 28 Apr 2012) Changed paths: M lib/netplay/netplay.cpp M lib/netplay/netplay.h M lib/netplay/netsocket.cpp M lib/netplay/netsocket.h M src/keybind.cpp M src/multimenu.cpp Log Message: ----------- Make net usage statistics more meaningful. Previous behaviour: Show bytes sent, before compression, per CPU-second. So with 50% cpu usage, the numbers would be doubled. New bevaviour: Show actual bytes sent, and also show bytes sent before compression, per actual second, independent of CPU usage. Commit: 049982522b9e247a2c8a23c43e89fdc1af9a3ad6 https://github.com/Warzone2100/warzone2100/commit/049982522b9e247a2c8a23c43e89fdc1af9a3ad6 Author: Cyp <cy...@wz...> Date: 2012-04-29 (Sun, 29 Apr 2012) Changed paths: M lib/gamelib/gtime.cpp M lib/netplay/netplay.cpp M lib/netplay/netplay.h M lib/netplay/nettypes.cpp M lib/netplay/nettypes.h Log Message: ----------- Truncate game state CRC sent over net to 16 bits. This should save a tiny bit of bandwidth, at least 20 bytes/second. Commit: 282efa8884a61d940b0414f0526b8abef78b62d0 https://github.com/Warzone2100/warzone2100/commit/282efa8884a61d940b0414f0526b8abef78b62d0 Author: Cyp <cy...@wz...> Date: 2012-04-29 (Sun, 29 Apr 2012) Changed paths: M lib/netplay/netplay.cpp M lib/netplay/netplay.h M src/multimenu.cpp Log Message: ----------- Show net usage statistics per game, as well as per second. Commit: b763c32cf584064141d8f801f297c93e9b4e3a0d https://github.com/Warzone2100/warzone2100/commit/b763c32cf584064141d8f801f297c93e9b4e3a0d Author: automerge <cr...@wz...> Date: 2012-04-29 (Sun, 29 Apr 2012) Changed paths: A data/base/components/weapons/scavmra.pie M data/base/stats/weapons.txt M data/base/wrf/piestats.wrf A data/mp/components/weapons/scavmra.pie M data/mp/stats/weapons.txt M data/mp/wrf/piestats.wrf M lib/gamelib/gtime.cpp M lib/netplay/netplay.cpp M lib/netplay/netplay.h M lib/netplay/netsocket.cpp M lib/netplay/netsocket.h M lib/netplay/nettypes.cpp M lib/netplay/nettypes.h M src/droid.cpp M src/keybind.cpp M src/loop.cpp M src/multigifts.cpp M src/multigifts.h M src/multimenu.cpp M src/objmem.cpp M src/structure.cpp Log Message: ----------- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/9546393...b763c32 |