sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
14,412 Commits 7 Branches 28 Tags 13 GiB
c73c9370ee
Commit Graph

14412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leper
c73c9370ee Update tinygettext. Fixes #2522. 
Updates to upstream changeset f71a8e5e84bffadd61ac93768b332262989844fd,
with some additions
that will be submitted upstream (without the addition of precompiled.h
and win32 dirent).

This was SVN commit r16462.
 2015-03-24 17:47:08 +00:00
mimo
28abcb3bcc cache some formation info in gui + some cleanings, see #3078 
This was SVN commit r16460.
 2015-03-23 18:38:27 +00:00
mimo
a430e03d1d Petra: fix for nested loops using same loop index 
This was SVN commit r16459.
 2015-03-23 18:06:31 +00:00
leper
58d955e426 Some cleanup. 
This was SVN commit r16458.
 2015-03-23 13:34:23 +00:00
mimo
e35970b700 Petra: rewrite of the dock placement. It should be more robust and compatible with the new pathfinder now 
This was SVN commit r16457.
 2015-03-22 22:00:59 +00:00
mimo
64adec79da fix a wrong copy&paste in 86054bcf7e 
This was SVN commit r16456.
 2015-03-22 21:51:57 +00:00
historic_bruno
dec4552ffe Removes special handling of fullscreen toggle on OS X w/ SDL 1.2, which is no longer used 
This was SVN commit r16453.
 2015-03-21 21:01:01 +00:00
leper
f680caa14f Escape lobby game names. Fixes #3118. 
This was SVN commit r16452.
 2015-03-21 16:24:29 +00:00
mimo
09ff1f8bea fix some cases where a water nomad random map could end up without water 
This was SVN commit r16451.
 2015-03-19 21:43:55 +00:00
historic_bruno
89107d1406 Fixes grayscale PNG handling, there is no need to convert them all to RGB and 4741e896c4 broke special font texture handling. Instead, only grayscale with alpha PNGs will be converted to RGBA (they fail to load otherwise). 
Removes warning about converting grayscale textures, refs #1640.

This was SVN commit r16449.
 2015-03-19 03:04:01 +00:00
historic_bruno
2a1fcc88e3 Expands game speed dropdown by 10 pixels to accommodate German text and hopefully most other languages 
This was SVN commit r16448.
 2015-03-19 01:43:04 +00:00
mimo
5dd3cbb254 Random nomad maps are now in default filter. 
The number of starting units has been increased to speedup the startup
(building of cc)
Treasures are added when the starting resources are not sufficient to
either build a dock in water maps, or build a cc in land maps.

This was SVN commit r16447.
 2015-03-17 22:03:33 +00:00
mimo
bed480c433 remove some obsolete variables after #16416 
This was SVN commit r16446.
 2015-03-17 21:43:48 +00:00
leper
e288bb7c4e Some gamesetup cleanup. Refs #3049. 
This was SVN commit r16445.
 2015-03-16 23:56:42 +00:00
leper
312155d22f Use arrays for specifying StartingTechnologies, DisabledTechnologies, and DisabledTemplates. 
Also add an example for StartingTechnologies to the Carthagian sandbox
map. Refs #1404.

This was SVN commit r16444.
 2015-03-16 21:54:32 +00:00
leper
09796350c8 Fix changephase cheat broken in af8a6f5e8c. 
This was SVN commit r16443.
 2015-03-16 18:50:51 +00:00
leper
46d17483db Remove --with-system-miniupnpc. 
It was deprecated in 776567d9b2. Either use a system provided miniupnpc,
or use --without-miniupnpc.

This was SVN commit r16442.
 2015-03-16 04:35:01 +00:00
historic_bruno
14f5eed8c7 Restores action-heal cursor from 1d3adefacc now that the engine supports indexed color PNGs, refs #2823 
This was SVN commit r16440.
 2015-03-16 02:38:03 +00:00
historic_bruno
4741e896c4 Improves handling of PNG textures based on GdkPixbuf's setup_png_transformations. The PNG decoder should now support grayscale, RGB or indexed color; bit depth up to 16; and interlacing. Fixes #1640, refs #2823, #3082 
This was SVN commit r16439.
 2015-03-16 02:28:00 +00:00
historic_bruno
b1c4e29ac8 Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029. 
NOTE: requires update-workspaces and may require correction of some
modded actors/scenarios

This was SVN commit r16438.
 2015-03-15 23:59:48 +00:00
leper
7334f76af6 Fix some issues in af8a6f5e8c. 
This was SVN commit r16437.
 2015-03-15 23:56:18 +00:00
historic_bruno
1ae38b8d06 Deletes folder missed in 99cb4b42fd 
This was SVN commit r16436.
 2015-03-15 23:25:46 +00:00
historic_bruno
99cb4b42fd Deletes old autobuilder files. 
Deletes old dds_analyse.pl script.
Updates tools LICENSE.txt

This was SVN commit r16435.
 2015-03-15 22:18:02 +00:00
historic_bruno
333c4401b9 Deletes obsolete entity converter tool. 
Deletes unmaintained contributors.txt list, see forum topic for more
useful list: http://wildfiregames.com/forum/index.php?showtopic=15542

This was SVN commit r16434.
 2015-03-15 21:38:43 +00:00
mimo
2395204011 fixes some typos in previous commits 
This was SVN commit r16433.
 2015-03-15 20:58:33 +00:00
mimo
2b6bde800c some changes to let Petra build structures with the new PathFinder branch 
This was SVN commit r16432.
 2015-03-15 18:25:03 +00:00
Itms
caf89fa04e Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h. 
The file name did not match the content.

Also little cleanup of some unnecessary includes.

This was SVN commit r16431.
 2015-03-15 18:06:32 +00:00
wraitii
f29d059617 Remove conditional defines as those served a very doubtful purpose with parallax, replacing it with something dynamic in the shader. This cleans the C++ side of the renderer as conditional defines were very ugly. 
This was SVN commit r16430.
 2015-03-15 12:22:36 +00:00
wraitii
5a4ddb52a2 Change the tooltip for number of builders to give more useful information and add one on the healthbar of foundations. 
This was SVN commit r16429.
 2015-03-15 12:00:28 +00:00
wraitii
5d6f95321d Fix actor errors revealed by 618fe81814. 
This was SVN commit r16428.
 2015-03-15 11:45:33 +00:00
wraitii
618fe81814 Check when loading an actor that it defines all the texture samplers required by its material. Print out a readable error otherwise. Fixes #1613 (note that this does not check for unnecessary samplers as that is non-trivial and does not lead to graphical glitches). 
Also add a shortcut for some defines to clean-up material files slightly
and make the link between sampler and shader more explicit.

This was SVN commit r16427.
 2015-03-15 11:37:26 +00:00
mimo
372a016311 do not let animals be preferredTarget 
This was SVN commit r16426.
 2015-03-15 11:30:04 +00:00
mimo
24cdf6b851 Petra: check EjectHealth level before trying to garrison 
This was SVN commit r16425.
 2015-03-15 10:57:04 +00:00
mimo
866e00d154 Petra AI now warns its allies when in need of a tribute 
This was SVN commit r16424.
 2015-03-15 10:28:48 +00:00
mimo
cb2da36527 few tunings for Petra 
This was SVN commit r16423.
 2015-03-15 10:20:20 +00:00
mimo
86054bcf7e reduce time of some rndm map generation, i.e. alpine_lakes is about 3 times faster now 
This was SVN commit r16422.
 2015-03-15 10:08:16 +00:00
mimo
a3335b39e5 fix AI init crash when more than 255 disconnected regions in some random maps 
This was SVN commit r16421.
 2015-03-15 10:00:16 +00:00
mimo
09dc9e6f1d fix rounding problem in AI health, fixes #2446 
This was SVN commit r16420.
 2015-03-15 09:54:48 +00:00
mimo
47cb6c01db fix #16416 
This was SVN commit r16419.
 2015-03-15 09:52:15 +00:00
leper
e41ec77eb6 Remove unused file. 
This was SVN commit r16417.
 2015-03-15 04:16:31 +00:00
leper
af8a6f5e8c Removes generic hele and celt civs. Based on patch by prodigalson and 
comments by s0600204. Fixes #2619.

Also removes the theb civ json file.

This was SVN commit r16416.
 2015-03-15 04:16:24 +00:00
leper
82b08db6ec Remove grouping from civ info screen. Only show playable civs. Refs #2619. 
Does not use loadCivData(true) as the civ info screen can also be opened
from the
gamesetup screen and both use g_CivData.

This was SVN commit r16415.
 2015-03-15 04:15:59 +00:00
leper
38a007f6fa Properly escape a string. 
This was SVN commit r16414.
 2015-03-15 04:15:57 +00:00
leper
6f3e682484 Extract strings from the structree. Fixes #3064. 
This was SVN commit r16413.
 2015-03-15 04:15:53 +00:00
leper
3c093ef741 Update lobby room. 
This was SVN commit r16412.
 2015-03-15 04:15:45 +00:00
scythetwirler
1303b4d39b Fix a couple oversights and address cavalry skirmishers. 
This was SVN commit r16409.
 2015-03-09 02:05:32 +00:00
historic_bruno
1a4176ebcf Updates OS X icon with multiple sizes and slightly reduced transparency to make it more easily clickable. 
Updates OS X bundle build script, disables broken testing, refs #2780

This was SVN commit r16408.
 2015-03-09 00:24:15 +00:00
historic_bruno
eaa8f89ffc Reverts action-heal cursor from 1d3adefacc, it was modified to indexed color not currently supported by the engine, fixes #3082, refs #1640. Reapplies the transparent color removal, refs #2823. 
Deletes unused test-old cursor

This was SVN commit r16407.
 2015-03-06 22:01:11 +00:00
leper
206aeaf99f Revert 37da37dbd5. Refs #3072. 
This was SVN commit r16406.
 2015-03-03 23:56:00 +00:00
historic_bruno
c3f62542a4 Expands area for release name slightly, as it was cut off at 1024x768 resolution 
This was SVN commit r16404.
 2015-03-03 21:37:59 +00:00