Commit Graph

1789 Commits

Author SHA1 Message Date
pavanvo db66662a8b
Merge branch 'fix/internet' into play 2022-09-06 21:04:41 +04:00
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 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 523229ab55 More progress with cmake for Visual Studio projects
* Change conditon so that L137 onwards of main CMakelists.txt is
executed fro VS project target. Main reason to do this was to make sure
project actually built with streflop.
* Change conditions after L137 so unwanted compile flags aren't added.
* Project now builds multi threaded for VS project. Tries to use max
number of cores.
* Simplify cxx flags. Remove unneeded MT and MTd flags.
* Set VS build output to mk/windoze.
* Add FPUSettings.asm to streflop in cmake, if VS project specified.
* Remove STREFLOP compile definitions. Not needed now streflop is
configured properly.
* Simplify cmake by adding "VS_BUILD" variable, instead of doing string
comparisons all the time to check if is "Visual Studio" target.
2022-08-24 23:26:24 +01:00
Jammyjamjamman c6a632c33c Fix for linux and mac 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
pavanvo a8a51d4ef7
style: tabs insted of spaces 2022-08-14 16:37:07 +04:00
pavanvo d514b5510b
fix: run internet scenario or host game 2022-08-01 12:21:26 +04:00
Jammyjamjamman 680c868aa9 FTGL required + Manjaro wx package corrected to wxgtk-common
Fixes bugs found in iss #206. Building without FTGL fails and the error
is confusing. So we'll fail at the cmake stage (suggested by andy5995).
People who don't want it can disable this at their own peril! ;-)
2021-07-14 22:28:06 +01: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 69b379201c revert "only selectable"
Because the same effect can be done with an object or plane with fully
transparent texture.
2021-04-10 22:43:28 +02:00
titiger 3fcaa22d10 fixed double-sided switch and only-selectable
doublesided switch in blender 2.9x did not work before, it was always
rendered single sided in MG.
I added a new switch only-selectable which allows to create unvisible
but selectable meshes. This helps with selection of small units which
can now have an unvisible  hand craftet select object around them for
example..
2021-04-05 23:32:17 +02: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
titiger d28db00a1a Code cleanup void methods should not return anything ... 2020-12-13 13:22:04 +01:00
titiger 922f359f76 trying to load textures with case correct filename.
If file not found, trying to load with lower case as fallback.
2020-12-09 18:32:42 +01:00
titiger 6bb687e5cc load model textures with correct case 2020-12-09 01:43:41 +01:00
Jammyjamjamman 5a35205402 Add ftp fixes 2020-06-20 19:30:01 +01:00
titiger aec1e6d416 display map author if available in map header 2019-03-11 01:56:06 +01:00
Andy Alt a54de06bf4
ircclient.cpp:correct spelling
removed the unnecessary "g"
2018-06-04 14:25:37 -05:00
David Carlier 5d696d4136 build fix ... maths functions were not available due to POSIX_C_SOURCE=1 2018-03-19 13:40:46 +00:00
SoftCoder ab3b70f36a - fix windows build and better automation for building steam shim 2017-10-09 23:53:43 -07:00
SoftCoder ffe6e5462d - more cppcheck cleanup 2017-10-09 23:22:55 -07: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
SoftCoder 865a665bf0 - round 2 of cppcheck code cleanup 2017-10-09 20:21:14 -07:00
SoftCoder 26581a77d2 - first round of cleanup from cppcheck report 2017-10-09 19:09:36 -07:00
SoftCoder d78f28983b - some coverity based cleanups 2017-10-08 20:31:42 -07:00
SoftCoder 9b0a04f126 - try slightly different way to protect mutex list 2017-10-07 11:48:34 -07:00
SoftCoder 9274f2b5e2 - try to fix a memory leak 2017-10-07 11:14:26 -07:00
SoftCoder a413fb5c31 - attempt to protect cache manager mutex creation behind a static mutex 2017-10-07 11:04:52 -07:00
SoftCoder b928bbbb40 - attempt to see if this corrects tomreyns compile error: ==6454==ERROR: AddressSanitizer: heap-use-after-free 2017-10-07 10:42:21 -07:00
SoftCoder b34003b4a5 - enable using steam statistics to save players network based game end game stats to steam 2017-10-07 02:40:34 -07:00
SoftCoder edfb1508f5 - check for empty strings before using substr to avoid crashes with more strict C++ engine 2017-09-30 21:46:56 -07:00
SoftCoder 36bc6a4497 - initial work to integrate theam SDK with megaglest 2017-09-23 17:15:44 -07:00
SoftCoder 5d0f5013fd - allow using new cmake var for finding glest.ini called MG_CMAKE_INSTALL_PREFIX to solve issue #167 2017-09-22 23:21:40 -07:00
SoftCoder fe407db0ba - lan search updates for windows to find more NIC's using windows API 2017-09-22 16:58:54 -07:00
SoftCoder e3e7d93944 - add extra nic checking for windows 2017-09-22 15:44:25 -07:00
SoftCoder f090f99d87 - correct debug output 2017-09-21 17:50:10 -07:00
SoftCoder c898c63389 - fix find lan games by extra NIC search 2017-09-21 17:46:23 -07:00
SoftCoder 7f6cc175d4 - network debug shows more of whats going on for lan broadcast 2017-09-21 17:32:15 -07:00
SoftCoder 783a56ab73 - another fix for LAN Search 2017-09-21 17:23:11 -07:00
SoftCoder ceed529921 - attempt to fix find lan games 2017-09-21 17:18:50 -07:00
SoftCoder 96bd937218 - protect lan search if not local ip's found and add a little more output 2017-09-21 17:04:56 -07:00
filux a719f29758 updated the supported linux's releases in the script; closes #170 2017-06-29 22:48:01 +02: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
titiger 2133b8fd07 show megaglest version in irc WhoIS 2017-03-11 23:57:44 +01:00
andy5995 b158d0cbbb change "scenario" to "tileset"
Geany auto-removed some whitespace. The only code change
here is on L326.

The mention of "scenario" was already used for the
--validate-scenario option. It's duplicated under
the --validate-tileset option. This patch corrects that.
2017-02-25 00:59:37 -06:00
titiger 9acb64b1b3 fix for Micrsoft compiler 2017-02-20 00:39:09 +01:00