1
0
forked from mirrors/0ad
Commit Graph

12913 Commits

Author SHA1 Message Date
elexis 86db66cac1 Allow players to instantly reset the readystate by rightclicking on the ready button, refs #4369, D49 / 5f8f7bae20.
This was SVN commit r21873.
2018-08-23 17:57:43 +00:00
elexis 81dfd63610 Fix missing alias in 468d963e78 / D1575, refs #5218, taken from D1590.
This was SVN commit r21872.
2018-08-23 17:26:31 +00:00
elexis 7f4950cb17 Use https in hyperlinks for sites that support it, refs #5257.
This was SVN commit r21870.
2018-08-23 09:23:06 +00:00
elexis 1e59db453a Prioritize civ names over mapnames for gamesetup chat autocompletion (Persians > Persian Highlands).
This was SVN commit r21862.
2018-08-06 10:46:33 +00:00
elexis f11b59f117 Add back incorrectly removed clause from f7783fb4bb that was needed for the lobby, refs #4962 / D1583.
This was SVN commit r21861.
2018-08-06 09:45:33 +00:00
elexis f7783fb4bb Fix biome-specific mappreviews in 7f602037ba for zipped mods, refs #4962.
Add TextureExists to avoid needless redundant hardcoding of the
filenames.
Remove mapBiome.Preview from gamedescription.js, obsolete following
8cde469501.

Differential Revision: https://code.wildfiregames.com/D1583
Accepted By: Vladislav
This was SVN commit r21859.
2018-08-05 21:50:00 +00:00
elexis 2af94c5898 Remove disabled remains of the performance data (= profiler data + text input) upload feature from the UserReporter from 0da7e822ff.
User-submitted text upload was removed in 2779512c6e in preference of
the bugtracker.
Remove leftover mainmenu.js function that this commit should have
removed.

Profiler data upload was disabled in b9e46f386b because the data amount
was too large and because the two timing snapshots are inconclusive
without further data.
The hereby removed exposed JS functions could have been exploited by JS
mods to upload 0ad userdata to arbitrary places.

The performance data upload feature can be redesigned, implemented
without JS exposure, with a more transparent privacy policy (refs
#5257).

Differential Revision: https://code.wildfiregames.com/D1597
Performance upload feature removal accepted by: Vladislav
This was SVN commit r21858.
2018-08-05 15:18:00 +00:00
elexis bdc68f85c9 Add missing XmppClient destruction if maploading failed in bffe917914.
Differential Revision: https://code.wildfiregames.com/D1596
Patch By: smiley aka (-_-)
This was SVN commit r21856.
2018-07-21 12:17:13 +00:00
elexis d6caaaa54c Add missing XmppClient destruction in 4b09d6f167 needed for the case of leaving the lobby to change the mods but then not changing the mods and entering the lobby again.
This was SVN commit r21855.
2018-07-21 12:05:06 +00:00
elexis aec7509004 Remove 256 character limit from escapeText.
escapeText was added for the gamesetup and session chat in 9ee44bd9b8,
but the character limit is counterproductive for chatting with more than
2 sentences per line, when displaying a file path or other arbitrary
escaped text,
not really an effective measure against lobby spam, nor was that option
considered in any of the later calls except d7d0a7f869 and
thus more likely to cause unintended than intended code behavior and
should instead be implemented with max_length for input fields and
linebreaks and smaller GUI object sizes for displaying, refs #5266.

Remove early returns that are redundant code and require more
performance in the average case (non-empty string).

From Differential-Revision: https://code.wildfiregames.com/D720

This was SVN commit r21853.
2018-07-21 09:25:04 +00:00
elexis 468d963e78 Persist the lobby Terms Of Use and Terms Of Service checkbox if the logged in user and the accepted versions of the pages didn't change since last login, refs #5218.
This way the user is only forced to read the Terms again that changed or
if the user logged in from a different machine.
Use md5sum since it is sufficiently resistant against collisions and
doesn't freeze the window for 2 seconds like EncryptPassword / SHA256
does, refs #4399.
Use 0 instead of empty string in default.cfg, refs #3990.

Differential Revision: https://code.wildfiregames.com/D1575
Partial review by: Vladislav
This was SVN commit r21850.
2018-06-21 16:38:08 +00:00
elexis fe41404ba8 Fix XML syntax error in 80dbd1f2a3 reported by gameboy.
The error was hidden by Xeromyces loading the syntactically correct XMB
file that is still written for syntactically wrong XML files, refs
#5222, D1574.

This was SVN commit r21849.
2018-06-12 09:18:50 +00:00
elexis 88eb3527b7 Remove leftover debug line from previous.
This was SVN commit r21848.
2018-06-11 16:08:49 +00:00
elexis 80dbd1f2a3 Rewrite the prelobby pages and add the Terms of Service, Terms of Use and the agreement checkbox to the login page.
Ensure lobby players cannot join without acceptance of the terms in case
they change, fixes #5218, as agreed in last staff meeting.

Separate lobby entrance, lobby login and lobby register GUI page.
Since bffe917914 they were squashed into a single GUI page;
 Adding lots of hardcode to set the visibility of GUI objects;
 Reinventing a GUI page manager in JS;
 Unintentionally persisting data between pages;
 Requiring lots of errorprone case distinctions which are unneeded once
relevant GUI objects and code is loaded exclusively.

Add the remember-password checkbox from b6b547d5f8 / D822 to the
registration page too.

Revert the revert of ccb534259d in 9f9db45a03 and continue to prefer
objects with separate functions per C++ GUI message type,
reducing the nesting of conditionals per function and reveal codeflow by
making input and output variables explicit.

Fix oversight in 0940db3fc0 by moving the registrationrate string from
0e2d2610c9 from the "disconnect" to the "error" case.

Differential Revision: https://code.wildfiregames.com/D1568
Few comments by: Vladislav, Imarok, gallaecio
This was SVN commit r21847.
2018-06-11 15:59:22 +00:00
elexis de1a73ba65 Lobby register/login dialog cleanup.
Move JS code from XML files to JS files.
Move all terms data to one JS object.
Unify duplicate Terms dialog opening code.
Update the checkbox enabled property only upon dialog close, not onTick.

This was SVN commit r21846.
2018-06-08 13:39:52 +00:00
elexis ce64c57b8c Prevent calling the JS gamestart function twice when doubleclicking on the "Start Game" button.
It triggered an OOS on rejoin prior to ee9cf54149, refs #5199 and
resulted in the playernames of the current match persisting into new
gamesetups, fixes #5206.

Differential Revision: https://code.wildfiregames.com/D1558
Comments By: wraitii
This was SVN commit r21843.
2018-06-06 22:25:15 +00:00
elexis eda236522c Prevent players from disconnecting during the loading screen by increasing the timeout tolerance to 60 seconds for that period, fixes #5163.
The NetClient runs in the main thread, so any part of the loading screen
consuming several seconds makes that client timeout.
This is a workaround because threading the NetClient would have prevent
these timeouts, refs #3700.
Coutnerintuitively, since enet timeout tolerance is proportional to the
latency, the better the connection of the player, the more likely it was
to drop on gamestart.

This problem became very frequent in Alpha 23, at least due to the Aura
bugfix 583b6ec625, AIInterface being particularly slow and that not
having been disabled yet in the loading screen resulting in additional
10 second freezes during the loading screen, even on empty maps, refs
#5200, 8e168f85e6.

Differential Revision: https://code.wildfiregames.com/D1513
Based on patch by: causative
This was SVN commit r21842.
2018-06-06 22:09:38 +00:00
temple 8e168f85e6 Disable AIInterface earlier to remove unnecessary lag on gamestart
Differential Revision: https://code.wildfiregames.com/D1559
Reviewed by: wraitii
Comments by: elexis, Itms, Stan
Refs: #5200

This was SVN commit r21838.
2018-06-05 23:23:37 +00:00
temple 48e794e97d Always call SetPassabilityCircular -- Fix OOS after rejoin on square maps
Differential Revision: https://code.wildfiregames.com/D1555
Reviewed by: elexis
Fixes: #5186

This was SVN commit r21835.
2018-06-03 16:40:44 +00:00
elexis 1608202d4f Fix an OOS on rejoin on Danubius following 3d65bfe555, refs #4855, fixes #5198.
Vectors are still deserialized as objects without their prototype
functions, so doing math on these obejcts fails upon rejoin, refs #4698.
This patch doesn't add any version incompatibilities and players with
the patched version can successfully rejoin unpatched games.

Differential Revision: https://code.wildfiregames.com/D1548
Reviewed By: temple
This was SVN commit r21834.
2018-06-03 11:49:55 +00:00
elexis 4cefb286f4 Prevent the lobby gamelist from breaking entirely if a gamestanza contains an empty or invalid mod version JSON string (refs eca956a513).
Catch all JSON SyntaxError exceptions in JS (refs d7d0a7f869).
The C++ ParseJSON function already catches exceptions and the resulting
errors can't trigger a denial of service.

Differential Revision: https://code.wildfiregames.com/D1479
Based on patch by: Imarok
Reviewed by: Imarok
Comments By: Itms
This was SVN commit r21827.
2018-05-27 13:47:18 +00:00
Gallaecio 788ca1f69d Revert 51afc72886, it violates current freezes
This was SVN commit r21826.
2018-05-26 18:26:31 +00:00
Gallaecio 51afc72886 reaffect → reassign
Reported by GunChleoc on Transifex.

This was SVN commit r21825.
2018-05-26 18:22:12 +00:00
wraitii 83d228fe7e Fix hosting games in the lobby.
Fixes #5164.

Reported by: HMS-Surprise
Reviewed By: Stan
Trac Tickets: #5164

Differential Revision: https://code.wildfiregames.com/D1498
This was SVN commit r21822.
2018-05-21 16:52:50 +00:00
elexis b0ca04b555 Revert a bit of the nerf from 5cbe187438.
Commit permitted by Itms.

This was SVN commit r21813.
2018-05-01 21:12:43 +00:00
Itms a89bcf837b Fix the window icon that cannot be loaded in release packages, refs 27d99765bb.
Discussed with Imarok and elexis.

This was SVN commit r21812.
2018-05-01 20:29:36 +00:00
elexis 0de26377a8 Fish should not block foundation construction.
Regression introduced by 8ace8034a2.
Tested by mimo, commit permitted by Itms.

This was SVN commit r21810.
2018-04-30 16:29:55 +00:00
Itms 2b564e7311 Enlarge elements of the AI configuration message box in order to display correctly the majority of strings for the bundled languages. Fixes #3084 at the same time.
This was SVN commit r21807.
2018-04-29 15:34:31 +00:00
Itms e84e712801 Enlarge some GUI elements in order to display correctly the majority of strings for the bundled languages.
This was SVN commit r21804.
2018-04-29 14:34:10 +00:00
elexis 54e0f9ec28 Add engine and mod version test before loading the persist-matchsettings file.
This should be unneeded if the settings were parsed rather than copied
directly.

Differential Revision: https://code.wildfiregames.com/D1475
Reviewed By: Itms
This was SVN commit r21802.
2018-04-29 13:18:05 +00:00
mimo ac149374fc few templates fixes
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1477
This was SVN commit r21800.
2018-04-29 08:56:59 +00:00
elexis fce54167fd Place palisade walls around Napata when chosing the "easy" difficulty.
This was SVN commit r21798.
2018-04-28 20:34:31 +00:00
elexis 5cbe187438 30% less attackers on Jebel Barkal and leave more time between attacker waves in later stages of the game.
This was SVN commit r21797.
2018-04-28 16:22:27 +00:00
mimo f4f13f17b2 fix kush walls SelectionGroupname
This was SVN commit r21796.
2018-04-28 09:36:55 +00:00
mimo 28aa3d186f Ptol catapults should unpack to ptol catapults, not mace catapults
Patch by causative

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D1474
This was SVN commit r21795.
2018-04-28 09:30:53 +00:00
temple f90c4488ee Add missing kush formations
This was SVN commit r21793.
2018-04-27 23:55:07 +00:00
mimo 04fc83a231 fixes a few templates
This was SVN commit r21792.
2018-04-27 21:54:38 +00:00
temple 677165e205 Increase min range of catapults and bolt shooters
Differential Revision: https://code.wildfiregames.com/D1452
Reviewed by: elexis
This was SVN commit r21790.
2018-04-27 18:47:48 +00:00
mimo 440012961a really fix packing problems reported in 5acfa9921e
Differential Revision: https://code.wildfiregames.com/D1458
This was SVN commit r21786.
2018-04-26 16:49:18 +00:00
temple 583b6ec625 Stop some auras from being applied extra times, don't apply player auras to templates, and fix some linting errors
Differential Revision: https://code.wildfiregames.com/D1430
Comments by: fatherbushido, elexis
This was SVN commit r21785.
2018-04-26 00:35:24 +00:00
temple f7c2785400 Fix a couple of packing problems from 5acfa9921e
Packable units should pack in the attack order after the standground
check, and they should pack before chasing.
Reported by: bb
Comments by: mimo at D1458
This was SVN commit r21784.
2018-04-25 23:47:24 +00:00
elexis ae06687b80 Revert sinkrate change from 35b0715c3a which was too drastic (15x).
Remove unneeded, slightly different sinkrate from the hellenic epic
temple.

Differential Revision: https://code.wildfiregames.com/D1467
Baed on patch by: Nescio
This was SVN commit r21783.
2018-04-25 12:54:32 +00:00
elexis fa01a67d42 Fix gaia becoming defeated due to yet another missing IsInWorld check.
The check should have been in there for mods (garrisonable CCs) since
the first version, but it was needed the hard way by units becoming
targets in 76d648349d.

This was SVN commit r21782.
2018-04-25 12:26:34 +00:00
elexis ec8d95abe1 Update auras of entities of other players that affected the defeated player after 2651caa885 removed this case handling unintentionally.
Also avoids some unneded player entity aura cleans.

Differential Revision: https://code.wildfiregames.com/D1453
Reported and comments by: fatherbushido
Reviewed By: temple
refs #5099

This was SVN commit r21779.
2018-04-24 17:28:24 +00:00
elexis 76d648349d Fix gaia units ignoring players without CCs.
As demonstrated by Dizaka, it allowed players to win a game by deleting
all buildings, sending one unit across the map and having the enemy get
defeated by the double gaia count.
It also means that players that still have buildings but no CCs/Wonders
are targetted by elephants.

This was SVN commit r21777.
2018-04-24 12:46:59 +00:00
elexis 5a34c9e570 Add missing distance from nomad units to soldiers garrisoned on walls by the trigger script, noticed by temple.
Delay city patrols in nomad mode.
More trees on roads.

This was SVN commit r21775.
2018-04-24 11:21:11 +00:00
mimo 0933f24891 petra: small tweak for civs without field
This was SVN commit r21773.
2018-04-23 20:30:22 +00:00
elexis 25099f2898 Remove aggressive gaia soldiers on nomad random maps.
Differential Revision: https://code.wildfiregames.com/D1465
Reviewed By: (-_-) aka smiley
This was SVN commit r21772.
2018-04-23 18:13:39 +00:00
bb e3bc85388f Hide the settingsPanel for non-controllers
Patch By: ffffffff
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1243
This was SVN commit r21771.
2018-04-23 15:29:35 +00:00
bb 15a16beed3 Tidy up gamesetup initGUIObjects
Suggested By: elexis
This was SVN commit r21770.
2018-04-23 15:09:21 +00:00