Commit Graph

4896 Commits

Author SHA1 Message Date
Rampoina e209dcbd35 Fix numberCommands
It wasn't updated correctly for units with morphing abilities
2022-08-14 12:26:38 +02:00
Rampoina c4caa6b912 Display hotkey on hover 2022-08-14 12:26:38 +02:00
Rampoina c549a6b66c Correctly update numberCommands 2022-08-14 12:26:38 +02:00
Rampoina 9276faeeb5 Update the GUI immediately after calling the command from a hotkey
Otherwise the gui takes a bit to update
2022-08-14 12:26:38 +02:00
Rampoina 3313f187bb Rename HotKeyBuildN to CommandKeyN 2022-08-14 12:26:38 +02:00
Rampoina 1922522009 Rename commonCommands to numberCommands 2022-08-14 12:26:38 +02:00
Rampoina c3e8a25e9e Update commonCommands for a uniform selection 2022-08-14 12:26:38 +02:00
Rampoina 2cd190d822 Retabulate (use only tabs) 2022-08-14 12:26:38 +02:00
Rampoina 5783db3033 Check the number of shared commands before trying to click from a hotkey 2022-08-14 12:26:38 +02:00
Rampoina e9b771241f Add building and unit hotkeys 2022-08-14 12:26:38 +02:00
Rampoina ff9c9ad864 add hotkeybuild1 2022-08-14 12:26:38 +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
pavanvo d514b5510b
fix: run internet scenario or host game 2022-08-01 12:21:26 +04: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
titiger 75651f3b2e Fix for maxHP upgrades
Fixed the calculation of HP if value is given in percent.
2021-01-02 20:27:51 +01:00
titiger 0f4bc361c6 Fix for maxHP boosts/upgrades
maxHP cannot been boosted anymore( just upgrades!). this has too many
side effects.
maxHP upgrades were calculated based on units current HP which doesn't
make sense.

maxEP cannot been boosted anymore( just upgrades!). this has too many
side effects.

Code is much cleaner and smaller now
2021-01-02 18:54:03 +01:00
titiger d28db00a1a Code cleanup void methods should not return anything ... 2020-12-13 13:22:04 +01:00
titiger 805de06291 bugfix for MaxUnitCount 2020-12-13 03:47:50 +01:00
Jammyjamjamman d7847f5f1c G3D B290: more advanced file searching
If g3d has wrong texture filename it will try other texture
extensions.
Default 3d view has been improved.
2020-12-10 00:42:03 +00:00
titiger 88fb921f5c Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2020-12-09 18:32:57 +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
Jammyjamjamman 85aca2c12e G£D B290 Script: Bugfixes
* All blender views now show texture.
* Alpha channel on tex image linked to material.
* Fixed bug where texture-less models wouldn't export.
2020-12-09 01:00:27 +00:00
titiger 5b9f28f21c MaxUnitCount did not work correctly for buildings
Buildings in state 'beeing build' were not taken into account. this is
fixed now.
2020-12-09 01:46:56 +01:00
titiger 6bb687e5cc load model textures with correct case 2020-12-09 01:43:41 +01:00
James Sherratt 9e621fbb01
Feat/blender 2.90 support (#204)
* Blender 2.90 import mostly working

* g3d b290 script: Finish support for importing g3d

* G3D B290: exporter now works

Blender exporter now working. There's still a lot to fix in the script but the basic setup works.

* G3D B290: script now exports animations
2020-11-25 19:46:37 +00:00
SoftCoder b8a4a69ac7 - a 2020-08-19 19:16:13 -07:00
SoftCoder 4bdb45e96e - Add support for PopOs and disable VLC support by default in CMake build 2020-08-19 19:14:23 -07:00
Jammyjamjamman 5a35205402 Add ftp fixes 2020-06-20 19:30:01 +01:00
titiger 80cf370209 saved game setups
and lang file
2019-11-18 23:32:01 +01:00
titiger 68de0209fb custom menu layouts disbaled by default
saving and using custum menus layouts ( used for mods ) is disabled now
by default becasue it made trouble with new layout.  There are two new
switches for user.ini to control it:
CustomPropertiesUsageAllowed ( default = false )
CustomPropertiesSaveAllowed ( default=false )
2019-11-12 01:29:25 +01:00
titiger 32859457f6 world dump hotkey disabled by default
in big games accidently pressing this games made users drop out of the
game and its a developer option anyway. From now it only works If debug
is enabled.
2019-11-12 01:25:57 +01:00
titiger 3ad5a53560 more comfortable game setup delete 2019-11-12 00:25:57 +01:00
titiger 5cb0eab085 bugfix for preselection in map combobox
Maps were not only loaded as preview.
2019-11-07 00:12:15 +01:00
titiger 010b1f4f72
Merge pull request #191 from andy5995/stone_unharvestable
map editor/main.cpp: mark this stone as unharvestable
2019-11-01 16:59:06 +01:00
titiger f6c3a7174f cleanup of duplicated code 2019-10-24 22:58:51 +02:00
titiger a0f2bb0100 layout fixed in connect menu 2019-10-24 22:11:56 +02:00
titiger e978dd3561 build command had no colored icons 2019-10-21 20:09:15 +02:00
titiger 011f38912e red command icons if not enough resource
orange icons if not enough resources for whole selection
2019-10-21 00:46:06 +02:00
titiger 2fd87e64c5 mousewheel scrollbar scenario menu 2019-10-20 19:00:01 +02:00
titiger cb3fd12615 mousewheel scrollbar in connected menu 2019-10-19 00:21:30 +02:00
titiger ae003836c3 scrollbars with mouse wheel :D
currently in custom game menu only
2019-10-18 22:22:07 +02:00
titiger b3267394d5 bugfix for loading setups with unknown maps 2019-10-18 01:47:37 +02:00
titiger 476c398c0c bugfix load setup 2019-10-17 23:16:16 +02:00
titiger cc9c001736 load/save setups in menu state connected 2019-10-16 23:11:18 +02:00
titiger 22d22e275b load/save/delete setups 2019-10-16 20:46:43 +02:00
titiger 10f23fb3ad changed render order for custom game menu
"Press enter to start chat" was rendered on top of scrollbox dropdown.
2019-10-09 02:33:34 +02:00
titiger bebdb3e753 correct scrollbar rendering in comboboxes.
If not enough items list, render shorter scrollbar.
2019-10-09 01:48:24 +02:00
titiger 06b8ab4582 correct scrollbar rendering in comboboxes.
If not enough items list, render shorter scrollbar.
2019-10-09 01:45:51 +02:00
titiger af36771b3c save setups 2019-10-08 11:47:27 +02:00
titiger b3ff608db1 load/save/delete setups and combobox bugfixes 2019-10-08 00:52:34 +02:00
titiger 1db8abe0aa comboboxes (connected menu ) 2019-10-06 03:20:38 +02:00
titiger aac297681d comboboxes 2019-10-06 02:25:58 +02:00
titiger 8d1ff2fadd comboboxes
Scenario selection via combobox
2019-10-06 02:21:16 +02:00
titiger 68153878a0 cobobox fun
mapinfo toggling places
2019-10-06 00:46:33 +02:00
titiger 389892600b comboboxes
first usage in custom menu for maps
2019-10-05 22:41:21 +02:00
titiger 2be2dc5cab cleanup custom/connected game menu layout 2019-10-04 15:06:07 +02:00
titiger 1d234f959c make mega AI fight smarter 2019-09-26 23:06:10 +02:00
titiger b3e0e1b462 trying to let mega CPUs fight smarter 2019-06-22 00:54:29 +02: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 aec1e6d416 display map author if available in map header 2019-03-11 01:56:06 +01:00
titiger e3a082dcb7 another try to fix win build 2018-07-07 02:18:46 +02:00