1
0
forked from mirrors/0ad
Commit Graph

18078 Commits

Author SHA1 Message Date
elexis d18374bffe Fix ugly font rendering using GL linear interpolation if the UI scale was changed.
Patch By: Dariost
Refs D332

This was SVN commit r20735.
2017-12-30 17:56:07 +00:00
elexis a62690c65a Add cheat code to play arbitrary music playlists, by default the 8-bit retro easteregg track from [[SVN:19890]] (yet to be committed to the public mod).
Fixes #4677.
Differential Revision: https://code.wildfiregames.com/D1097
Patch By: PingvinBetyar
This was SVN commit r20734.
2017-12-30 17:42:43 +00:00
elexis 669db62c5f Allow cheats to pass negative numeric arguments and default parameters for cheat arguments that are strings, refs D1097.
This was SVN commit r20733.
2017-12-30 17:38:01 +00:00
elexis 0c70fb3036 Deobfuscate, deduplicate and fix Corsica vs. Sardinia and Pyrenean Sierra, refs 9016b8d866, a796800bb1.
Use vector algebra instead of adding one equation for each dimension
everywhere, refs #4845.
Add common createPassage terrain helper function to unify
straightPassageMaker and the modified copy PassMaker, refs #4805.

On Corsica vs Sardinia:

Comfort island shaping by
not hardcoding and not hiding magic numbers behind magic equations,
not specifying areas and deriving the radius from the disk area,
but always refer to newly introduced radius globals and compute the area
using diskArea from 1a896f531a.

Don't give some players 10% more map area and place all circular island
parts at the same center location in the map corner.
Don't place trees and mines into passages.
Simplify and order numbers, increase fail fractions from 4 to 10.
Use mapCenter getter from refs #4854.

This was SVN commit r20732.
2017-12-30 16:17:54 +00:00
Stan 279cad48e7 Use helmet prop points for helmets
Use the new head mesh for the new units
Found using : props/units/heads/(?!new/).*" attachpoint="head"

This was SVN commit r20731.
2017-12-30 15:58:53 +00:00
Stan 615403594b Following the inclusion of new horses units now use smaller heads.
Adapt the cataphract helmet to the new heads and move its position to
the helmet prop point
Move it to the new helmet folder

This was SVN commit r20730.
2017-12-30 15:31:55 +00:00
elexis 5500a96751 Delete Savegame format version, refs 7064565ff6.
It is unneeded because we won't add backwards compatibility for previous
formats and
because the engine version check from 94302a4149 is sufficient and more
accurate in testing compatibility of savegames of different releases.
The simpler code allows unifying the savegame version check with the
check used by the replay menu (to be used in multiplayer gamesetups).

Differential Revision: https://code.wildfiregames.com/D1131
Reviewed By: wraitii
Agreed with: Imarok
Discussed with: Philip

This was SVN commit r20729.
2017-12-30 14:54:13 +00:00
Stan 23ece1d627 New pilos helmet and textures.
Discussion here:
https://wildfiregames.com/forum/index.php?/topic/21546-enhancement-macedonian-helmets/&page=2

Move the affected helmets files to the new subdirectory, update all
concerned actors,
Create variant files for the pilos helmet, as a Poc for future commits
and also for the game.
Create a variant folder for the helmets files

This was SVN commit r20728.
2017-12-30 14:24:51 +00:00
Stan 512e8a269c Update the rnc file and compile it with trang to allow variant inheritance. This already worked, without the game even complaining, but the validator.pl would complained (as it should have).
This will be useful to avoid helmet code duplication, see next commit.

This was SVN commit r20727.
2017-12-30 14:21:28 +00:00
elexis b8216a9164 Let Atlas provide a default AI seed.
This addresses the Simulation2 warning about a gamesetup mechanism not
having decided explicitly about the RNG.

Differential Revision: https://code.wildfiregames.com/D1187
Reviewed By: mimo
Refs #4917, 7e05d7edc9 / D1178

This was SVN commit r20726.
2017-12-30 14:02:09 +00:00
mimo 4055c564e9 add a hotkey to toggle tutorial panel + add hotkey parameters to tutorial messages
Discussed with elexis

Differential Revision: https://code.wildfiregames.com/D1184
This was SVN commit r20725.
2017-12-30 13:31:14 +00:00
Stan d0fc111e54 Remove a useless actor now that new horses are committed
Add two dogs as fauna, in case people want to use them for scenarios

This was SVN commit r20724.
2017-12-29 16:36:01 +00:00
elexis fd08061ab6 Allow Vectors to be rounded.
For instance useful when working with location vectors on arrays, such
as terrain generation in random map scripts, refs #4845.

This was SVN commit r20723.
2017-12-29 15:37:16 +00:00
mimo 05f0fadd16 petra: remove a useless break
This was SVN commit r20722.
2017-12-29 14:37:53 +00:00
Stan 094d408fa4 Set some units to the relax stance so they don't look weird,
Use the new spear for greeks

This was SVN commit r20720.
2017-12-29 06:22:33 +00:00
Stan 0b3c1f9e83 Add a missing '/' fixes the previous commits
This was SVN commit r20719.
2017-12-29 06:02:58 +00:00
Stan 8f38f163e0 Fix a missing variant to Leonidas
This was SVN commit r20718.
2017-12-29 02:02:52 +00:00
Stan cacd13879b New horses commit part 08
Big cleanup, remove all the now unused files and some more.
https://wildfiregames.com/forum/index.php?/topic/23012-horse-animations-actors-update/&page=10&tab=comments&failedReply=1

This was SVN commit r20717.
2017-12-29 02:02:17 +00:00
Stan 881798caf1 New horses commit part 07
Add elephant files
https://wildfiregames.com/forum/index.php?/topic/23012-horse-animations-actors-update/&page=10&tab=comments&failedReply=1

This was SVN commit r20716.
2017-12-29 02:00:39 +00:00
Stan 9c51b8a337 New horses commit part 06
Add new horses and update the actors accordingly.
https://wildfiregames.com/forum/index.php?/topic/23012-horse-animations-actors-update/&page=10&tab=comments&failedReply=1

This was SVN commit r20715.
2017-12-29 01:58:56 +00:00
Stan 9fa5b52218 New horses commit part 05
Missing pony file
And new capes
https://wildfiregames.com/forum/index.php?/topic/23012-horse-animations-actors-update/&page=10&tab=comments&failedReply=1

This was SVN commit r20714.
2017-12-29 01:39:06 +00:00
Stan 216ac6632b New horses commit part 03
Move the animations of the camel cavalry to a variant file for
easier edition if/when they are replaced
https://wildfiregames.com/forum/index.php?/topic/23012-horse-animations-actors-update/&page=10&tab=comments&failedReply=1

This was SVN commit r20712.
2017-12-29 01:34:27 +00:00
Stan 808ff546d8 New horses commit part 02
New pony meshes by AlexanderMb
Discussion here
https://wildfiregames.com/forum/index.php?/topic/23012-horse-animations-actors-update/&page=10&tab=comments&failedReply=1

This was SVN commit r20711.
2017-12-29 01:31:19 +00:00
Stan ea1a4b5d7d New horses commit part 01
New seleucid chariot, using the new horses
Accepted by Enrique
Discussed here
https://wildfiregames.com/forum/index.php?/topic/21393-task-seleucid-champion-chariot/&page=2&tab=comments#comment-343097

This was SVN commit r20710.
2017-12-29 01:24:35 +00:00
elexis 1b641789b3 Add painter definition in Ardennes Forest missing in 9272153ee7.
This was SVN commit r20709.
2017-12-28 20:39:00 +00:00
bb e2fdad61e0 Let scrolling up go a tab up instead of down, fixes 8ae67ed15f/9ae7c4d810
Reported By: elexis
This was SVN commit r20708.
2017-12-28 11:40:43 +00:00
elexis 774a049cdd Vector cleanup.
Improve some of the comments mentioned by fatherbushido in b3dbcc457b.
Rename avg to average and test it.
Inline constructor defaults.
Don't use array functions nor for...of loops here to maximize the
performance, refs c751500907.

This was SVN commit r20706.
2017-12-28 01:54:56 +00:00
elexis 5e19b88f89 Display AI behavior, difficulty and name in the tooltip in the diplomacy and summary screen.
Unify the string parsing in D746 / D1159.

Differential Revision: https://code.wildfiregames.com/D1145
This was SVN commit r20705.
2017-12-28 01:31:48 +00:00
elexis ce1cac92f6 Pyrenean Sierra terrain painting cleanup, refs a796800bb1.
Remove redundant heightchecking conditions, unify place calls and use
ternaries, equal to 6273d111fe, refs #4805.

This was SVN commit r20704.
2017-12-28 01:21:33 +00:00
elexis 6c34e27334 Add rmgen playerPlacementCustomAngle helper function for random maps that are gulfs or place players on a circle with a non-uniform distribution.
Remove ocean duplication on Pyrenean Sierra, fix sign of the removed
lololo variable and simplify the player angle equation, refs #4805,
a796800bb1.
Use mapCenter getter from #4854 on Gulf Of Bothnia, Pyrenean Sierra and
the Unknown gulf variant.

This was SVN commit r20703.
2017-12-28 00:39:54 +00:00
Stan 5f455e50b1 Use the boeotian helmet consistently everywhere. This revealed some huge duplication in files,
which cannot be fixed without hacks such as models with only props and a
small triangle
Move all the modified helmets to their new folder, so it's easier to
look for them in atlas
Add a new tin texture with and without laurels to fit the new uvmap Move
the boeotian helmet
 from  the head prop point to the helmet prop point based on a patch
from WowGetOffYourCellPhone
Make the boeotian helmet more modular using props so variants are easier
to make for modders,
nuke the remaining models.

This was SVN commit r20702.
2017-12-27 17:34:01 +00:00
elexis 263c2c8c3c Fix my fail in 3cfb8730a8.
Reviewed By: rosievers
This was SVN commit r20701.
2017-12-27 16:53:29 +00:00
elexis 7e05d7edc9 Initialize the AIManager AISeed immediately in C++ rather than too late and in JS.
Fixes #4907
Differential Revision: https://code.wildfiregames.com/D1178
Reviewed By: mimo
Refs D1159, f88ee2766e

This was SVN commit r20700.
2017-12-27 16:51:25 +00:00
elexis a89918c952 Move player templates from special/ to special/player/.
Differential Revision: https://code.wildfiregames.com/D1179
Reviewed By: bb
This was SVN commit r20699.
2017-12-27 16:11:22 +00:00
mimo 2fff03525e petra: assign more builders to structures blocking a phase up + cleanup of the corresponding functions
This was SVN commit r20698.
2017-12-27 15:49:55 +00:00
elexis 3cfb8730a8 Add helper function to apply arbitrary GUI tags (such as font and color).
This avoids the caller having to duplicate the GUI tag format over and
over again (equal to 54904b1750),
detects syntax errors at compile time and
applies the separation-of-concerns pattern (callers only have to specify
the tag value agnosticly of the tag format).

Differential Revision: https://code.wildfiregames.com/D1167
Patch By: fpre / ffffffff
Comments By: bb
Refs e1b13dead9

This was SVN commit r20697.
2017-12-27 13:36:28 +00:00
Stan e4cc4da1d2 Fix a bug with the gastaphrete mesh that will only show up when
gpuskinning was set to true in the game options. That experimental
features apparently requires that all meshes vertices be weighted
else it stretches it badly.

Add the fixed blendfile.

This was SVN commit r20696.
2017-12-27 13:00:18 +00:00
elexis b9c879c85f Remove duplication on Sahel Watering Holes using the modulo operator, refs #4805.
Use mapCenter getter from 5256d8497e / #4854 and
distributePointsOnCircle from 6fb6a65fc5 to shorten.

This was SVN commit r20693.
2017-12-27 00:51:11 +00:00
elexis 58b2e2baf4 JS file listing cleanup, refs #4868.
Add global filelisting helper.
Remove getXMLFileList and getJSONFileList from the unsorted
gui/common/functions_utility.js.
Make hidden maps prefix more transparent.
Remove hardcoded magic numbers that are string lengths.
Shorten loading screen code and separate pathnames from code.

Differential Revision: https://code.wildfiregames.com/D1107
Reviewed By: bb
This was SVN commit r20692.
2017-12-26 22:44:37 +00:00
elexis fb444d4165 Add GetGaiaAndNonGaiaEntities helper function in the RangeManager and use it in Extinct Volcano (D229).
Differential Revision: https://code.wildfiregames.com/D477
Reviewed By: bb
Proposed By: bb
Discussed with: fatherbushido

This was SVN commit r20691.
2017-12-26 22:03:25 +00:00
Stan 9106e66d98 Add gastaphretes as an atlas only unit for now
Accepted by Lordgood:
Thread :
https://wildfiregames.com/forum/index.php?/topic/22959-gastraphetes/&page=2&tab=comments#comment-343080

This was SVN commit r20690.
2017-12-26 21:48:29 +00:00
Stan 67d9bb6e36 New boeotian helmet for gastaphretes
Accepted by Lordgood
Discussion here :
https://wildfiregames.com/forum/index.php?/topic/21546-enhancement-macedonian-helmets/&page=2
and there
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/

This was SVN commit r20689.
2017-12-26 21:41:08 +00:00
bb 5f9834ac8e Rename wolf_snow to arctic_wolf
Patch By: Phormio
Differential Revision: https://code.wildfiregames.com/D533
This was SVN commit r20688.
2017-12-26 21:16:26 +00:00
bb 7f4edf1926 Add support for diplomacy changes for wonder victory, make notifications more correct, add behaviour string to the gamedescription panel and on the fly cleanup
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D881
This was SVN commit r20687.
2017-12-26 12:59:27 +00:00
mimo dedc368519 allows Healers to be ejectedOnDestroy from ships
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D1147
This was SVN commit r20686.
2017-12-26 10:39:28 +00:00
bb 868b389141 Make the steel_working tech really affect macemen, by adding a crush change refs D552 and D1036
Reviewed By: temple
Differential Revision: https://code.wildfiregames.com/D1174
This was SVN commit r20685.
2017-12-25 16:25:57 +00:00
bb 9ae7c4d810 Merge the two occurences of vertical tab in js and xml code
Agreed with and Comments by: elexis
Differential Revision: https://code.wildfiregames.com/D1175
This was SVN commit r20684.
2017-12-25 16:11:41 +00:00
bb 350c4580f8 Create a parent template for the maceman and add a maceman identity class.
Macemans and swordsman are different, and more civs than just maur might
get them (maybe in mods), so a parent template for them is good to have.
Updating the tech so it keeps affecting the same (but notice it doesn't
do anything with macemans).

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1036
This was SVN commit r20682.
2017-12-24 16:04:10 +00:00
bb a39af19c89 Let the embassy depend on military template instead of special, since that is what the name suggests and an embassy can be used for any civ.
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1006
This was SVN commit r20681.
2017-12-24 15:19:08 +00:00
mimo 31b1d8a996 petra: fix an inverted sign, plus some cleanup
This was SVN commit r20680.
2017-12-24 11:29:03 +00:00