dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-17 22:03:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
19238 commits 1 branch 39 tags 194 MiB
Commit graph

110 commits

Author SHA1 Message Date
vladislavbelov
9f202500ea Adds maps paths and a tutorial maps tab in Atlas 
Original Patch By: Phormio
Comments By: elexis
Reviewed By: s0600204
Differential Revision: https://code.wildfiregames.com/D614
This was SVN commit r21540.
 2018-03-13 20:20:45 +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
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
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
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
417c84870c Actually remove trailing tabs from source/. 
This was SVN commit r18991.
 2016-11-23 14:09:58 +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
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
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
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
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
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
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
historic_bruno
92fdbb49b6 Moves particle interpolation to its own simulation component. 
Fixes inconsistency between Atlas and in-game particle rendering during
pauses.
Fixes some issues related to Atlas simulation test and map loading.

This was SVN commit r13184.
 2013-02-22 23:20:59 +00:00
historic_bruno
c5e597d5c4 Fixes some Atlas build warnings about hidden overloaded virtual functions when using wxWidgets 2.9 
This was SVN commit r13001.
 2012-12-20 03:57:17 +00:00
myconid
c9abf6f68c Heightmap importing in Atlas 
This was SVN commit r12308.
 2012-08-07 18:49:46 +00:00
historic_bruno
cafb817446 Reverts broken change from 022fc4c47c. 
This was SVN commit r11694.
 2012-04-29 03:20:00 +00:00
historic_bruno
022fc4c47c Fixes Atlas stealing focus on OS X, based on patch by mk12. Fixes #1317. 
This was SVN commit r11693.
 2012-04-29 02:04:59 +00:00
historic_bruno
5cfeccea09 Adds eyedropper tool to Atlas terrain brush (Shift+Click to activate). Fixes #1122. 
Adds preview box showing currently selected terrain.

This was SVN commit r11528.
 2012-04-17 02:43:52 +00:00
historic_bruno
cf11aa8dea Fixes Atlas canvas resolution init on OS X. Replaces hacky solution for the same problem on wxGTK. Fixes #1176. 
This was SVN commit r11525.
 2012-04-16 00:57:30 +00:00
historic_bruno
4cdde2b62a Replaces Atlas "Screenshot" option with normal lower-res version (saves result as PNG). 
Adds new "Big screenshot" option (saves result as 6400x4800 BMP). Refs
#984.

This was SVN commit r11257.
 2012-03-06 00:15:48 +00:00
historic_bruno
046729dfa7 Fixes Atlas double-click behavior in simulation test, by handling the events in Canvas and recognizing wxWidgets' ButtonDown and ButtonDClick events are mutually exclusive. 
This was SVN commit r11035.
 2012-02-07 00:40:55 +00:00
Ykkrosh
e7f0639054 Set Atlas canvas size before potentially rendering to it. Fixes #987. 
This was SVN commit r10526.
 2011-11-13 12:57:34 +00:00
historic_bruno
ab6863c484 This was SVN commit r10430. 2011-10-26 05:41:57 +00:00
historic_bruno
c82ebd7ca9 Fixes Atlas build on OS X. 
This was SVN commit r10429.
 2011-10-26 05:27:03 +00:00
historic_bruno
d966c5e10b Fixes Atlas map saving to force PMP extension on all OSes. See #889. 
Fixes Atlas map loading to more gracefully handle missing files. Atlas
should no longer crash if a map was not found in VFS. Fixes #986.

This was SVN commit r10416.
 2011-10-20 23:45:27 +00:00
historic_bruno
89532feab6 Fixes Atlas file open dialog on OS X (filters not shown by default in wxOSX 2.9). 
This was SVN commit r10168.
 2011-09-02 02:27:55 +00:00
historic_bruno
90fdd26cf1 Sets default wxFileDialog filters in Atlas. 
This was SVN commit r10159.
 2011-09-01 04:47:45 +00:00
historic_bruno
6366ad728f Fixes Atlas toolbar in wxOSX (only Realize() it after creation). 
Fixes terrain preview not displaying first page in wxOSX.
Formats terrain page labels more nicely.
Adds a bunch of tooltips.

This was SVN commit r10131.
 2011-08-29 03:50:29 +00:00
historic_bruno
769a927446 Changes Atlas toolbar construction to use CreateToolBar instead of explicitly setting it (which doesn't work on wxOSX 2.9). 
Adds a call to Atlas_GLSetCurrent after setting Atlas resolution on OS X
(otherwise the canvas doesn't seem to update properly).

This was SVN commit r10129.
 2011-08-28 21:10:45 +00:00
historic_bruno
f2b61d2e56 Fixes Atlas canvas on OS X (needs to be shown before setting GL context - fixes invalid drawable error). 
This was SVN commit r10118.
 2011-08-28 00:28:06 +00:00
historic_bruno
2d1fe050b9 Fixes use of deprecated wxWidgets constants as they don't work on all platforms (only when the library was built with WXWIN_COMPATIBILITY_2_6). 
This was SVN commit r10095.
 2011-08-26 01:56:14 +00:00
historic_bruno
27e5581d27 Fixes Atlas player panel getting out of sync with simulation. Fixes #927. 
Fixes object panel not being notified of map loading.
Fixes bug where opening a new map before using the player panel
prevented default player data being displayed for new players.
Fixes wxGTK 2.8 bug: wxChoicebook control doesn't update the choice
control when adding/removing pages.
Notifies player that deleting player in Atlas will delete all their
objects (and gives them the option).
Changes DeleteObject to DeleteObjects to support multiple selections.
Implements undo for map resize (experimental).
Removes annoying debug message from attempted undo of map settings.
Tweaks a few Atlas UI controls.

This was SVN commit r10064.
 2011-08-22 21:45:39 +00:00
Ykkrosh
5f07107609 Fix build with wxWidgets 2.9 
This was SVN commit r10037.
 2011-08-18 23:38:11 +00:00
historic_bruno
bb33a259b6 Fixes Atlas build errors on OS X (specifically MacPorts' version of wxWidgets doesn't support constructing wxString with std::wstring) 
This was SVN commit r9797.
 2011-07-10 21:00:21 +00:00
Ykkrosh
a81f180dd6 Remove Atlas UI scripting support 
This was SVN commit r9567.
 2011-05-29 15:43:08 +00:00
Ykkrosh
dc2035efc9 Move Atlas map settings from JS to C++. 
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.

This was SVN commit r9566.
 2011-05-29 15:02:02 +00:00
Ykkrosh
07e307c49a Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741 
This was SVN commit r9559.
 2011-05-27 21:56:43 +00:00
Ykkrosh
9733affb05 Fix non-PCH build 
This was SVN commit r9419.
 2011-05-04 01:17:09 +00:00
historic_bruno
b4503bb61e Simplifies random map output, see #782. 
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.

This was SVN commit r9271.
 2011-04-16 04:04:06 +00:00
historic_bruno
ad6f305359 Integrates random maps with Atlas. Fixes #460. 
Adds various map controls to Atlas.
Adds New Map dialog to Atlas.
Removes a few references to old simulation header files.

This was SVN commit r9247.
 2011-04-14 04:01:59 +00:00
Ykkrosh
5a8d291403 Remove old vertexshader renderpath option from Atlas 
This was SVN commit r9236.
 2011-04-13 18:28:27 +00:00
Ykkrosh
d295dacb9b # Add new renderer mode based on GL_ARB_fragment_program. 
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.

This was SVN commit r9123.
 2011-03-26 20:17:21 +00:00
Ykkrosh
ecbd0ae31b Fix Windows build. 
Improve compatibility with GL1.3.

This was SVN commit r9077.
 2011-03-18 18:07:18 +00:00
Ykkrosh
92e84a9112 Fix keys like F11 triggering two events when sent from Atlas to the game engine 
This was SVN commit r8987.
 2011-02-25 23:53:09 +00:00
Ykkrosh
aa8c3a9ea9 Fixed #582 (add camera reset command in Atlas), based on patch from stilz 
This was SVN commit r8911.
 2011-02-11 23:56:55 +00:00
Ykkrosh
73286885d9 Fix race condition when enabling S3TC in Atlas 
This was SVN commit r8448.
 2010-10-23 19:58:45 +00:00