gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Commit Graph

  • d57926fa5b Adjust diplomacy according to irc discussion. Refs #7. leper 2012-11-05 20:16:35 +00:00
  • e969340b6c Fix diplomacy for atlas. leper 2012-11-05 19:34:21 +00:00
  • c1da925786 Change some scenario water settings. Refs #1711. wraitii 2012-11-05 17:31:28 +00:00
  • 9ebdeff90e mauryan fortress small fix Enrique 2012-11-05 16:30:57 +00:00
  • d52cac9c1a Mauryan fortress commited, second mauryan texture (maur_struct_b.png) commited. Enrique 2012-11-05 16:15:15 +00:00
  • 76676b1e38 Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ. wraitii 2012-11-05 12:14:04 +00:00
  • 1e3c885f45 Allow trading with neutral players. leper 2012-11-04 23:01:12 +00:00
  • d8f22c860d Fix when not using shadows. wraitii 2012-11-04 20:39:01 +00:00
  • e633196698 Updates the Belgian Bog settings. Changes the water shader to have refraction look more similar between different quality levels. wraitii 2012-11-04 18:07:41 +00:00
  • ed7c66eb82 Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas. wraitii 2012-11-04 15:54:36 +00:00
  • 7848f4edef Fixes Roman Mars temple by dvangennip, adds garrison prop point and fixes collada warning (unknown polygons set input). Fixes #1708 historic_bruno 2012-11-03 21:08:17 +00:00
  • 1048ab4a1d Fixed water color in Belgian_Bog_night.xml, fixed normals in maur_long_sword.dae Enrique 2012-11-03 14:00:06 +00:00
  • b90a4ef776 Fixes some typos in civ json files, patch by grillaz. Fixes #1168 historic_bruno 2012-11-02 23:07:42 +00:00
  • 21e284f8eb Adds the Belgian Uplands random map, and the Polynesia (Water Demo) demo scenario. wraitii 2012-11-02 21:18:46 +00:00
  • a0e13d9625 Fix tests. BuildingAI now handles DiplomacyChanged messages. leper 2012-11-02 17:20:32 +00:00
  • d75ae52f56 Particles now correctly update with the fog. Refs #276 . wraitii 2012-11-02 16:31:27 +00:00
  • 9930500661 Diplomacy is now mutual. Refs #7. leper 2012-11-02 13:44:35 +00:00
  • a3ddd7b1b3 Fix for some problems when using shadows with the superfancywater. wraitii 2012-11-02 13:08:58 +00:00
  • 114593b9ad Fix the "Advanced water" box from being ticked when then it shouldn't be on loading. wraitii 2012-11-02 09:59:15 +00:00
  • f63b795906 Fixed Mauryan shields origin and thickness, fixed mauryan club and spiked mace Enrique 2012-11-01 15:31:01 +00:00
  • cf23990192 Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager. wraitii 2012-11-01 10:17:54 +00:00
  • 79f2fc1ac1 Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572 historic_bruno 2012-10-31 20:59:43 +00:00
  • f3984a6c0e Forgot the waves shader. wraitii 2012-10-31 18:54:10 +00:00
  • fb035d08e3 fixes #1572 and fixes #932 Changes the water rendering in game to support higher quality effects and to look nicer. wraitii 2012-10-31 18:42:17 +00:00
  • 97b46d402c Removing GL3 dependency from GPU skinning code. myconid 2012-10-30 21:57:00 +00:00
  • 608e01a5b2 Iberian walls and Roman gate use normal/parallax mapping now. Mythos_Ruler 2012-10-30 18:31:05 +00:00
  • c5fae74ac7 Normal mapping for Craterus. Mythos_Ruler 2012-10-30 17:34:40 +00:00
  • 7c1b03d031 Fixes MSVC warnings of truncation from double to float historic_bruno 2012-10-30 02:03:40 +00:00
  • 5b7564da37 Adds moved mikktspace source files to premake4.lua. historic_bruno 2012-10-30 00:56:24 +00:00
  • 367c67d6ad GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup. myconid 2012-10-29 13:20:21 +00:00
  • ae4b3cc9b6 Fixed player color for Mauryan shields. Mythos_Ruler 2012-10-29 00:46:33 +00:00
  • 0353177a94 This was SVN commit r12793. Mythos_Ruler 2012-10-28 23:19:19 +00:00
  • 37d3adcf23 Females now have an attack animation. Mythos_Ruler 2012-10-28 22:08:45 +00:00
  • 8f573c9aae New Mauryan shields. Mythos_Ruler 2012-10-28 00:34:03 +00:00
  • 22b2343192 Fix name/color in diplomacy messages. leper 2012-10-27 23:31:16 +00:00
  • cb8123ffc9 Maiden Guard Archer, until we can combine them into one unit. Mythos_Ruler 2012-10-27 22:52:08 +00:00
  • 5d960a136a Bactrian archer cav. Mythos_Ruler 2012-10-27 22:18:29 +00:00
  • cd79b8e57b Changed DOF size and position. gregory 2012-10-27 21:26:33 +00:00
  • 5ef6d1f92b Adds "English Channel" random map. Spahbod 2012-10-27 13:03:34 +00:00
  • 97554bd726 Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit. gregory 2012-10-26 05:25:50 +00:00
  • 7bd5872dd7 Fixed info in Rome civ json Mythos_Ruler 2012-10-25 16:28:13 +00:00
  • 749b685c64 Mauryans selectable in random map. Mythos_Ruler 2012-10-25 07:42:31 +00:00
  • 9dc1724e57 Mauryan Maiden Guard. Mythos_Ruler 2012-10-24 18:32:50 +00:00
  • 402ea61581 don't set location info by default, music and sounds should not have it set stwf 2012-10-24 13:12:55 +00:00
  • ca4dedbc3e Improve neutral and ally combat handling. Refs #7. leper 2012-10-23 23:13:39 +00:00
  • c98a97924d Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432 fcxSanya 2012-10-23 20:42:03 +00:00
  • a21e01150a Basic diplomacy. Refs #7. leper 2012-10-23 16:31:07 +00:00
  • 8208b52faf Testing new hero selection ring. Mythos_Ruler 2012-10-21 22:30:04 +00:00
  • 932bb87046 New spec and normal maps for some Mediterranean terrains. Mythos_Ruler 2012-10-21 22:28:04 +00:00
  • 4a8e14004c Make markets and traders non conquest critical (from alkazar). quantumstate 2012-10-21 20:59:54 +00:00
  • 9698b67400 Made manual DOF scale with focus. gregory 2012-10-20 23:39:56 +00:00
  • 347b5e18cf Aviv's adjustment to the tooltips for trading. quantumstate 2012-10-20 21:36:36 +00:00
  • 753d151959 Added comments listing the changes from the original shader by Martinsh. gregory 2012-10-18 20:06:25 +00:00
  • e963b43dcc Made bokeh DOF blur stronger, made it use the postproc manager's zNear and zFar values, and moved its settings into its effect XML file. gregory 2012-10-18 18:52:52 +00:00
  • 0981911542 Test strat map city. Mythos_Ruler 2012-10-18 18:18:10 +00:00
  • cc88d057ee This was SVN commit r12769. Mythos_Ruler 2012-10-18 18:17:56 +00:00
  • ec8b49e822 Fixing a small bug suggested by FeXoR. Spahbod 2012-10-18 18:03:01 +00:00
  • 2cb81bc87a Adding a new cheat Spahbod 2012-10-18 13:13:41 +00:00
  • 742a68d055 Adding Syria random map. Updating the preview of Unknown random maps. Spahbod 2012-10-18 06:34:14 +00:00
  • 2c292798bc Changed sample count on high-quality DOF to increase performance. gregory 2012-10-18 01:31:13 +00:00
  • 43ad3569e1 Added higher-quality DOF postproc filter. gregory 2012-10-18 01:21:24 +00:00
  • 7fafeec767 Fixes splash screen to display only once at startup. Fixes #1701. historic_bruno 2012-10-17 20:33:50 +00:00
  • 8e48beeeef Added Belgian_Bog_night map Enrique 2012-10-17 16:32:34 +00:00
  • 71b27dd281 Post processing updates to these maps. Mythos_Ruler 2012-10-16 18:10:20 +00:00
  • bc1efba1dc Moves water rendering update to CCmpWaterManager and uses sim time instead of real time. Fixes water not animating in Atlas and incorrectly animating while the game is paused. historic_bruno 2012-10-15 19:36:04 +00:00
  • 092498f961 (hopefully) fixed errors with the boar skeleton. gregory 2012-10-15 19:30:29 +00:00
  • 9177683653 Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802 Spahbod 2012-10-15 15:19:24 +00:00
  • 1fb7889539 Postproc manager myconid 2012-10-15 10:34:23 +00:00
  • 538286054a Just some floating barrels. gregory 2012-10-15 03:38:47 +00:00
  • cb3e94a746 New wood gathering tech (iron axes) at the Mill, paired with a capacity tech (wheelbarrows). Mythos_Ruler 2012-10-15 03:11:17 +00:00
  • 93c21d8965 Reordering these sandbox maps by renaming them. Mythos_Ruler 2012-10-15 01:54:15 +00:00
  • b581e54185 This was SVN commit r12751. Mythos_Ruler 2012-10-15 00:59:05 +00:00
  • 51496f1d40 Restructured phase_city techs so that phase_city is auto researched. quantumstate 2012-10-14 16:12:22 +00:00
  • dd462c5b8f Moved these civ bonus techs to their civ folders. Mythos_Ruler 2012-10-13 20:51:12 +00:00
  • 57a8fcc724 -Mauryan population cap bonus (+10%) Mythos_Ruler 2012-10-13 20:38:40 +00:00
  • 7f8adcf8cb Adding the demo Unknown-Nomad map. Spahbod 2012-10-11 15:32:10 +00:00
  • 6fd4a75312 This was SVN commit r12745. Mythos_Ruler 2012-10-08 18:10:29 +00:00
  • fa6ce56fde This was SVN commit r12744. Mythos_Ruler 2012-10-08 17:42:47 +00:00
  • a27ef1c4b4 Adjusted some destruction dust to better hide the building->rubble transition. Mythos_Ruler 2012-10-08 17:36:57 +00:00
  • a9417be899 Set some buildings to spawn stone_rubble 2x2, and added custom decals sizes for wall segments rubbles. Enrique 2012-10-08 00:51:24 +00:00
  • 6f4b3b6e5c This was SVN commit r12741. Enrique 2012-10-07 23:10:18 +00:00
  • 3a816f0616 This was SVN commit r12740. Mythos_Ruler 2012-10-07 22:21:20 +00:00
  • 7d0e660fbb Added Player/MaxPopulation for technologies. quantumstate 2012-10-07 22:19:03 +00:00
  • cc34cf169c Nerfed stone throwers based on gameplay and discussion with quantumstate. More game testing will be needed. Mythos_Ruler 2012-10-07 21:19:01 +00:00
  • 6a100996bf Added civ requirement for technologies. quantumstate 2012-10-07 20:34:37 +00:00
  • 14d74055ef Lowered the cost of 5 pop houses after discussion with quantumstate. Mythos_Ruler 2012-10-07 18:05:36 +00:00
  • 5ce5ef9286 Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen. Yves 2012-10-07 12:43:08 +00:00
  • fc294e5ff9 Added rubble_stone_6x6 and set to CC deaths Enrique 2012-10-06 14:04:18 +00:00
  • 45de2907ea Added prop points for falmes to rubble_stone_3x3.dae Enrique 2012-10-06 11:21:13 +00:00
  • 06d0c05a31 Spec and Normal maps for Mediterranean grass terrains. Mythos_Ruler 2012-10-06 06:49:11 +00:00
  • 868c5488b1 Added mountains and mountain passes to Oasis 11. Mythos_Ruler 2012-10-05 18:09:17 +00:00
  • 35b1a5305d Enrique's stone rubble mesh and actor for 3x3 footprints (large houses). Mythos_Ruler 2012-10-05 18:07:30 +00:00
  • 65c0f3efc5 removed extra whitespace stwf 2012-10-03 15:14:20 +00:00
  • 9e328e6b9f Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory. myconid 2012-10-03 12:40:01 +00:00
  • 5cff74f4e7 Replaces FAM file monitoring with inotify on Linux, based on patch by noKid. Fixes #1316, refs #1687. historic_bruno 2012-10-02 00:03:14 +00:00
  • 222256bd59 This was SVN commit r12725. Mythos_Ruler 2012-10-01 01:47:01 +00:00
  • 85c8fa9aec A test normal map for units. Causes error though. Mythos_Ruler 2012-10-01 00:01:46 +00:00
  • 7c7ab773a7 Normal map for destroyed farm field rubble actor. Mythos_Ruler 2012-09-30 02:34:06 +00:00
  • 01e36d1756 Added heroes to Persians Sandbox.xml Mythos_Ruler 2012-09-30 00:55:52 +00:00
  • 6820ee1fc3 Spec and normal maps for farm fields. Mythos_Ruler 2012-09-30 00:05:42 +00:00