Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
18,763 Commits 5 Branches 28 Tags 13 GiB
6d54ab4c1f
Commit Graph

334 Commits

Author SHA1 Message Date
bb
6d54ab4c1f Implement combine victory conditions 
Excluding the changes to scenario and skirmisch maps
Transform gameType string to victoryCondition array in load/replaymenu
Adapt the gamesetup to use checkboxes for every victory condition and an
array for storing them
Allow multiple queries in conquestCommon
Remove conquest from regicide, wonder and capture the relic
Move the endless gamedescription from settings to gamedescription
Fixing wrong tabulation from a8a29271ce

This commit will break all scenario and skirmisch maps, their "Gametype"
string needs to be transformed in a "VictoryCondition" array as is done
in the tutorial map (counting endless as an empty array). This counts
for mods too!
Old svn replays and savegame will throw warnings/errors as they are
incompatible after this commit. So svn users will need to delete all
those.

Comments on ai and autostart games By: mimo
Comments on Atlas By: Vladislav
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1240
fixes: #4014

This was SVN commit r21474.
 2018-03-09 21:51:18 +00:00
bb
d470995bcb Fix nomad checbox scrolling wrongly, fixes 70172519b7 
This was SVN commit r21360.
 2018-02-24 20:19:59 +00:00
bb
70172519b7 Use a macro for creating checkboxes in the Atlas map panel (other panels code checkboxes in a different way) 
Agreed With: elexis

This was SVN commit r21338.
 2018-02-23 20:47:46 +00:00
elexis
75c24843b2 Add Nomad checkbox for Atlas, refs #4824, #3591. 
Differential Revision: https://code.wildfiregames.com/D1310
This was SVN commit r21274.
 2018-02-19 22:30:09 +00:00
elexis
c91fd9c2c3 Atlas should only list map JSON files as maps. 
Differential Revision: https://code.wildfiregames.com/D1301
This was SVN commit r21223.
 2018-02-16 16:42:46 +00:00
elexis
c95901515e Stop claiming that JPEG files are supported for heightmap import following c9cecab0be, refs #2828. 
This was SVN commit r21112.
 2018-02-05 14:22:16 +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
elexis
446fef2b35 Delete FALLBACK_CIV "athen" and related code in rmgen/, refs #4034. 
It was only triggered if a civ wasn't set in Atlas.
Because civs are expected to be well-defined everywhere, alwas set the
property in Atlas too, fixing the non-GUI part of #4869.
Use the existing player defaults value then instead of hardcoding a
fallback civ string.

This was SVN commit r20512.
 2017-11-24 21:01:12 +00:00
vladislavbelov
67e27ed7ea Atlas: Cleanup horizontal alignment flags being ignored, fix warnings on a start. 
Fix #3824
Patch by: Clockwork-Muse.
Reviewed by: vladislavbelov.
Differential Revision: https://code.wildfiregames.com/D824
This was SVN commit r20327.
 2017-10-22 20:09:28 +00:00
bb
5b72870745 Enlarge default sidebar size, so everything is visible by default 
Accepted By: elexis
Differential Revision: https://code.wildfiregames.com/D855
This was SVN commit r20305.
 2017-10-16 13:07:07 +00:00
leper
38865845d3 Stop using postfix increment in a few places. 
Pointed out by cppcheck.

Reviewed By: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D414
This was SVN commit r20113.
 2017-09-04 22:00:04 +00:00
elexis
1b44946078 Replace deprecated jsval with JS::Value. 
Remove unused SGUIBaseSettings and GUI comment.
Fix indentation of a macro, refs D794.

Differential Revision: https://code.wildfiregames.com/D838
Review by: leper.
Itms came up with the same patch for the SpiderMonkey 45 update
independently.

This was SVN commit r20062.
 2017-08-28 10:27:36 +00:00
bb
565abd5f1b Fix directory for Atlas help from a93d260643 
When launching Atlas from a higher directory the help.json isn't found.
Fixed by finding the absolute path.

Patch By: vladislavbelov
This was SVN commit r20059.
 2017-08-27 19:32:54 +00:00
bb
62c9c6d7fc Add scrollbars to all tabs in Atlas. 
Reviewed By: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D793
This was SVN commit r20058.
 2017-08-27 18:47:39 +00:00
elexis
a93d260643 Add help button to Atlas with a link to the Manual and bugtracker. 
Differential Revision: https://code.wildfiregames.com/D794
Patch By: Vladislav
This was SVN commit r20021.
 2017-08-21 23:32:29 +00:00
elexis
90beda96f8 Fix atlas clicking following 8f36ca47a1 / D326 by adding the missing clicks property to the wxWidgets SDL event construction. 
Differential Revision: https://code.wildfiregames.com/D452
Fixes #4557
Patch By: causative
This was SVN commit r19589.
 2017-05-16 00:09:16 +00:00
Itms
7d00501a90 Make 81c57e8a28 compatible with wxWidgets 2.8, patch by vladislavbelov. 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D427
This was SVN commit r19525.
 2017-05-07 15:49:55 +00:00
leper
329f9e0957 Remove broken atlas error reporting code. 
This has been disabled for nearly 10 years (44f5288a1d), so remove it.

Reviewed By: fatherbushido, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D423
This was SVN commit r19511.
 2017-05-04 09:29:24 +00:00
leper
ecaa8434b1 Cinematic path node moving tool for Atlas. Patch by Vladislav. 
Differential Revision: https://code.wildfiregames.com/D369
This was SVN commit r19483.
 2017-04-30 23:47:16 +00:00
elexis
81c57e8a28 List, add and delete cinematic paths in Atlas. 
Doesn't provide a way to add/delete nodes of paths yet.

Differential Revision: https://code.wildfiregames.com/D348
Patch By: Vladislav
This was SVN commit r19427.
 2017-04-18 03:30:16 +00:00
elexis
290e67dc32 Add cinematic page to the atlas editor with one option to enable rendering of existing paths. 
Differential Revision: https://code.wildfiregames.com/D301
Patch By: Vladislav
This was SVN commit r19391.
 2017-04-09 02:12:20 +00:00
elexis
35377c51a7 Capture The Relic gamemode. 
Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D152
This was SVN commit r19345.
 2017-03-25 07:01:07 +00:00
leper
a0a0895a12 Pass some strings and a vector as const refs. 
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D160
This was SVN commit r19240.
 2017-02-24 17:02:10 +00:00
elexis
417c84870c Actually remove trailing tabs from source/. 
This was SVN commit r18991.
 2016-11-23 14:09:58 +00:00
elexis
6149dd3841 Actually remove trailing whitespace for non-header files as well. 
This was SVN commit r18989.
 2016-11-23 13:02:58 +00:00
elexis
b18f74da44 Remove trailing whitespace and whitespace in empty lines of source/ except source/third_party/. 
This was SVN commit r18987.
 2016-11-23 11:18:37 +00:00
elexis
bcbf25bfbd Fix line endings of all files in source/ except source/third_party/. 
This was SVN commit r18558.
 2016-07-25 09:07:45 +00:00
elexis
8dddd369ef Basic regicide gamemode. Based on patch by Sandarac, refs #2160. 
Spawn a random hero at gamestart and defeat the player if the hero dies.
Consider nomad maps where units spawn without buildings or start on a
ship.
Correct a comment for TriggerHelper.SpawnUnits.
Make shuffleArray available to GUI and simulation and use it to
randomize heroes.

This was SVN commit r18544.
 2016-07-21 15:12:49 +00:00
sanderd17
1e6c12de7b Allow variants to be defined in external files. Fixes #3286 
This was SVN commit r18054.
 2016-04-19 07:51:59 +00:00
fabio
9a2d0f803e Remove disabled by default SDL1 support. 
Refs #2041.

This was SVN commit r17470.
 2015-12-14 10:52:21 +00:00
wraitii
1e504cd64c Fix the actoreditor menu bar on OSX. Patch by trompetin17. Fixes #1554. 
This was SVN commit r17458.
 2015-12-13 16:53:35 +00:00
elexis
71b0d9c052 Update atlas with the new map_sizes.json format. Refs #3355. 
This was SVN commit r17379.
 2015-12-04 16:37:30 +00:00
mimo
21619a4705 Move the victory conditions to the new simulation settings system. Patch by elexis. Refs #3355,#3001 
This was SVN commit r17026.
 2015-09-16 09:22:36 +00:00
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