Commit Graph

15283 Commits

Author SHA1 Message Date
wraitii b87b3ff3dc Left some debug code in.
This was SVN commit r17460.
2015-12-13 17:39:19 +00:00
elexis a7a6b3316c GUI cleanup.
Moves cropping of the mappreview image to a common function
setMapPreviewImage.
Also avoids magic numbers by using the actual formula.

This was SVN commit r17459.
2015-12-13 17:09:41 +00:00
wraitii 1e504cd64c Fix the actoreditor menu bar on OSX. Patch by trompetin17. Fixes #1554.
This was SVN commit r17458.
2015-12-13 16:53:35 +00:00
wraitii 909b8d4369 Allow multiple special sprites, to facilitate cases where we want to add an overlay to a sprite.
"color" can make use of the sprite's alpha texture, and the "add_color"
effect will now take the original image's alpha into account.
Remove the no longer needed "unaffordableMask" images on a variety of
panels.

Somewhat based on a patch by BoeseRaupe. Fixes #2421 and #3688.

This was SVN commit r17456.
2015-12-13 16:03:17 +00:00
elexis 88d6f35126 Summary screen cleanup.
Rename panelsData and teamMiscHelperData to g_Foo.
Use let instead of var everywhere except for globals.
Quote object keys, add some spaces.

This was SVN commit r17455.
2015-12-13 13:20:54 +00:00
elexis 5ccee7ade1 Summary screen cleanup. Patch by bb, refs #3518.
Renames globals to g_Foo.
Uses let instead of for in loops.
Fixes indentation and some whitespace issues.

This was SVN commit r17453.
2015-12-13 12:42:58 +00:00
Enrique 160b6e60cd Added new tree acacia and variations.
Upgraded aleppo pines.
New Oaks and dead oaks variations.
New generic dead trees.
Upgraded grapes texture by Stanislas69. Thanks Stan!

This was SVN commit r17452.
2015-12-12 22:44:39 +00:00
elexis 5c36a4ab22 Gamesetup cleanup.
Unify calls to hideControl which were duplicated per maptype.

This was SVN commit r17451.
2015-12-12 21:43:32 +00:00
elexis 59b9a7a0db Gamesetup cleanup.
Introduce a GUI function to set checkboxes and their label-counterpart
in one line.
Replace code that is duplicated for every maptype.
Fix a typo "ExporeMap" from e05c8263c5.

This was SVN commit r17450.
2015-12-12 20:29:54 +00:00
elexis 745b1aae8d Correctly hide the mapsize-description (see 0b4308bbc8).
This was SVN commit r17449.
2015-12-12 18:07:39 +00:00
mimo 47a23904e5 adding more diversity in petra warnings
This was SVN commit r17448.
2015-12-12 15:45:02 +00:00
elexis 0b4308bbc8 Gamesetup cleanup (simplify GUI calls)
Make a hidden function globally available and use it everywhere to
simplify the hiding/showing of GUI elements.
Use strings instead of the references to the actual GUI objects, so that
the code doesn't rely on variables anymore.
Use a default argument so we can reuse it with regards to other
conditions like scenario maps or multiplayer.
Notice the JS variables have the same name as the GUIObjects, so the
replacement is simple.

This was SVN commit r17447.
2015-12-12 15:35:52 +00:00
elexis 2e54fee44d Fix oversight in 3006904403.
This was SVN commit r17446.
2015-12-12 15:27:07 +00:00
elexis 96003e8812 Correct the order of JSDoc arguments in so many places and use @returns instead of @return.
Remove some unneeded comments.

This was SVN commit r17445.
2015-12-12 14:53:28 +00:00
elexis 89f74d2528 Fix a playerassignment-bug in the gamesetup where the game couldn't be started if a player has rejoined the gamesetup while the host reduced the number of players.
The previous code failed at it as it looped over g_PlayerAssignments
instead of all slots.

Based on patch by Pilzschaf, fixes #3602.

This was SVN commit r17444.
2015-12-12 12:00:18 +00:00
elexis a939b49de7 Fix #3607 by assigning new players to unused slots instead of assuming that the n'th slot is available.
This was SVN commit r17443.
2015-12-12 10:48:59 +00:00
elexis 3006904403 Gamesetup cleanup.
Split handleNetMessage into five smaller functions.
Besides improving the readability a bit, it allows adding new variables
without declaring them in the scope of other messagetypes.

This was SVN commit r17442.
2015-12-12 10:31:06 +00:00
mimo ead4caaa41 do mot modify the cmd object, refs #3467
This was SVN commit r17441.
2015-12-11 20:15:10 +00:00
elexis bdc028fe09 Include award-winning skirmish map Forest Battle (4). Map created by Stan and reworked by niektb. Fixes #3618.
See Mapping Contest 16 hosted by the Council of Modders.

This was SVN commit r17440.
2015-12-11 19:36:03 +00:00
leper 71abb9cbed Use same resource translations as are used in the GUI already. Refs #3691.
This was SVN commit r17439.
2015-12-11 19:11:37 +00:00
mimo eacbdd4dfb cleanup in the petra queueManager
This was SVN commit r17438.
2015-12-11 18:45:03 +00:00
mimo 489822e384 some cleanup in the ai common-api
This was SVN commit r17437.
2015-12-11 18:35:01 +00:00
elexis 925b2910fe Fix whitespace and remove the placeholder functions initHostControls and initFinalize (see previous commit).
This was SVN commit r17436.
2015-12-11 18:33:09 +00:00
elexis 7b9c1e23db Major gamesetup cleanup.
Split the 280-line function initGUIObjects (former initMain) into
sixteen short functions.

Do not correct indentation in this commit in order to have the smallest
changeset possible, highlighting the actual changes
[the only logic change being mapTypes.selected and mapFilters.selected
being set one function (initMoreOptions) earlier].

This was SVN commit r17435.
2015-12-11 18:20:45 +00:00
wraitii 48e3959391 Change the "Summary" button from the top bar to the menu to help support our minimal resolution.
Disable said button for non-observers.
Refs #3387.

This was SVN commit r17434.
2015-12-11 15:49:33 +00:00
elexis 4a81d53f3b Gamesetup cleanup.
Rename initMain to initGUIObjects to clarify what the function does.
While init() sets globals without touching the GUI, initGUIObjects
updates all GUI controls after the first tick.

Rename loadGameAttributes to loadPersistMatchSettings as that's more
specific as to where the attributes are loaded from.
Add some JSDoc comments and a TODO for an annoying old bug.

Simplifiy to-boolean conversions by negating twice (!!)

This was SVN commit r17433.
2015-12-11 14:11:33 +00:00
elexis 682a7b3ba0 Gamesetup cleanup.
Don't define variables inside switch-statements.
Move chat-font to global.
Rename host and an i to guid, newPlayer to newGUID to be more coherent.
Do early continues when finding joinings/leavings and swapping players.

This was SVN commit r17432.
2015-12-11 11:55:16 +00:00
elexis c32a2b52be Gamesetup cleanup.
Simplify initMapNameList.
Remove six superfluous checks.
Remove two unneeded variables in updatePlayerList.

This was SVN commit r17431.
2015-12-11 10:17:44 +00:00
elexis 42548698c5 Gamesetup cleanup.
Replace more var by let.
The only remaining places to update are switch-statements.

This was SVN commit r17429.
2015-12-11 00:21:04 +00:00
elexis df86b15b91 Gamesetup cleanup.
Simplify by using array functions, the ternary operator and unifying
duplicate code.
Move map-paths to a global.

This was SVN commit r17428.
2015-12-11 00:02:18 +00:00
mimo d07f16ed80 petra: fix resource translations, fixes #3691
This was SVN commit r17427.
2015-12-10 20:35:24 +00:00
mimo afa07325a1 petra: improve the detection of stuck gatherers, refs #3562
This was SVN commit r17426.
2015-12-10 20:02:37 +00:00
mimo a74d9be130 make const the new method introduced in 2451872731
This was SVN commit r17425.
2015-12-10 19:23:50 +00:00
elexis 57260e185b Use let instead of var in the gamesetup.
Doing so follows the principle of least exposure and means those
variables will be destroyed when leaving the block (i.e. memory being
freed up earlier).

The blocks affected by this commit are short (mostly 3-5 lines).
The variables are not referenced before or after the block, nor in their
temporal dead zones.

This was SVN commit r17424.
2015-12-10 17:44:14 +00:00
wraitii e57c99c6f6 Add a button to the top bar to access the summary screen in-game or in replays.
No effort was done to prevent players from accessing it since it's
impossible to prevent them from doing so anyway.

Fixes #3387 .

This was SVN commit r17423.
2015-12-10 15:33:06 +00:00
elexis 4dcbad7b1b Simplify init() and initMain(). Exit gracefully in case of encountering an error there.
Do not focus the maplist when entering the singleplayer gamesetup as
that actually doesn't have an effect (you can't scroll the maplist with
arrow-keys).

This was SVN commit r17422.
2015-12-10 14:24:03 +00:00
elexis 9b4e359d64 Gah.
This was SVN commit r17421.
2015-12-10 13:28:57 +00:00
elexis 223305b7ae Simplify sendRegisterGameStanza by using the conditional operator and removing four variables which are used only once.
This was SVN commit r17420.
2015-12-10 13:20:45 +00:00
elexis 7a8c37a885 Use map function instead of deprecated for-each.
This was SVN commit r17419.
2015-12-10 13:06:36 +00:00
elexis 63fa889fcd Rename playableOnly to selectableOnly as non-selectable civs can be playable on scenario maps.
This was SVN commit r17418.
2015-12-10 12:52:38 +00:00
elexis af4dc43478 Revert the removal of non-selectable civs from the gamesetup (bbc325fb5a) to allow scenario maps to select unselectable civs.
This was SVN commit r17417.
2015-12-10 12:49:53 +00:00
leper 349b5786dd Fix test failure. Refs #3590.
This was SVN commit r17416.
2015-12-09 22:52:33 +00:00
mimo b6dbb2bff0 fix tabs of 2451872731
This was SVN commit r17415.
2015-12-09 20:56:53 +00:00
mimo 2451872731 improve performance of hierarchical pathfinder, refs #3588
This was SVN commit r17413.
2015-12-09 19:56:30 +00:00
fabio 73a26a22ca Enable by default postproc, smoothlos and all water features when on OpenGL4+.
This autodetection has a higer priority than default.cfg, but lower
priority than local changes.
Note that after enabling these features some get disabled later on on
some drivers (Intel, software renderers).
Also note that mesa drivers only expose core profile OpenGL, and 0 A.D.
reads compatibility profile, so that on mesa drivers OpenGL4 is never
detected and these features are never enabled by default.

This was SVN commit r17412.
2015-12-09 16:12:58 +00:00
fabio 07f0a178f4 Fixes what looks a copy-paste error.
Makes disable_allwater setting in hwdetect.js what it was supposed to
do.

This was SVN commit r17411.
2015-12-09 11:35:40 +00:00
fabio a5152c14d1 Properly use the passed parameter as all other occourences.
Fixes 'disable_allwater = false' case in hwdetect.js.

This was SVN commit r17410.
2015-12-09 11:28:24 +00:00
mimo 6a73dc2e16 fix multiple (useless) insertion in grid update of hierarchical pathfinder
This was SVN commit r17409.
2015-12-08 22:58:04 +00:00
leper b4f0227f1b Add support for undeletable entities. Fixes #3590.
This was SVN commit r17408.
2015-12-08 22:34:32 +00:00
mimo 82ca673e0a petra: retune the dock placement criteria, fixes #3469
This was SVN commit r17407.
2015-12-08 19:16:50 +00:00