gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
14,845 Commits 1 Branch 39 Tags
c9893b3dd07f6a2cd0f61a59111857504ce05c0c
Commit Graph

301 Commits

Author SHA1 Message Date
leper 7f606250f8 Fix build failure on GCC 4.6. 
This was SVN commit r16623.
 2015-05-04 19:37:25 +00:00
trompetin17 a6a2914882 Fix error when you paste entities over another entity and you try to rotate at the same time while pressing alt/shift key 
This was SVN commit r16497.
 2015-04-04 21:45:11 +00:00
sanderd17 0e2c30c7d2 Reduce the strength of the elevation brushes in Atlas. 
This was SVN commit r16488.
 2015-04-02 13:43:47 +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
historic_bruno 8bf1fe1437 Disables water in actor viewer, as a temporary workaround for the "red water" bug, see #2692 for proper fix 
This was SVN commit r16378.
 2015-02-22 19:49:06 +00:00
historic_bruno d644845ae5 Fixes Atlas on Linux with SDL2 by reordering OpenGL init, based on patch by yashi, fixes #2847 
This was SVN commit r16356.
 2015-02-20 05:46:24 +00:00
Itms f6903393bd Add various rotation modes for multiple object selections (individual rotation, global rotation with or without individual rotation). 
Patch by trompetin17, fixes #1213

This was SVN commit r16275.
 2015-02-06 22:23:50 +00:00
JoshuaJB e75498a655 Fix d71161fe4c on WxWidgets 2.8 
This was SVN commit r16258.
 2015-02-02 20:20:37 +00:00
Itms d71161fe4c Add a list of selected entities, grouped by template. 
Patch by trompetin17, fixes #1392

This was SVN commit r16255.
 2015-02-01 21:23:06 +00:00
Itms f52e3ea052 Fix uninitialized variable, fix by trompetin17, fixes #3027. 
This was SVN commit r16249.
 2015-01-30 17:37:40 +00:00
leper fc902df07c Remove checks for unsupported GCC versions (<4.6). 
This was SVN commit r16224.
 2015-01-24 20:37:07 +00:00
Itms 02a50fce62 Notify map makers when they are placing obstructed entities (overlapping other ones or placed outside the borders of the map). Patch by trompetin17 
Fix #1163, refs #2829.

This was SVN commit r16149.
 2015-01-14 09:11:11 +00:00
Itms 57033850a8 Check for unsaved changes in Atlas. Patch by trompetin17, fixes #2819. 
This was SVN commit r16126.
 2015-01-08 21:29:27 +00:00
leper 045fea23aa Properly adjust Atlas for the init changes. 
This was SVN commit r16112.
 2015-01-03 17:42:42 +00:00
leper a472944689 Clean up LoadPlayerSettings. 
Include gaia to make iteration easier.
Add TemplateExists() to the TemplateLoader. Refs #2877.

This was SVN commit r16099.
 2015-01-01 23:10:24 +00:00
leper 992169c3ab Fix indentation in daaddaf433. 
This was SVN commit r16087.
 2014-12-30 17:27:18 +00:00
Itms daaddaf433 Stop music in Atlas when reloading a map, patch by trompetin17, fixes #1712. 
This was SVN commit r16084.
 2014-12-29 21:01:54 +00:00
Itms 8a66a732c7 Add "Copy" and "Paste" entries to the Atlas "Edit" menu. Patch by stilz_, fixes #2642. 
This was SVN commit r15994.
 2014-11-20 20:52:32 +00:00
historic_bruno 1631b8de14 Fixes Atlas error when using the map open/save dialog on Linux, based on patch by njm, fixes #2858 
This was SVN commit r15885.
 2014-10-18 01:53:06 +00:00
historic_bruno 5200ea0365 Fixes starting Atlas from in-game on OS X, patch by trompetin17, refs #2427 
This was SVN commit r15821.
 2014-09-28 07:03:51 +00:00
historic_bruno 0caab0429f Fixes Reset Water Data button position in Atlas, fixes #2820 
This was SVN commit r15815.
 2014-09-27 02:42:42 +00:00
leper 29effb5089 Build fixes and improvements for BSDs. Fixes #2804. 
This was SVN commit r15793.
 2014-09-24 14:11:13 +00:00
historic_bruno 9592c59704 Fixes crash in Atlas color picker tool, noticeable with wxWidgets 3.0. Colors returned by wxColourData::GetCustomColour aren't always valid, so we have to test them with IsOk() before accessing them. Fixes #2805 
This was SVN commit r15782.
 2014-09-21 21:25:51 +00:00
historic_bruno 60d92b643d Fixes some unused variables in Atlas 
This was SVN commit r15746.
 2014-09-13 19:34:04 +00:00
historic_bruno 70d81040cb Fixes Atlas copy/paste not copying actor seeds, patch by trompetin17, fixes #2791 
This was SVN commit r15742.
 2014-09-13 16:53:43 +00:00
wraitii 326290463e Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects. 
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48.

This was SVN commit r15484.
 2014-07-03 20:07:15 +00:00
leper b4fc393f18 Change camera rotation in Atlas to be the same as in the game. Refs #1066. 
This was SVN commit r15466.
 2014-06-29 21:30:51 +00:00
historic_bruno 600e8bd226 Fixes MSVC warning about uninitialized playerId in Atlas entity pasting code (using 0 as a sensible default value), refs #96 
This was SVN commit r15415.
 2014-06-22 22:19:02 +00:00
sanderd17 f1379a77b5 Fix build for wxWidgets version 2.8.10 and older. 
This was SVN commit r15383.
 2014-06-17 19:32:33 +00:00
sanderd17 7d265cec80 Add copy-paste (CTRL+C/V) to Atlas. Patch by trompetin17. Fixes #96 
This was SVN commit r15381.
 2014-06-17 13:14:25 +00:00
leper 940868398c Use Boost.Signals2 for Atlas. Patch by fabio. Fixes #2469. 
This was SVN commit r15173.
 2014-05-19 21:01:02 +00:00
Yves 17f8f09399 Removes the ScriptInterface and SpiderMonkey dependencies from Atlas. 
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.

Fixes #2434
Refs #1886

This was SVN commit r14783.
 2014-02-24 20:22:02 +00:00
leper 78ff9a8480 Fix compilation failures with wxWidgets 3.0. Fixes #2375. 
This was SVN commit r14691.
 2014-01-27 00:02:03 +00:00
historic_bruno ad6ed949ee Fixes unreferenced formal parameter warning in MSVC 
This was SVN commit r14538.
 2014-01-07 23:10:06 +00:00
wraitii 15ec863aec Substantial speed-up of the foam generation code. 
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
 2014-01-05 16:15:20 +00:00
sanderd17 bf58f04511 add wonder victory condition. Refs #1649 
This was SVN commit r14418.
 2013-12-28 13:40:39 +00:00
quantumstate 68880ca5d5 Make atlas player assignment apply to all of the currently selected units 
This was SVN commit r14273.
 2013-12-02 22:46:33 +00:00
leper 5da63764e0 Fix compilation with wxWidgets 3.0. 
This was SVN commit r14215.
 2013-11-20 19:29:10 +00:00
leper 47b26e56d3 Remove unused VideoRecorder from Atlas. 
This was SVN commit r14181.
 2013-11-14 23:05:07 +00:00
leper 4c395f4bf2 Remove Trigger and Cinematic sections from Atlas. 
This was SVN commit r14166.
 2013-11-14 00:10:04 +00:00
leper 3624c591bd Fix compilation failure without PCH. 
This was SVN commit r13946.
 2013-10-05 16:22:51 +00:00
historic_bruno 7901ed51d4 Implements skirmish maps, based on patch by sanderd17, fixes #1198. Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type. 
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631, #889.
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872. Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745.
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.

This was SVN commit r13938.
 2013-10-04 02:29:16 +00:00
wraitii f106d7714a Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results. 
Allows to oversaturate in Atlas' HDR settings.

This was SVN commit r13752.
 2013-08-24 14:44:38 +00:00
leper 54bbbb9797 Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54. 
This was SVN commit r13716.
 2013-08-19 22:11:54 +00:00
sanderd17 a9c71e39a4 make new elevation tool more drastic + add RMB action 
This was SVN commit r13684.
 2013-08-17 14:02:18 +00:00
sanderd17 b820f6e6ae Add a pike elevation tool to make sharp pointed mountains. Fixes #2059 
This was SVN commit r13672.
 2013-08-16 14:46:54 +00:00
wraitii df2458aa39 Allow setting of prop min/max height in the actor Edit. By sanderd17. 
This was SVN commit r13568.
 2013-07-16 13:13:41 +00:00
historic_bruno 94c57085e9 Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852 
This was SVN commit r13419.
 2013-05-22 21:40:56 +00:00
historic_bruno 161d6c1ba7 Improves SDL 2.0 support 
This was SVN commit r13343.
 2013-04-05 02:39:30 +00:00
historic_bruno 6f78224f8d Fixes tooltip in Atlas' locked teams checkbox. 
Adds scrollbar to environment panel and reorganizes controls.

This was SVN commit r13324.
 2013-03-23 19:22:11 +00:00