Commit Graph

4838 Commits

Author SHA1 Message Date
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
titiger
feb2f3fe3d first steps for xml based achievements 2018-07-07 01:36:53 +02:00
titiger
1caed4accc render resources of selected faction in observer mode 2018-06-13 23:27:21 +02:00
Andy Alt
a54de06bf4
ircclient.cpp:correct spelling
removed the unnecessary "g"
2018-06-04 14:25:37 -05:00
SoftCoder
4a8d24f0dc - updated player stats to count 'played' games and also added new stats to steam 2018-06-02 10:57:54 -07:00
SoftCoder
9dd47eb828 - fix the build 2018-06-02 10:16:25 -07:00
SoftCoder
07319d90a1 - try to fix stupid finiky build 2018-06-02 10:09:52 -07:00
SoftCoder
aa4569965e - common interface / code for saving player stats 2018-06-02 10:03:26 -07:00
SoftCoder
00db8cf249 - added a number of new local player stats to track as per etherpad game count achievements 2018-06-02 07:02:43 -07:00
SoftCoder
e573ec8690 - started adding logic to write out local player stats when not running from steam 2018-06-02 06:38:36 -07:00
titiger
36af9f3d9f
Merge pull request #183 from Jammyjamjamman/win_linux_oos_fix
Disabled function causing OOS in cross windows-linux games, which was re-en…
2018-05-01 11:18:23 +02:00
Mark Vejvoda
f478925c71
Merge pull request #176 from devnexen/build_fix
build fix ... maths functions were not available due to POSIX_C_SOURCE=1
2018-04-10 17:11:32 -07:00
Jammyjamjamman
b6dab7ff8b
Disabled function causing OOS in windows-linux games, which was re-enabled in commit 26581a77d2 . 2018-04-11 00:52:25 +01: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
titiger
12998eb10f bugfix for "save as". see #177 2017-12-18 01:43:29 +01:00
titiger
bc01b2922c prevents a crash when map group is empty. 2017-12-06 01:38:52 +01:00
SoftCoder
9350a9df85 - check for both default and x64 windows binary from steam shim 2017-10-10 01:50:28 -07:00
SoftCoder
b3d2c55fad - more automation for building steam shim on windows 2017-10-10 01:03:55 -07: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
2988521701 - added another steam achievement for winning first online game 2017-10-08 23:05:29 -07:00
SoftCoder
d78f28983b - some coverity based cleanups 2017-10-08 20:31:42 -07:00
SoftCoder
9de36c32a3 - cleanup achievement code for easier expansion later 2017-10-07 16:45:31 -07:00
SoftCoder
ff4eb7e61e Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2017-10-07 14:54:26 -07:00
SoftCoder
f744d90538 - added first steam achievement support (winning your first game) as a reference 2017-10-07 14:53:51 -07:00
Tom Reynolds
92066b541b minor changes for megaglest_shim build #2
* actually mute warnings on non-existing files during first build.sh run now
2017-10-07 22:51:19 +02:00
Tom Reynolds
c9da4eb062 minor changes for megaglest_shim build
* mute warnings on non-existing files during first build.sh run
* git ignore megaglest_shim binary
2017-10-07 21:48:52 +02:00
SoftCoder
60be01988a - try to help steamshim compile better on other systems 2017-10-07 12:36:13 -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
59be04ab6a - attempt to correct tomreyns cmake linker issue 2017-10-07 08:59:27 -07:00
SoftCoder
eaad769182 - some code cleanup fro mthe steam integration 2017-10-07 03:01: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
97a89d0bb0 - cleanup makefiles 2017-09-25 18:55:35 -07:00
SoftCoder
d8073423a7 - Makefile compile steam shim on windows 2017-09-25 14:01:19 -07:00
SoftCoder
de34e1c894 - fix windows build 2017-09-24 09:40:20 -07:00
SoftCoder
a9874ea4b3 - fix windows build 2017-09-24 00:12:02 -07:00
SoftCoder
0443ce9a26 - fix windows build 2017-09-24 00:00:49 -07:00
SoftCoder
6479690d67 - fix windows build 2017-09-23 23:59:56 -07:00
SoftCoder
42221f2d52 - Fix windows build 2017-09-23 23:51:22 -07:00
SoftCoder
3e5bc9c744 - Correct launcher name for steam 2017-09-23 17:19:55 -07:00
SoftCoder
36bc6a4497 - initial work to integrate theam SDK with megaglest 2017-09-23 17:15:44 -07:00
Mark Vejvoda
aebd07f3bb Merge pull request #172 from MegaGlest/tomreyn-patch-1
Shorten indicator for headless server mode
2017-09-23 02:39:31 -04: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
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
de8d05b882 - update opengl version check since 2.1 is really the minimum supported 2017-09-22 17:17:49 -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