1
0
forked from mirrors/0ad
Commit Graph

17350 Commits

Author SHA1 Message Date
mimo 307ed87829 petra: fix some rare case trying to attack an ally
This was SVN commit r18444.
2016-06-26 18:18:29 +00:00
wraitii ead8436b3d Improve water rendering, partly based on a patch by aeonios, including:
-increase the size of the refraction and reflection texture
-blur the refraction map depending on depth

Fixes #3781

This was SVN commit r18443.
2016-06-26 16:54:58 +00:00
wraitii a4a45e4dc4 Fix compiler warning, thanks to elexis. Refs #4056
This was SVN commit r18442.
2016-06-26 16:51:52 +00:00
elexis 9f796068f8 Win and defeat cleanup, fixes #4013.
Add a new simulation message and chat notification for players who won.
Avoid duplicate playerstate messages in the sim and GUI by triggering
changes with a function instead of a message.
Reveal the map on defeat/win exclusively in the player component
(instead of having a silly GUI proxy and doing it also in the
EndGameManager sometimes).
Remove the skipAlliedVictory argument from the player component, since
that shouldn't contain references to the EndGameManager, refs #3970.

Show a proper message box on win/loss and add the hint for hosts
disconnecting other players.
Do defeat/win procedure in the GUI when such a message arrives, instead
of checking onTick for playerstate changes.
Thus don't show that confirmation again on every rejoin.
Don't show a pointless message box if IsAtlasRunning.

Explain that the session.js variable is needed to avoid an
order-of-execution bug.
Select "observer" item when rejoining as a defeated player.
Remove an unneeded call to updateTopPanel.

This was SVN commit r18441.
2016-06-26 04:40:50 +00:00
elexis 8da8d28102 Savegame / summary screen / replay menu cleanup, refs #1090.
Savegame / replay menu selected game information:
  Show players who won the game (not only defeat).
  Show translated civs instead of the civ code.
  Use a translation for "%(team)s:\n%(playerDescriptions)s".
  Merge nearly duplicate objects passed to formatPlayerInfo.
  Merge deleteGame and deleteGameWithoutConfirmation.

Summary screen:
  Construct the summary screen title in place, not in the session, nor
replay menu.
  Remove g_Players from the replay metadata since all relevant
information is contained in the sim data.
  Split g_GameData into gui and sim.
  Access g_GameData instead of data for consistency.
  Move code from XML to JS.
  Don't use victory music when observers enter the summary screen (just
keep the current track like when exiting the game as a player).
  Rename updateObjectPlayerPosition to initPlayerBoxPositions.

This was SVN commit r18440.
2016-06-26 03:36:55 +00:00
wraitii 898ab5229b Change profiling calls to get a better view of what is actually slow and what is not.
This was SVN commit r18438.
2016-06-25 13:12:35 +00:00
FeXoR d2e081b602 Separate getFullEntityList() - gathering all entities placed until now on a random map in a list - from getMapData(). Preparation for committing collision detection and beautifier patches. Fixes #4068
This was SVN commit r18437.
2016-06-25 12:00:06 +00:00
wraitii be1b5a9fa7 Improve Profiler2 JS interface with multiple threads and frameless threads. Add a setting to the analysis graphs. Refs #4056
This was SVN commit r18436.
2016-06-25 10:12:04 +00:00
wraitii c886206d96 Fix crash after opening profiler2 with GPU profiling following 3cbe96d24c. Refs #4056
This was SVN commit r18435.
2016-06-25 09:11:10 +00:00
mimo 98f8541581 remove a useless leftover var
This was SVN commit r18434.
2016-06-24 18:03:19 +00:00
elexis d8e9642d09 Fix lineendings of all files in simulation/.
This was SVN commit r18433.
2016-06-24 12:39:22 +00:00
elexis 989df9cb3b Fix lineendings of JS simulation components.
This was SVN commit r18432.
2016-06-24 12:23:39 +00:00
elexis b8fbfe2d20 Survival of the fittest cleanup. Based on patch by bb, refs #3102.
Show notificaiton to all players and observers.
Whitespace fixes.
let instead of var.

This was SVN commit r18430.
2016-06-23 22:37:42 +00:00
mimo 9c980173e3 petra cleanup
This was SVN commit r18429.
2016-06-23 18:25:27 +00:00
elexis 62f4a4f7ca Lobby / gamesetup cleanup.
Translate the map "random" in the lobby.
Fix a warning in getMapDisplayName reported by echotangoecho when
hosting a lobby game and selecting the random map.
Use the right translation of that "random" map in b84b9a374a (since it's
not the maptype).
Notice mapInfoName still shouldn't be colored.

This was SVN commit r18428.
2016-06-23 14:33:28 +00:00
elexis 89fd897fd9 Buff quinquereme, especially the garrisoning of expensive catapults. Patch by causative, fixes #4065.
This was SVN commit r18427.
2016-06-23 13:20:46 +00:00
wraitii 95d3612b68 Fix Profiler2 calls in UserReport.cpp, which lead to multiple Leave events being recorded without corresponding enter events. Possible fix for the linux crash of profiler2.
This was SVN commit r18426.
2016-06-23 10:01:31 +00:00
wraitii 490ee7387f Fix a double to float coercion and JS errors with empty threads in Profiler2 . Refs #4056
This was SVN commit r18424.
2016-06-22 16:46:49 +00:00
wraitii 3cbe96d24c Revamp Profiler2 to make it more usable.
Features include new graphs to compare runtime of functions and runtimes
across reports, as well as new profiling functions that only profile
spikes.

This was SVN commit r18423.
2016-06-22 13:38:05 +00:00
elexis 68bc88fb95 Savegame GUI cleanup..
Move duplicate reallyDeleteGame to shared file.
Inline getPlayerInfoText since it is used only once, refs #1090.
Merge deleteGame and deleteGameWithoutConfirmation.
Use let instead of var.

This was SVN commit r18422.
2016-06-22 11:42:43 +00:00
elexis 2735494a92 Configurable batch size when training units. Patch by Sandarac, fixes #4059.
This was SVN commit r18421.
2016-06-22 11:13:40 +00:00
niektb 70417715be Enhanced autumn trees from Delenda Est. Related forum topic: https://wildfiregames.com/forum/index.php?/topic/20833-autumn-tree-content-mod/#comment-317651
This was SVN commit r18420.
2016-06-21 15:45:14 +00:00
elexis 0f807c643a GUI cleanup.
Point out missing functionality and unused properties in the
implementation of checkboxes.
Don't specify a useless font tag for checkboxes in the templates.

This was SVN commit r18419.
2016-06-21 14:38:06 +00:00
wraitii 9e526614be Accidentally left a change from #4056 in in 7c21a0cf8e.
This was SVN commit r18418.
2016-06-21 11:13:00 +00:00
wraitii 7c21a0cf8e Header cleanup: profile.h is no longer unnecessarily included in scriptinterface.h but rather in the required .cpp files
This was SVN commit r18417.
2016-06-21 10:33:11 +00:00
elexis bc40ebb97e Improve bartering GUI responsiveness and immediately switch to the selected resource instead of waiting one turn. Refs #3194.
This was SVN commit r18416.
2016-06-21 09:34:26 +00:00
elexis 4fde34c168 Revert be5f2d2bb5 since the implicit conversion throws a warning.
This was SVN commit r18415.
2016-06-21 00:06:14 +00:00
mimo 600f21578f cleanup of some replay and savedgame stuff
This was SVN commit r18414.
2016-06-20 17:43:16 +00:00
elexis be5f2d2bb5 Remove an unneeded String() conversion.
This was SVN commit r18413.
2016-06-20 16:09:57 +00:00
elexis 23a9fa1e65 Trigger script cleanup.
Remove tons of trailing whitespace.
Format JSdoc comments properly.
Use alphabetical sorting in array.
let instead of var.
Eliminate deprecated for-each.

This was SVN commit r18412.
2016-06-20 15:59:14 +00:00
elexis 86db6dcf12 Implement wonder victory games that are finished instantaneously after build, refs #3234.
Thus don't supplement the hypothetically missing wonderduration
gameattribute with a hardcoded simulation default.

This was SVN commit r18411.
2016-06-20 15:46:21 +00:00
mimo f7ff2f2e99 improve load game UI, fixes #1090
This was SVN commit r18409.
2016-06-19 21:01:25 +00:00
niektb 5bc0de7f3a Put the newly credited persons in 24b2a2b828 in an alphabetical order
This was SVN commit r18408.
2016-06-19 18:13:35 +00:00
niektb 24b2a2b828 Three new fauna portraits made by Foaly
This was SVN commit r18407.
2016-06-19 18:08:39 +00:00
elexis 5186560466 Suppress a warning.
This was SVN commit r18406.
2016-06-19 14:37:38 +00:00
elexis 22f6daf612 Add missing territory to corrals (to prevent decay in connected allied territory).
Increase territory of the storehouse slightly to allow adjacent
buildings.

This was SVN commit r18405.
2016-06-19 14:32:42 +00:00
mimo dbe985cd78 petra: remove some useless return
This was SVN commit r18404.
2016-06-18 17:34:02 +00:00
mimo e8291130bd petra: update list of enemy structures when diplomacy changes
This was SVN commit r18403.
2016-06-18 16:59:34 +00:00
elexis 932b0c1e3e Trireme and bireme ship balancing.
The mauryan empire is not known to have the strongest fleet, so reduce
their ships hitpoints to the average for that model.
Redue bireme metal cost to make it an actual alternative to the trireme,
considering population cost and hitpoints.
Remove a hardoded linenumber in a comment.

This was SVN commit r18402.
2016-06-18 14:30:21 +00:00
elexis 64d14b9fc6 Fix "supersedes" indentation issue of technologies in 4c22d4631a.
This was SVN commit r18401.
2016-06-18 11:07:44 +00:00
elexis b28dfb42df Fix indentation of auras in 46ead523b8. Patch by fatherbushido, reported by leper, fixes #4062, refs #3792.
This was SVN commit r18400.
2016-06-18 10:45:33 +00:00
elexis 09fdf716e9 Session cleanup.
Move chat window and developer overlay to a custom file.
Use String(foo) instead of ""+foo.
Remove a pointless loop and GetGUIObjectByName call in autoCompleteNick.
Remove noisy line-comments.

This was SVN commit r18399.
2016-06-17 15:38:07 +00:00
elexis f4b818bec4 Wonder mode cleanup.
Remove unused, seemingly unusable wonder duration multiplier, refs
#3234.
Replace wonderDuration of the EndGameManager with gameTypeSettings,
since the component should be agnostic about victory condition logic.
Remove an unused cmpEndGameManager.
Inline a variable, few newlines, let intsead of var.

This was SVN commit r18398.
2016-06-17 14:24:30 +00:00
elexis 8c69309e7c Missing semicolon, rephrase comment, refs #3216.
This was SVN commit r18397.
2016-06-17 12:08:40 +00:00
elexis f60befe098 Capture statistics summary. Patch by maveric and Imarok, fixes #3216.
Also colorize the headings, use two lines per player and remove
duplication of an ugly regex hack.

This was SVN commit r18395.
2016-06-17 02:27:11 +00:00
elexis df764c0200 Increase vision range proportionally when increasing the attack range. Patch by Imarok, fixes #3989.
This was SVN commit r18394.
2016-06-17 01:11:39 +00:00
elexis a214f83017 Trader cleanup.
Remove unused required goods.
Won't be used since setting the goods individually for every trader is
overkill.

This was SVN commit r18393.
2016-06-16 20:54:31 +00:00
elexis 7c9c715ddc Tech tree cleanup.
Newlines.
Eliminate deprecated for each.
One or two simplifications.

This was SVN commit r18392.
2016-06-16 20:26:36 +00:00
elexis a874b3c1c3 Colorize playernames in the kick/ban chat notification, refs #3241.
This was SVN commit r18391.
2016-06-16 17:13:02 +00:00
sanderd17 450973a624 Clean up some code-style issues reported by leper
This was SVN commit r18390.
2016-06-16 14:51:12 +00:00