Commit Graph

4843 Commits

Author SHA1 Message Date
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 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
titiger 08cf0c49fb
Merge pull request #243 from Rampoina/loadMenuDoubleClick
Load the game on double click on the loading menu.
2022-08-24 23:09:03 +02:00
Rampoina 332780950b Fix unit/building progress not getting restored when loading a game 2022-08-23 00:07:20 +01:00
Rampoina 00fc8bcee3 Add missing check for the selected button 2022-08-15 01:44:37 +02:00
Rampoina 3b03b458e5 Load the game on double click on the loading menu 2022-08-09 21:14:10 +02:00
Rampoina 22a474b93b
Allow a selected group to have the attack command even if some units … (#217)
* Allow a selected group to have the attack command even if some units don't have it

* Add getUnitFromCC function

* return NULL if getFirstCtOfClass founds no unit

* Search for the unit containing the attack command in a non uniform selection

Co-authored-by: Rampoina <Rampoina@protonmail.com>
2022-08-08 23:26:47 +01:00
NetSysFire 873217577a
Replace some http links with https (#211)
* Replace working http links with https

* downloads also has working https

* forum also has working https

* Fix get_started link

* fix get_started link

Co-authored-by: James Sherratt <jdsherratt3@gmail.com>
2022-07-20 22:59:09 +01:00
titiger e3af470288 Level up should not be effect boosts 2021-11-23 18:17:45 +01:00
Jammyjamjamman 3c0858318d Fix colours in endgame statistics.
Text colours where the colour wasn't explicitly set was rendering as the
previous (incorrect) colour instead of white. Now text colour is
explicitly set.
2021-11-09 21:48:38 +00:00
titiger ae5e308a28 set meeting point for whole selection ( via icon ) 2021-10-06 23:40:18 +02:00
titiger f344fa7fbd Fixed mixed upgrades and boosts of EP and HP regeneration 2021-09-13 22:33:47 +02: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
titiger 4e532db6dd Food shortage warning sound
General sound to warn about consumable resources shortage
2021-06-18 17:25:37 +02:00
titiger 412b37d074 get rid of manual wx???Event creation 2021-06-05 01:40:14 +02:00
titiger 5801b1faff get rid of manual wxPaintEvent creation 2021-06-05 01:33:50 +02: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
Tom Reynolds d1ed68ef00 Update IRC server (Freenode -> Libera) 2021-05-22 12:43:51 +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 12bd61c218 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2021-04-16 01:56:16 +02:00
titiger fb178f9c65 fix for spawn unit when projectile impacts 2021-04-16 01:56:05 +02:00
Jammyjamjamman 86905dc6f7 G3D B290: remove line generating mesh code
Line was generated for meshes with duplicate verts, to prevent loss
of vertices. But this was a problem because some duplicate verts
need removing. (E.g. some duplicate verts are generated for UV
mapping. These should be removed during import.) This does mean the
g3d script can lose information on import.
2021-04-15 20:23:21 +01:00
Jammyjamjamman 9725336823 G3D B290: Better vert compare
* Use hashset for more efficient vert comparison. (Suggested by Titi.)
* Create line of verts for basis mesh, for rare cases where there's no
mesh frame where all the verts are different.
* Fix bug in animation where all animation frames shifted by 1 (and last
frame was not included in the animation).
2021-04-13 01:33:57 +01:00
Jammyjamjamman 133a1fc8b5 G3D B290 script: fix importing mesh with 0 size first frame
Script use to always use the first frame as the "basis" mesh.
But this caused problems because sometimes the first mesh had a
size 0 i.e. all the verts are the same. This is fixed by adding
a step to search for a frame with the largest number of verts in
different positions. This frame is then used as the basis mesh.
Errors could still happen if the mesh doesn't have any frames
without overlapping verts.
2021-04-12 01:34:02 +01: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 d873d91660 double sided only by our switch 2021-04-06 01:17:11 +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
Jammyjamjamman d890e865dc Meshes now have "double sided" property and fix quad-to-tris bug.
Meshes were missing a "double sided" property. So they importing/
exporting "double sided" meshes failed.
Converting meshes from quads to triangles was failing, when a mesh was
selected, because not all of the vertices were selected in "edit" mode.
Script now selects all verts are selected when switched to edit mode.
2021-04-03 00:35:42 +01:00
titiger 8cdca11c4f Reset should reset all upgrades :) 2021-03-27 20:51:28 +01:00
titiger ef313616c8 fixing upgrades again ... 2021-03-27 01:11:02 +01: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
titiger b20002e7dc spawn attacks are skill based, not command based
Units have to spawn without a command too ( like buildings )
2021-02-26 01:49:31 +01:00
titiger 3b52832bb0 More fixes for boosts and upgrades 2021-02-25 23:55:55 +01:00
titiger 48733be2fc no crc refresh for non network games 2021-02-03 20:32:13 +01:00
titiger bf5fe0f561 Fix the CRC refresh on server side 2021-01-28 01:00:24 +01:00
titiger bbd7df55c9 Air unit flying height above water
For flying above water  we use the maps water height + airHeight  if it
is higher than the normal height..
2021-01-17 20:20:31 +01:00
titiger c7c18bd506 bugfix for last checkin 2021-01-14 00:46:32 +01:00
titiger 047ae0daaa Trying to make the CRC less often. 2021-01-14 00:27:41 +01:00
titiger a1d8ea91a2 CRC was never recalculated on servers side 2021-01-06 02:15:58 +01:00
titiger c0aa5cc867 I forgot to upgrade maxEpRegeneration 2021-01-02 21:36:40 +01:00