SoftCoder
f97f0ef852
- more general bugfixes (not all upgrade values were being used in the code)
2014-12-21 21:07:24 -08:00
SoftCoder
3705d56057
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-12-21 20:27:48 -08:00
SoftCoder
92a113ddfa
- missed a few places where we should use total upgrade sight
2014-12-21 20:27:21 -08:00
titiger
f62efc64bf
fix for uneditable closed slots
...
https://forum.megaglest.org/index.php?topic=9620.0
2014-12-22 03:08:19 +01:00
titiger
48db19c34b
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-12-22 03:05:33 +01:00
SoftCoder
e65ad1b69c
- added more error checking in case segfault reproduced from: https://forum.megaglest.org/index.php?topic=9612.0;topicseen
2014-12-21 17:32:04 -08:00
SoftCoder
b0f7b078f6
- apply sight upgrades when units sight is involved in cacls
2014-12-21 17:23:20 -08:00
titiger
6ef709e888
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-12-22 00:12:22 +01:00
titiger
799cc0f12b
some new entries in CHANGELOG.txt
2014-12-22 00:11:57 +01:00
SoftCoder
3965f72b5a
- updated debug output in case there are real boost problems in future
2014-12-21 14:47:58 -08:00
SoftCoder
494061b80d
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-12-21 13:02:57 -08:00
SoftCoder
0a55746ae2
- more attempts to fix attack boost with upgrades
2014-12-21 13:02:27 -08:00
titiger
341d504cd2
this is the actual data please don't revertit again
2014-12-21 13:48:51 +01:00
titiger
b50cb7770c
Comparison of version numbers allows non integer characters too
...
This is used to check compatibility of saved games typically.
Only the leading digits are used as minor version now.
2014-12-21 13:35:42 +01:00
titiger
1a8c28cc93
Make it more obvious where to join a game in the internet menu
...
Buttons can be set to always lighted(flashing). This is first used in
the internet menu.
2014-12-21 13:33:46 +01:00
SoftCoder
b5d609586a
- small coverity fix
2014-12-20 16:31:08 -08:00
SoftCoder
d08eacacc8
- fix the display of upgrades and boost values
2014-12-20 16:26:14 -08:00
SoftCoder
7418fac810
- small fix for display
2014-12-20 15:32:40 -08:00
SoftCoder
32c11f41de
- cleanup of boost apply code and fix to apply when active boosts exist in middle of a level up
2014-12-20 15:27:11 -08:00
SoftCoder
461b16be8e
- attempt to fix attack boosts to properly apply and de-apply when upgrades are present
2014-12-20 14:25:42 -08:00
SoftCoder
4dea67cff9
- attempt to fix thread crash when ending game for network play
2014-12-19 19:08:04 -08:00
titiger
1a3e265d4a
no we have this data now ;-)
2014-12-20 01:43:45 +01:00
titiger
d34e58ccb6
fix for too often applied boosts
2014-12-19 22:48:07 +01:00
titiger
e20d242e2c
its no longer compatible to beta
2014-12-19 22:47:09 +01:00
titiger
3120ab7453
boost without explicitly listed units fixed
2014-12-19 19:40:34 +01:00
titiger
5b82859e92
default GraphicMessageBox size adjusted
2014-12-18 01:11:06 +01:00
titiger
a9cac6a3c1
render messagebox in a way that allows more text.
...
And default message box height is raised a bit to avoid trouble with
long messages in scenarios.
2014-12-18 01:04:37 +01:00
titiger
47c181d2ab
different rendering of resources in teammode
2014-12-18 00:32:44 +01:00
SoftCoder
5099f19709
- update miniz code to 1.15
2014-12-17 07:28:06 -08:00
Mark Vejvoda
b7571e5bf9
Merge pull request #41 from goetzk/remove-duplicate-custom-data-install-path-definition
...
Remove duplicate DCUSTOM_DATA_INSTALL_PATH
2014-12-17 06:47:48 -08:00
Mark Vejvoda
17a45c8da3
Merge pull request #40 from goetzk/remove-mac-specific-version-detection-code
...
Remove mac specific version detection code
2014-12-17 06:47:35 -08:00
Mark Vejvoda
0edee0ada6
Merge pull request #39 from goetzk/change-library-search-paths-on-osx
...
Change library search paths on osx
2014-12-17 06:47:23 -08:00
Karl Goetz
953c055ced
Remove duplicate DCUSTOM_DATA_INSTALL_PATH
...
Within 5 lines CUSTOM_DATA_INSTALL_PATH is defined twice resulting in lots of
compiler warnings; eg
[ 11%] Building CXX object source/shared_lib/sources/streflop/CMakeFiles/streflop.dir/libm/flt-32/s_atanf.cpp.o
In file included from <built-in>:175:
<command line>:7:9: warning: 'CUSTOM_DATA_INSTALL_PATH' macro redefined
^
<command line>:2:9: note: previous definition is here
^
This removes the second definition.
Conflicts:
CMakeLists.txt
2014-12-17 21:11:32 +11:00
Karl Goetz
ada9b55740
Revert change to quoting
...
Accidentally included a change of quoting which isn't related to the diff at
hand; reverted with this commit.
2014-12-17 20:28:20 +11:00
Karl Goetz
5b4b382d2c
Remove unneeded comments
...
These comments indicated TODO items and are no longer needed in the final change.
2014-12-17 20:25:21 +11:00
Karl Goetz
0ce6fd3c5d
Change library search path on MacOS
...
When using mac ports GL/gl.h ends up outside the cmake search paths for
libraries and includes. By adding them to mk/macos/CMakeLists.txt they are now
available and make it possible to build g3d_viewer along with the rest of
megaglest. To make this work properly I had to move the inclusion of
mk/macos/CMakeLists.txt further up the master CMakeLists.txt so merged both IF
APPLE tests in to one.
This has built successfully through xcode and gnumake.
2014-12-17 20:21:22 +11:00
Karl Goetz
4c10c9c2b3
Remove MEGAGLEST_VERSION for MG_VERSION_H_CONTENTS
...
I noticed that mk/macos/CMakeLists.txt has special code for extracting the
megaglest version , but its already done in CMakeLists.txt. This removes the
duplicate detection and changes the users of MEGAGLEST_VERSION to
MG_VERSION_H_CONTENTS.
2014-12-17 20:20:34 +11:00
SoftCoder
c945a5721d
- more coverity based fixes
2014-12-15 21:07:13 -08:00
SoftCoder
8210485a42
- a few bugfixes related to coverity scan
2014-12-15 19:44:26 -08:00
titiger
9392aa0fca
fixed missing cast found by Coverity CID 1232664
2014-12-16 02:08:29 +01:00
titiger
2d4c4ece8a
fixed missing cast found by Coverity CID 1232665
2014-12-16 01:50:12 +01:00
titiger
c51817d8d5
fixed missing cast found by Coverity CID 1232666
2014-12-16 01:49:26 +01:00
titiger
c3cd1cfc17
return value was not used
...
Coverity CID 1232671
2014-12-16 01:15:56 +01:00
titiger
37b351aa38
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-12-16 00:59:51 +01:00
titiger
a11855e220
fixed Division by float zero
...
Coverity scan CID 1197074 and more numbers
2014-12-16 00:56:26 +01:00
titiger
db0007d277
fixed missing initialisations found by coverity scan
...
Coverity CID 1197086
2014-12-16 00:53:33 +01:00
Mark Vejvoda
a72c882461
Merge pull request #38 from goetzk/change-linker-invocation-through-xcode
...
Don't strip binaries when building through Xcode
2014-12-15 14:10:56 -08:00
Mark Vejvoda
1d2a18f5cf
Merge pull request #37 from goetzk/change-git-version-cmd-test
...
Change test for GIT_VERSION_CMD an xcode check
2014-12-15 14:10:15 -08:00
titiger
d1df0c80d9
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-12-15 21:43:21 +01:00
titiger
b407e0090d
same button layout for custom game menu and connected game menu
2014-12-15 21:39:11 +01:00