Commit Graph

3115 Commits

Author SHA1 Message Date
titiger 329805ac30 Merge branch 'master' of github.com:MegaGlest/megaglest-source 2013-12-30 16:20:03 +01:00
titiger 11eeed59a1 new attribute "render-size" in unit-type 2013-12-30 16:19:08 +01:00
SoftCoder fda53f47d1 - bugfix for loading scenarios with their own techs
- all scenario errors are now caught and shown in a messagebox and game can continue.
2013-12-30 02:01:47 -08:00
SoftCoder b6cd751250 - bugfixes on windows platform when some folders and files are missing, do not crash hard. 2013-12-27 23:05:20 -08:00
SoftCoder c442328b58 - small bugfix for lazy loading textures 2013-12-27 22:08:51 -08:00
SoftCoder 62821793c0 - moved core game data asset loading into lazy load methods to try to improve the startup speed of megaglest. 2013-12-27 22:00:29 -08:00
SoftCoder 3bb9da6cdf - removed directsound related references as it has been deprecated since 3.6.0.1
- coverity related fixes
2013-12-25 11:42:00 -08:00
SoftCoder 3111b733e2 - bugfix for chrono class calcs causing group camera recall to fail (And numerous other problems)
- added better tracking of mutexes by assigning them location info
2013-12-24 22:27:44 -08:00
SoftCoder bcaad53fbe - cleanup some msvc++ compiler warnings 2013-12-22 23:15:31 -08:00
SoftCoder 3a24531ba7 - more code cleanup based on cppcheck results and valgrind
- added -h option to build-mg.sh to show parameter usage.
2013-12-22 22:53:26 -08:00
SoftCoder 2d3e04f413 - a few more minor code quality fixes 2013-12-22 21:03:40 -08:00
SoftCoder da3c55c00b - bugfix, now support proper saving and reloading of games where attack boost is applied to units 2013-12-22 16:10:00 -08:00
SoftCoder f8c497f6dc - in progress work to try to get attack boosts loading from a saved game (not working yet and commented out) 2013-12-21 21:53:27 -08:00
titiger 372442d181 Render order changed to get better render results with units using
semi-transparent textures.
2013-12-22 01:36:54 +01:00
SoftCoder 343a728911 - cleanup some network related code and try to remove uneeded noise 2013-12-18 23:35:27 -08:00
titiger 9249d6370c looks like glEnable(GL_COLOR_MATERIAL); was still needed to render units properly 2013-12-18 21:35:04 +01:00
SoftCoder 606aa392c7 - added coverity linux script
- a few updates to fix coverity reported issues
2013-12-17 23:57:45 -08:00
SoftCoder e3996ceb92 - bugfixes for coverity reported issues
- new bash parameters for build-mg.sh (in prep for coverity automation)
- updated travis build to use new bash param
2013-12-17 17:35:51 -08:00
SoftCoder d8160c1065 - modified game time to be game duration instead as that is more useful for players who want to see in game clock info 2013-12-17 13:26:58 -08:00
SoftCoder a56eb83c91 - moved map path into config class
- proper render performance calc compare
2013-12-16 23:54:33 -08:00
SoftCoder d1f9fbc4a7 - cleanup warnings from clang 2013-12-15 09:19:24 -08:00
SoftCoder 0b73d3922a - fixed windows build from coverity updates 2013-12-14 22:59:32 -08:00
SoftCoder f269273f07 - round #2 of coverity bug fixes 2013-12-14 22:37:15 -08:00
SoftCoder b8ab732b85 - cppcheck code cleanup 2013-12-14 18:07:22 -08:00
titiger 87f855b419 Very transparent parts of textures were cutted away while rendering. It turned out there is only a need to do this for shadows and selection rendering, not for real rendering. 2013-12-15 00:12:25 +01:00
SoftCoder 6e061f459d - cleanup a few newly introduced compile warnings 2013-12-14 10:49:01 -08:00
SoftCoder b11932b92d - cleanup from cppcheck report 2013-12-14 03:03:19 -08:00
SoftCoder 65e55d3796 - merged changes with windows build fixes
- updated svn commands to git for validation params
2013-12-14 02:44:41 -08:00
SoftCoder b9d6b38e8f - coverity based bug fixes - round #1 2013-12-13 23:04:12 -08:00
SoftCoder c91b92901b - added ignore folder 2013-12-11 19:18:33 -08:00
SoftCoder a567fe159d - bugfix for headless mode segfault reported by titi 2013-12-11 19:07:24 -08:00
SoftCoder ad81692331 Merge branch 'master' of https://github.com/williame/megaglest-source 2013-12-09 18:07:42 -08:00
titiger 3bc5901a01 From Bugreport: cannot delete characters after clicking on player name in lobby
https://forum.megaglest.org/index.php?topic=9302.0
2013-12-10 01:52:08 +01:00
titiger dcada00514 as there are already several changes to originla 3.9.0 we better set a new version number 2013-12-09 23:14:33 +01:00
Will 6afadafa1e Start to abstract model 2013-12-05 16:17:41 +01:00
Will 03c0197437 merge from upstream 2013-12-04 23:37:04 +01:00
William Edwards e71e7104dc Trying to build on OSX 2013-12-04 22:38:06 +01:00
SoftCoder b868a8468b - bugfixes to winner / loser logic to keep calculating stats and publish to masterserver after we determine a winner or loser as the game may not yet be fully over and we want accurate game stats on the masterserver. 2013-11-30 20:33:25 -08:00
SoftCoder 4b50560ca9 - added color picking used colors count in debug view 2013-11-30 17:38:32 -08:00
SoftCoder 2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
SoftCoder f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
Will c6530c2783 merging in all Will's changes 2013-11-29 02:12:34 +01:00
SoftCoder be3d4d300c - bugfix for headless server mode (null pixmaps) shown by stacktrace on fakir 2013-11-28 16:20:40 -08:00
filux 00b4d9ab4e resolved conflicts by conversion CRLF to LF 2013-11-28 08:26:39 +01:00
Mark Vejvoda 8d040b9f63 - attempt to ensure color picking ALWAYS has unique colors 2013-11-25 07:26:23 +00:00
Mark Vejvoda ceb799a66e - attempt to ensure color picking ALWAYS has unique colors
- better handling of scenario's that are missing techtrees
2013-11-24 04:44:12 +00:00
Mark Vejvoda 8414077d7a - bugfix for headless server's reporting of winning players and team.
- masterserver returns proper JSON header now
2013-11-22 21:17:38 +00:00
Mark Vejvoda 7d5b71b2cf - bugfix for compilation on windows 2013-11-19 22:47:22 +00:00
Mark Vejvoda ab64b9343f - updated to support building with clang compiler (And cleaned up clang warnings from initial compile). Edit build-mg.sh and read the clang section as to how to build. 2013-11-19 21:57:28 +00:00
Mark Vejvoda 929cc07895 - code cleanup based on additional gcc warnings 2013-11-19 07:05:45 +00:00