4866 Commits

Author SHA1 Message Date
MathuSum Mut
03af4b8bf6 Reduced thread waiting time 2018-07-24 15:00:58 +02:00
mathusummut
b62719118d Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-07-22 11:08:29 +02:00
mathusummut
d4f6978105 Units with sight 0 now have actually no sight 2018-07-22 11:08:16 +02:00
Joao Marcos
dd59978a05 Fixes problem when choosing the faction of an AI (#186)
* Fixes problem when choosing the faction of an AI
(fixes #184)
2018-07-11 18:18:54 -05:00
mathusummut
778eb71ab7 Fixed bug in loading lang files 2018-06-29 22:02:49 +02:00
mathusummut
dfd4a658aa Test fix for LUA environment variables 2018-06-29 16:14:38 +02:00
mathusummut
78e0fb173a Fixed transparency issue 2018-06-29 02:35:12 +02:00
mathusummut
7f40d14221 Fixed gcc build issue 2018-06-29 02:19:34 +02:00
mathusummut
73c90a3eed Fixed fading bug 2018-06-29 01:25:50 +02:00
mathusummut
d142d80b05 Fading out at death works again 2018-06-29 00:42:44 +02:00
mathusummut
b1760253fd Implemented the new g3d spec 2018-06-28 21:36:10 +02:00
mathusummut
90556c870e Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-06-25 17:30:44 +02:00
mathusummut
2a42a10d43 Fixed setDisplayText issue 2018-06-25 17:29:50 +02:00
Jammyjamjamman
f06d594db6
Added support for Matt's teamcolour texture transparency to the g3d blender exporter #166 . [skip ci] 2018-06-24 18:10:58 +01:00
mathusummut
6b6a4fb4de AI upgrades should complete successfully 2018-06-23 23:38:12 +02:00
mathusummut
812db7279d AI fix for move while upgrading 2018-06-23 22:07:20 +02:00
mathusummut
3b14f3eb02 Relaxed network grace + fixed annoying warnings 2018-06-23 22:04:15 +02:00
mathusummut
2e9623c8da Fixed menu layout 2018-06-23 14:57:11 +02:00
mathusummut
e495bc10e0 Removed libglest warning 2018-06-22 23:34:33 +02:00
mathusummut
b14a23f2d7 Incremented version number 2018-06-22 18:27:35 +02:00
mathusummut
87465b35d4 Extended faction transparency support 2018-06-22 13:06:02 +02:00
mathusummut
656816084c Fixed button-mouse area bug 2018-06-21 21:20:09 +02:00
mathusummut
c15488a212 Full transparency support is now added 2018-06-21 19:57:44 +02:00
andy5995
af333f8839 CMakeLists.txt:narrow scope of -std=gnu++11
Make sure this passes Travis CI test before merging.

This is to get rid of warnings such as the following:

[ 31%] Building C object
source/shared_lib/CMakeFiles/libmegaglest.dir/sources/feathery_ftp/ftpServer.c.o
[ 31%] Building C object
source/shared_lib/CMakeFiles/libmegaglest.dir/sources/feathery_ftp/ftpSession.c.o
cc1: warning: command line option '-std=gnu++11' is valid for C++/ObjC++
but not for C
cc1: warning: command line option '-std=gnu++11' is valid for C++/ObjC++
but not for C
[ 31%] Building C object
source/shared_lib/CMakeFiles/libmegaglest.dir/sources/feathery_ftp/ftpTargetPosix.c.o
cc1: warning: command line option '-std=gnu++11' is valid for C++/ObjC++
but not for C
2018-06-17 12:25:27 -05:00
mathusummut
b4b13ec918 Attack mode no longer becomes disabled on selection 2018-06-17 15:50:14 +02:00
andy5995
a4af068cf3
render resources of selected faction in observer mode
This is recent patch @titiger made for @MegaGlest in
1caed4accc
2018-06-15 15:33:09 -05:00
mathusummut
76d4c9e7a8 Now scenarios are customisable without breaking scripts 2018-06-11 16:06:48 +02:00
mathusummut
d2216b8143 Fixed warning of potential infinite recursion 2018-06-11 00:08:03 +02:00
mathusummut
73d28db062 Fixed build issues with clang 2018-06-10 23:48:39 +02:00
mathusummut
46dd197910 Fixed bug in right-click code 2018-06-10 23:26:10 +02:00
mathusummut
b40fc2a011 Double right-clicking now sends a move command instead of attack 2018-06-10 22:28:47 +02:00
mathusummut
1d2543fb6a Right click no longer attacks your teammates and yourself 2018-06-10 17:16:04 +02:00
mathusummut
28636b07b9 Added getFactionName and translate LUA functions 2018-06-10 16:06:12 +02:00
mathusummut
1d91e05c9a Increased control sizes during gameplay 2018-06-10 12:38:22 +02:00
mathusummut
877d888d23 Removed question marks when translation is not found 2018-06-10 11:59:16 +02:00
mathusummut
fbe63bbacf Removed max selection count 2018-06-10 11:41:20 +02:00
andy5995
957827ea21
ircclient:change spelling
Most of these changes don't do anything, but near L820 in ircclient.cpp,
there was an extra "g"

Also changed the header
2018-06-04 16:28:14 -05:00
mathusummut
a3dff1423d Fixed travis issue+added git pull to setup.bat 2018-05-14 21:38:59 +02:00
mathusummut
1ea031b08e Added isBuilding and setUnitProperty functions to LUA 2018-05-14 01:38:48 +02:00
MathuSum Mut
626e7e1c99
Merge branch 'develop' into issue_70 2018-05-13 15:39:23 +02:00
mathusummut
56013bee49 Reached mid-way AI compromise 2018-05-10 03:04:30 +02:00
mathusummut
91d8fea807 Re-strengthened AI 2018-05-10 02:38:06 +02:00
andy5995
60e38945fe CMake:correct spelling of "zetaglest"
This also removes the git revision number stamping from cmake, support
for which was removed from the source code months ago.

This is to help prepare to fix #110 but doesn't fix it.
2018-05-09 09:09:36 -05:00
mathusummut
9d3678cee9 Replaced emplace_back with push_back 2018-05-07 22:51:46 +02:00
mathusummut
d1acd87423 Now Lua can be used in scripts tag in faction tag in XML 2018-05-06 12:45:25 +02:00
mathusummut
35b7b1f1a6 Fixed the god-awful indentation 2018-05-06 00:01:36 +02:00
andy5995
e018b26056 ai:revert AI enhancement
@Jammyjamjamman suspects the AI patch from commit
464860aa02 (diff-d96c21449fc203a306589b5bd1f8aaa1)
may be causing extra lag when playing mp with Windows clients.

This patch reverts most of that commit. Max expansions I set to 5, the
MG setting was 2.

If this fixes the lag, then we can consider looking at making these
changes again, but one at a time, making sure lag isn't a result before
making more changes.

Anyone can review this to learn some of the code, but I'd like to hear
feedback from Jammy before finally merging.
2018-05-04 18:36:21 -05:00
andy5995
cb1c78887b
connected_game.cpp:comment line disabling controls
Commenting out this line has fixed the problem but I don't know if
there'll be any side effects yet.
2018-05-04 10:09:16 -05:00
mathusummut
7ace98f8e1 Renamed CPU-Mega to CPU-Zeta 2018-04-29 15:37:44 +02:00
mathusummut
724be4ead5 Changed Map Editor from MG to ZG and improved build on Windows 2018-04-29 02:18:05 +02:00