Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
14,861 Commits 8 Branches 28 Tags 13 GiB
f134ac63bb
Commit Graph

5919 Commits

Author SHA1 Message Date
Itms
f134ac63bb Revert most of f240374b28 which was actually bad. It caused units to get stuck because the obstructions won't block the same paths when rasterized on the grid and when directly tested for collisions. 
As a general rule, pathfinding-blocking shapes should not be tested
against for movements. Only the passability grid should be considered.
As the algorithm which tests paths on this grid was fixed in 1c9ea56800,
it can be safely used.

Fixes #3376.

This was SVN commit r16971.
 2015-09-02 15:50:16 +00:00
Itms
8a8a3b8377 Revert a wrong piece of code from 63e42fbd31. Refs #3293 
This was SVN commit r16965.
 2015-08-30 20:32:22 +00:00
scythetwirler
1a15131d2d Lobby bot optimizations. 
This was SVN commit r16964.
 2015-08-30 17:50:16 +00:00
Itms
63e42fbd31 Display which player(s) are OOS when it happens. Also fix some encoding issues with file paths. 
Patch by elexis, fixes #3293.

This was SVN commit r16963.
 2015-08-30 17:47:18 +00:00
Itms
f47cb2c711 Fix the OOS reported by elexis in #3335, and clean some whitespace and style. 
The list of modified entities was thrown out on global visibility
updates (those happen on rejoin) but only in-world entities were
actually updated then, causing problems with garrisoning.

Now the list of modified entities can happen to be large, so replace the
hacky check for infinite loops by a real check.

This was SVN commit r16962.
 2015-08-30 17:42:10 +00:00
JoshuaJB
45a39e7dfd Fix 3171 by moving some logic to C++. These changes do not optimize the presence buffer and only fix the state bug. 
This was SVN commit r16961.
 2015-08-30 12:56:48 +00:00
leper
2aef62d65f Handle backrefs properly for maps and sets. Fixes #3374. 
Allocate the tag for the backreference before deserializing the content,
to match the order of serializing.

This was SVN commit r16959.
 2015-08-30 04:51:16 +00:00
leper
57f340f906 Fix player rejoins. Refs #3242. 
This was SVN commit r16955.
 2015-08-30 02:03:50 +00:00
leper
c9893b3dd0 Test serialization of nested maps. Refs #3164, #3374. 
This was SVN commit r16954.
 2015-08-30 00:06:39 +00:00
leper
8217fa1a0e Warn about range queries that can never return any results. 
This was SVN commit r16951.
 2015-08-29 22:49:49 +00:00
Itms
e56dddbefb Optionally allow observers to rejoin a game when they weren't here during the game setup. 
Patch by elexis, fixes #3242.

This was SVN commit r16945.
 2015-08-28 20:20:10 +00:00
Itms
8e70140ec2 Handle properly static shapes that overlap the edge of the map (likely to happen with square maps). 
This should fix #3364.

This was SVN commit r16944.
 2015-08-28 11:38:14 +00:00
leper
34555ad70c Enhance i18n extractor to support a single context for a json file. Patch by elexis. Refs #3355. 
This was SVN commit r16942.
 2015-08-27 19:07:36 +00:00
Itms
d129ae3cd8 Fix a special situation where map control percentage wasn't computed properly. 
Also improve the code and fix a typo.

Based on patch by s0600204, fixes #3378.

This was SVN commit r16941.
 2015-08-27 16:26:32 +00:00
leper
b9ab8f5855 Explicitly include public's mod.json in Windows packages. 
Also clean up some unused options in the dist script.

This was SVN commit r16939.
 2015-08-25 12:55:05 +00:00
Itms
a63b7a0126 Add ability to query the map control percentage, and use this value in the summary screen. Patch by s0600204, fixes #3321 
This was SVN commit r16933.
 2015-08-23 17:44:37 +00:00
Itms
b694ab41d9 Show the number of trade carts and looted resources in the summary screen. Patch by bb, fixes #3311 
This was SVN commit r16932.
 2015-08-22 17:57:41 +00:00
leper
74c420f658 GUI code cleanup. Fixes #3354. 
Lots of code style fixes:
 * type [*&]varname -> type[*&] varname
 * else
   if (...)
   ->
   else if (...)
 * Spaces around some ops.
 * i++ -> ++i.
 * switch-case style fixes.
 * Indentation fixes.
 * Removing some commented out code.
 * include header sorting
 * Changed multiple pointer var declarations to be one per line.
 * Removed strange spaces in some places.
 * Changed some include header guards to be consistent with the rest of
the codebase.
 * Use UNUSED() instead of UNUSED2().

Some small code fixes:
 * Using .find() instead of .count() == 0.
 * !.empty() instead of .size() == 0.
 * Range-based for loops.
 * Making some member functions const by small changes.
   * Adds GetScrollBarPos(idx) const for this.
 * Using early returns/continues in some places.
 * Uses size_t for some loops in CList and COList.
 * Removes unused heading element (not attribute) from COList.
 * Use ENSURE in one case where some custom code did something similar.
 * Made some parameters const ptrs/refs.
 * Change removal loop in GUItext.cpp to erase-unique.
 * Made some static things const.
 * Allow iterating over children of IGUIObject with range-based for
loops by
   exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and
use it.

Comments:
 * Comment COList.
 * Update a few comments.
 * Remove useless or duplicated comments.

This was SVN commit r16931.
 2015-08-21 17:08:41 +00:00
Itms
a63e9c521d Optionally limit the framerate in menus to 50 FPS, to save power. Patch by elexis, fixes #2882 
This was SVN commit r16927.
 2015-08-20 13:22:44 +00:00
Itms
ba82743777 Some range-based for loops. 
This was SVN commit r16926.
 2015-08-20 12:58:41 +00:00
Itms
b2e8a241d2 Properly check loaded scripts in the second simulation instance of a serialization test. Fixes #3238 
This was SVN commit r16925.
 2015-08-20 12:52:29 +00:00
Itms
1ab3a4a02d Fix 6506bc20cb, refs #3238 
This was SVN commit r16924.
 2015-08-20 12:49:43 +00:00
leper
558d43bac5 Replace some functor structs with lambdas, closures or range-based fors. 
This was SVN commit r16923.
 2015-08-19 03:33:04 +00:00
leper
36c6b50944 Revert emplace for associative containers. Fixes #3366. 
GCC < 4.8.0 does not support emplace for those.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44436.

This was SVN commit r16922.
 2015-08-19 03:32:47 +00:00
leper
674f49f1a8 Remove generated test files during clean-workspaces.sh. Patch by otero. Fixes #3275. 
Also remove two generated and disabled test files.

This was SVN commit r16921.
 2015-08-19 01:30:09 +00:00
Itms
bd8f9b7824 Fix enemy corpses visible in the fog of war. Fixes #3179. 
This was SVN commit r16919.
 2015-08-16 09:29:34 +00:00
Itms
1c9ea56800 Fix the CheckLineMovement algorithm. Added some comments and a test to avoid problems. 
This addresses some "stuck units" cases.

This was SVN commit r16918.
 2015-08-13 16:21:39 +00:00
Itms
01de76f4be Code improvements for the hierarchical pathfinder: cache hits and variable initialization. 
This was SVN commit r16917.
 2015-08-11 15:21:11 +00:00
Itms
28ef270571 Enhance the MakeGoalReachable algorithm to handle better non-point goals. 
Fixes #3363, #3297.

This was SVN commit r16915.
 2015-08-11 09:47:08 +00:00
Itms
f7a7b687fc Don't send TerrainChanged messages when painting the terrain, as terrain texture doesn't influence passability. 
This was SVN commit r16914.
 2015-08-10 11:55:43 +00:00
leper
ec96c737ee Actually use vpObj instead of obj, and use it in all cases. Refs #3354. 
This was SVN commit r16909.
 2015-08-02 14:40:51 +00:00
leper
94302a4149 Move engine version to common file. Patch by elexis. Fixes #3359. 
This was SVN commit r16906.
 2015-08-01 23:03:13 +00:00
leper
217a500d60 Add missing license headers. Fixes #3357. 
This was SVN commit r16903.
 2015-07-31 11:28:14 +00:00
Itms
1a8096a920 Reliably send the ReplayFinished message at the very end of visual replays. Patch by elexis. 
This was SVN commit r16902.
 2015-07-30 21:55:34 +00:00
leper
a4e606c575 TerrainTextureManager cleanup. 
This was SVN commit r16901.
 2015-07-30 21:51:01 +00:00
leper
c5aad60776 Actually stop iterating if retval != INFO::OK. Also fix comments. 
This was SVN commit r16900.
 2015-07-30 21:50:58 +00:00
leper
15a4c813d6 Add support for AArch64 (ARM64). Patch by tbm. Fixes #3345. 
This was SVN commit r16899.
 2015-07-30 19:52:55 +00:00
leper
0868d03e74 Fix previous commit. 
This was SVN commit r16898.
 2015-07-30 17:27:27 +00:00
leper
2238a18aee Close and free replay streams. Based on patch by elexis. 
This was SVN commit r16897.
 2015-07-30 16:43:22 +00:00
leper
47336b770f Add clipping to OList cells. Patch by elexis. Fixes #3353. 
This was SVN commit r16895.
 2015-07-30 01:33:48 +00:00
leper
8bfe16cac8 Use in-place construction. 
This was SVN commit r16894.
 2015-07-29 23:44:17 +00:00
leper
c5eb9b7bb7 Range-based for for VfsPath loops. 
This was SVN commit r16893.
 2015-07-29 23:44:12 +00:00
leper
540cf75794 L10n code cleanup. 
This was SVN commit r16892.
 2015-07-29 23:44:05 +00:00
leper
a07add11c6 Some range-based for loops and some style cleanup. 
This was SVN commit r16888.
 2015-07-29 01:07:23 +00:00
leper
b4d517c261 Fix infinite loop in key code to key name mapping. 
Also make some data const and construct data in-place.

This was SVN commit r16887.
 2015-07-29 01:07:18 +00:00
leper
851e863892 Remove animation name compatibility mapping. 
10 years should have given everyone enough time to move to the new
naming scheme.

This was SVN commit r16884.
 2015-07-27 01:08:29 +00:00
leper
da48c8c26f Some const refs and one const function. 
This was SVN commit r16882.
 2015-07-27 01:08:25 +00:00
leper
bd53e9d736 Remove unused ah_translate code. 
This was SVN commit r16881.
 2015-07-27 01:08:15 +00:00
Itms
f240374b28 Fix a number of short/long range pathfinder inconsistencies revealed by 128a603287. 
This was SVN commit r16869.
 2015-07-18 12:33:40 +00:00
Itms
128a603287 Use the terrain-only grid for terrain edges in the short pathfinder algorithm. This grid is updated on each terrain change, whereas the passability grid is updated once a turn. This caused OOS on rejoin, fixes #3292. 
However, using the terrain-only grid reveals one discrepancy between the
short pathfinder (which uses unit radii) and the long one (which uses
unit clearances). So I implemented the change proposed by sanderd17 in
#3294, which is removing unit radius and using only the pathfinder
clearance. Refs #3294
Now some tweaking has to be done in the templates, so that units get a
passability class suited to their apparent size. In the meantime the
unit motion is quite bugged.

This was SVN commit r16867.
 2015-07-18 08:37:49 +00:00