mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-18 01:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,065 Commits 1 Branch 39 Tags
05f0fadd16d4eeadc851e7e5216fa60debbd0e98
Commit Graph

18065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bb 84dd34639d Remove duplicate check in the canAttack query between unitAI and attack, also remove the forceRespond relic, which allows units to attack neutral players. 
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1099
This was SVN commit r20678.
 2017-12-23 15:53:00 +00:00
bb c67bd74008 Make unit icon naming consistent 
Use correct names (e.g. cart)
Specify civs when possible, also instead of culture

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D985
This was SVN commit r20677.
 2017-12-23 14:11:05 +00:00
wraitii 95c03dcc64 Let the template define the actor used for the projectile. Also let projectiles have an impact animation (such as an explosion). 
This will enable us in the future to have technologies that change
projectiles.
This is also somewhat of a refactoring.

Patch By: Mate-86
Reviewed By: wraitii
Trac Tickets: #1909

Differential Revision: https://code.wildfiregames.com/D945
This was SVN commit r20676.
 2017-12-23 09:27:19 +00:00
bb 7d7a4a6b14 Use an object in splitRatingFromNick instead of an array and some cleanups 
Patch By: ffffffff
Differential Revision: https://code.wildfiregames.com/D1087
This was SVN commit r20675.
 2017-12-22 19:20:03 +00:00
mimo e0bd348bce some petra cleanup 
This was SVN commit r20673.
 2017-12-21 19:01:55 +00:00
mimo 3319c69d97 Choose AI behavior in gamesetup 
Original patch from Sandarac, reworked by elexis and finalized by mimo

Discussed with elexis

Differential Revision: https://code.wildfiregames.com/D1159
This was SVN commit r20671.
 2017-12-20 22:02:15 +00:00
mimo c0c046c273 petra: fix an inverted ternary (and tune a bit the values used) 
This was SVN commit r20670.
 2017-12-20 17:59:43 +00:00
Imarok 2c243b701e Reorder some summary entries and set default charts to economy & total score. 
Reviewed by: Imarok
Differential Revision: https://code.wildfiregames.com/D1110
This was SVN commit r20669.
 2017-12-20 11:05:48 +00:00
Stan 749ce0c894 Move a sheep texture to the correct folder and make use of it. 
Only trainable sheep have the player colored collar.

This was SVN commit r20667.
 2017-12-19 23:19:33 +00:00
Stan 13bfcb150a New rabbit. 
Animations by AlexanderMB
Textures by myself + some fixes to the armature not to break when
exporting from the blend
Remove old texture and mesh.

This was SVN commit r20666.
 2017-12-19 22:48:58 +00:00
mimo 5df1f4ec4c add allowCapture argument to moveAttack (and patrol) commands 
Discussed with elexis

Differential Revision: https://code.wildfiregames.com/D1150
This was SVN commit r20665.
 2017-12-19 19:24:48 +00:00
Stan d2238ece6d Update Chariot anims to be compatible with blender and add a source file if modification is ever needed 
Add a death anim.

This was SVN commit r20664.
 2017-12-18 23:44:51 +00:00
Stan 1df50d9a07 New Zebu anims and armature. I made Idle, Walk, and used Alexandermb's work to make death variants. 
Skeleton was generated using the python script I wrote some time ago.

This was SVN commit r20663.
 2017-12-18 23:37:58 +00:00