Commit Graph

197 Commits

Author SHA1 Message Date
James Sherratt c46d1260f5 Tidy up 2022-08-24 23:26:25 +01:00
Jammyjamjamman c5245a9e73 More fixes to cmake builds
- Add icons to windows exes.
- Revert removal of CurlGetConfig.cmake. This is still required in
ubuntu. (Perhaps only for static builds.)
2022-08-24 23:26:24 +01:00
Jammyjamjamman 6723924b5b Fix map editor and g3d viewer build for linux and macos 2022-08-24 23:26:24 +01:00
Jammyjamjamman b405ce86ca Get map editor and model viewer building with VS cmake builds
* Map editor and model viewer build, but only as "Release" build.
* Unwanted flags not set for msbuild, such as FPIC, -g3, -O3, -sse...
* Wanted flags set for msbuild e.g. /arch:SSE2 /fp:fast -D__SSE__
-D__SSE2__
* Allow including wx, used for vcpkg wx.
* Mapeditor is WIN32 exe for VS_BUILD. (Not sure why this is needed...)
* g3d viewer and map editor mains edited to remove unnecessary windows-
only code(, for strings).
2022-08-24 23:26:24 +01:00
Jammyjamjamman 1e8ff3642c Cmake: Add build configuration for VS builds
* Build vs 2019 project using cmake.
* Cmake configured to work in windows. Hopefully still works in linux
too!
* Update vcpkg install script.
* Configures build for MG game release or debug mode.
* Still need to fix building mapeditor and g3d viewer.
* Remove CurlGetConfig.cmake (not needed!)
2022-08-24 23:26:24 +01:00
Jammyjamjamman 789e1cdf37 Fix editor and g3dviewer for wx 3.1.x
glCanvas args struct needs to be null terminated.
https://trac.wxwidgets.org/ticket/19193#ticket
fixes iss #207.
2021-06-04 22:08:18 +01:00
titiger fbd0cfb17e get rid of manual wxPaintEvent creation 2021-05-29 02:41:40 +02:00
titiger e09ba53c43 get rid of manual wxPaintEvent creation 2021-05-29 02:12:38 +02:00
titison a700ced734 Editor: Heightmap Export function (small fix for import function)
Not without loss because megaglest uses floats for height
2021-05-16 15:16:22 +02:00
titison 98c8cab708 MapEditor: Reworked resize function 2021-05-09 12:21:49 +02:00
titiger 86de5f12f5 Don't change map save dir when selecting heightmap 2021-03-20 15:16:59 +01:00
titison b4510aa412 Editor: It's 2021 ;) 2021-03-19 16:11:32 +01:00
titison 0201af7ccf Editor: Brush preview and Shift-Key for filling brush
Editor needs to render more often for the preview function.
2021-03-19 16:06:38 +01:00
titison 880730e5e1 Editor: Import Heightmap from image
Function similar to MuwuMs tool https://forum.megaglest.org/index.php?topic=8353.0
Image is resized to the dimensions of the map. Changes in the ratio only work with some image formats (png,jpg) wxWidget bug?
2021-03-16 15:19:40 +01:00
andy5995 7ce848505b
map editor/main.cpp: mark this stone as unharvestable
This makes it more clear that this particlular stone is unharvestable.
Usually people can figure it out after their map has unharvestable stone
where they wanted harvestable stone to be, but this maybe will help new
map-makers.
2019-05-06 01:11:29 -05:00
titiger 12998eb10f bugfix for "save as". see #177 2017-12-18 01:43:29 +01:00
SoftCoder 588ec21d8a - more cppcheck cleanup, AND some new inernal steam commandline parameters to reset stats and enable debugging 2017-10-09 23:09:52 -07:00
Mark Vejvoda 0bca1e8eed Merge pull request #163 from susnux/develop
Fix build with wxWidgets 3 (wxString to std::string)
2017-09-23 02:27:06 -04:00
filux ef1c26d931 improved formatting of '--help' output in a way to be more friendly for help2man 2017-04-01 14:53:34 +02:00
SoftCoder bdfb05a700 - attempt to add support for static use of wxwidgets in tools 2017-03-20 17:06:12 -07:00
Ferdinand Thiessen 5e683511e3 Fix build with wxWidgets 3 (wxString to std::string) 2017-03-11 14:21:12 +01:00
filux c81dea0029 version number for the development 2017-03-08 21:44:28 +01:00
filux 4846ad092e version number for the release 2017-03-08 21:29:45 +01:00
filux 812589cae6 improved 'start_megaglest_gameserver' script 2017-03-05 17:31:25 +01:00
titiger da48cfe9ce fix for #148 2. 2017-02-20 01:02:51 +01:00
andy5995 9534943a9c fix spelling of "Divider" that shows in map editor
also changed the corresponding variable names
2017-02-15 13:47:53 -06:00
SoftCoder 8195121fca - Check for packaged streflop and use it before using embedded copy 2017-02-05 16:48:50 -08:00
SoftCoder b9a0a31127 - fixed Issue #146 2017-02-05 14:03:35 -08:00
filux bcb8d197d3 fixed some typos [ci skip]
https://lintian.debian.org/full/pkg-games-devel@lists.alioth.debian.org.html#megaglest
2016-02-19 21:17:31 +01:00
titiger 3a4a6143d2 fixed ctrl-s and maybe more menu shortcuts
Beside of this I removed some never used complicated key shortcuts 
noone knows anyway.
2016-01-31 02:25:24 +01:00
filux 570a49164e version number returns to 'dev' 2016-01-24 15:46:49 +01:00
filux aa2d9f7de4 version number for release 2016-01-24 12:00:38 +01:00
filux a17f3563c8 let's try how this affect portability of binary files on linux now 2016-01-23 20:05:51 +01:00
titiger 1385f3fea2 trying to fix map editor for wxwidget 2.8 too 2016-01-23 19:05:32 +01:00
SoftCoder 06cc22fd8f - fix wx 2.8 support 2016-01-22 22:33:08 -08:00
SoftCoder 236b95fc0d - fix map editor in wx 3.0.2 2016-01-22 17:49:35 -08:00
SoftCoder 1f8096ff81 - finally foudn and fixed color picking crash! 2016-01-18 23:25:31 -08:00
SoftCoder 0d8377d6b4 - try to fix mac build 2016-01-18 15:29:16 -08:00
SoftCoder 86a59859b9 - atempt to cleanup use fo auto_ptr 2016-01-18 13:20:49 -08:00
filux 92f97c13bd updated year [ci skip] 2016-01-03 10:52:16 +01:00
filux 0cad944118 implemented appdata 2/2 2015-12-14 23:57:05 +01:00
filux a5a1e2b717 tiny polishing related with gcc & wxWidgets 2015-12-07 17:20:58 +01:00
filux 05ca47574d fix related with 'single install directory' [ci skip] 2015-11-08 22:44:32 +01:00
SoftCoder 09c686f82d - applied fix for issue #50 2015-10-28 20:01:21 +01:00
SoftCoder 860fd788f2 - fixed issue #75 (map editor file->new refreshes afterwards) 2015-10-28 20:01:03 +01:00
filux 465e718637 and one more fix for mac 2015-10-26 21:19:31 +01:00
filux 9932920712 few improvements in compilation on mac 2015-10-26 20:56:55 +01:00
filux 48d0d2afbf updated deployment target for macos; added info about used wxWidgests' libs [ci skip] 2015-10-09 18:16:12 +02:00
filux 4bef525bf3 removed not required CURL module, renamed several cmake-build options for be more easy sortable by name 2015-09-27 19:46:35 +02:00
filux 4ad684deaf updated modules: LUA, GLEW 2015-09-22 01:04:22 +02:00