Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,849 Commits 1 Branch 0 Tags 27 MiB
Commit Graph

3269 Commits

Author SHA1 Message Date
SoftCoder ce375073c1 - show team color asterisk in front of resources when displaying resources for an individual team member 2014-01-29 21:13:39 -08:00
SoftCoder 4ba68576aa - bugfix for loading textures for gpl and startup model pics 2014-01-29 20:42:59 -08:00
SoftCoder 02fa995ce3 - bugfix when loading last game settings to retain player name 2014-01-29 20:26:25 -08:00
SoftCoder 7cae2b53f1 - bugfix for windows processing var tags in ini files (was crashing on windows when using the new glest-dev.ini) 2014-01-27 20:12:14 -08:00
SoftCoder cce3beb939 - cleanup code from cppcheck report 2014-01-27 19:03:52 -08:00
SoftCoder 39696b6a65 - added ability to share resources across same teams 2014-01-27 18:55:08 -08:00
SoftCoder e33024c102 - For team shared unit mode, player does not lose unless all team members have no castle 2014-01-27 14:58:52 -08:00
SoftCoder e63b3d7499 - added support for team unit sharing 2014-01-27 14:15:05 -08:00
SoftCoder 338f156a95 - changing version to v3.10.0-dev for new development 2014-01-27 11:21:22 -08:00
titiger d56069488f Let's see how good Mega-AI plays with real random when trying to find the enemy. 
( the server must use this version to see an effect )
 2014-01-27 19:23:31 +01:00
SoftCoder 33bb424802 - ensure we get a newline after doing a version check when streflop disabled 2014-01-26 19:39:50 -08:00
SoftCoder dfb6c130ca - additional bugfix when restoring last game settings 2014-01-26 19:22:27 -08:00
SoftCoder d1d6fb2eb1 - added validation for platform for internet games 2014-01-26 18:12:19 -08:00
titiger ef8776efbb Only platform is displayed in server table 2014-01-26 21:29:35 +01:00
SoftCoder d7f5164fd1 - missed a few other refs to xerces in cmake scripts 2014-01-25 18:27:08 -08:00
SoftCoder 952004151c - removed d3d files which were deprecated long ago 
- removed freetype-gl (the embedded library from code.google.com)
 2014-01-25 17:54:46 -08:00
SoftCoder 08af18429d - stubbed out use of xerces as no code was using it any longer. Xerces is no longer a requirement to build, we have been using rapidxml for a long time now. For now the MACRO: WANT_XERCES will build Xerces support into th egame, but it is still not used. We will likely deprecate xerces from megaglest soon. 2014-01-25 17:09:52 -08:00
SoftCoder bbfbc6af0e - Fix reload game to not replace human players 2014-01-25 10:07:15 -08:00
SoftCoder 32f0e2cbea - attempt to fix reload game to not replace playernames 2014-01-24 23:50:32 -08:00
SoftCoder 0d8b3d6c63 - updated so masterserver url does not require trailing / in ini 2014-01-24 18:20:01 -08:00
SoftCoder fe808556bd - added more fields for dev path support.. onlu ico files for linxu left to fix 2014-01-24 17:51:06 -08:00
SoftCoder 581a975209 - added support for dev mode paths and removed linux symlinks for game data 
- bugfix for segfault on headless when client disconnects
 2014-01-24 13:44:21 -08:00
SoftCoder 1cacb0df27 - missed some updates 2014-01-24 09:50:17 -08:00
SoftCoder 92daccf963 - cleanup of cmake scripts and proper organizing of files 2014-01-21 23:21:56 -08:00
SoftCoder 9170d9c400 - added clang detection in binary version output 2014-01-21 17:06:10 -08:00
SoftCoder d2284bbd36 - bug fix when changing language and showing hint button on game load 2014-01-18 16:31:01 -08:00
SoftCoder 4bada8fc5a - updating game version to 3.9.1 in preparation for release 2014-01-17 19:37:25 -08:00
SoftCoder 6439d98146 - do NOT pause for lagging clients if game network setting set to false 2014-01-17 11:32:21 -08:00
SoftCoder b0fc9597e3 - fixed some bugs reported by coverity 2014-01-17 09:53:19 -08:00
SoftCoder 728dd3aea7 - added mutex guards in client connected menu to try to fix thread race bugs 2014-01-17 07:56:14 -08:00
SoftCoder 3425d4c248 - changed code to cleanup pixbuf allocation earlier to not confuse gDEbugger about an openGL memory leak. 2014-01-11 23:28:33 -08:00
titiger 9ea0debc51 CameraMoveSpeed can be modified 2014-01-11 15:53:53 +01:00
SoftCoder 0bf6d94d3e Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-08 12:49:25 -08:00
SoftCoder 7d8af94a44 - attempt to fix null pointer segfault on masterserver found by tomreyn 2014-01-08 12:48:56 -08:00
titiger 2cb45f876f no click on buttons while preview map is in zoomed state 2014-01-05 23:56:45 +01:00
titiger ba1d03118e unit particles can be bound to first vertice of meshes ( <meshName value="part1.001" /> ) 2014-01-04 18:40:00 +01:00
SoftCoder 37494a9c37 - added new LUA method getFactionPlayerType 2014-01-04 09:34:49 -08:00
SoftCoder 2badd13fd3 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-03 15:10:59 -08:00
SoftCoder 9026ce161d - bugfixes when user has no internet and published not turned on, do not try to do UPNP. 2014-01-03 15:10:30 -08:00
titiger 29f5881ded Just render zoomed map preview and nothing else. 2014-01-03 19:19:10 +01:00
SoftCoder 58faecb5d5 - bugfix for datapath 2014-01-03 10:15:30 -08:00
SoftCoder 85319b30fc - fixup use of --data-path param 2014-01-03 08:01:33 -08:00
SoftCoder 2b9326197a - added verbose debug info for data paths scanning 2014-01-03 07:28:31 -08:00
SoftCoder ecdb229bdf - attempt to do better lag handling (pause game up to 3 times for lagging clients then disconnect) 2014-01-02 13:56:37 -08:00
SoftCoder 6f4c3ed033 - added reg file for windows users to manually disable packet throttling 
- added console warning for windows users that have this setting enabled.
 2014-01-01 13:24:24 -08:00
SoftCoder 676a6071fa - attempt to disable packet throttling on windows 
- added some network packet debug code
 2014-01-01 10:59:55 -08:00
SoftCoder 21a12a6c72 - added ability to render map preview full screen when user clicks on the map preview. Click anywhere on the fullscreen map to restore. 2013-12-30 23:32:06 -08:00
SoftCoder 5613b0739e - added more lua debug info 2013-12-30 14:00:04 -08:00
SoftCoder 853d531d11 - added two new lua methods basxto: 
storeSaveGameData(name, value)
string loadSaveGameData(name)
 2013-12-30 12:55:59 -08:00
SoftCoder 2c788e074a - fix auto loading scenario from commandline 2013-12-30 12:19:10 -08:00
SoftCoder c7c82b56e1 - a little cleanup of building with lua and CMAKE 
- added ability to force building without static libs in build script: -d=1
- added --lua-debug commandline option
 2013-12-30 11:02:43 -08:00
SoftCoder 5c90b9148c - bugfix for saving / loading booleans in a lua table 2013-12-30 09:28:25 -08:00
SoftCoder 97d11a9cfd - script manager detected errors don't try to translate the error 2013-12-30 08:17:05 -08:00
SoftCoder 5b445ad388 - removed stack trace from script manager methods that create known errors to make error message smaller. 2013-12-30 07:57:51 -08:00
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
Mark Vejvoda ad7569ded1 - code cleanup based on additional gcc warnings 2013-11-19 07:02:26 +00:00
Mark Vejvoda 33d87512b0 - code cleanup based on additional gcc warnings 2013-11-19 06:58:52 +00:00
Mark Vejvoda 94684c66a4 - code cleanup based on additional gcc warnings 2013-11-19 06:56:09 +00:00
Mark Vejvoda 66761ba760 - code cleanup based on additional gcc warnings 2013-11-19 06:42:32 +00:00
Mark Vejvoda 9268aaf279 - a few minor bug fixes related to code warnings 
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
 2013-11-19 06:14:06 +00:00
Mark Vejvoda 642a26bdb5 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 23:10:38 +00:00
Mark Vejvoda e28097e0d7 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 22:37:12 +00:00
Mark Vejvoda fe6886d273 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 22:05:16 +00:00
Mark Vejvoda 145b90d341 - updating version to 3.9.0 for release 
- increase installer size on linux for more accurate progrerss bar
 2013-11-17 18:27:41 +00:00
Titus Tscharntke d2cb21d818 version is set to 3.9-dev until versioning system is discussed 2013-11-17 10:41:09 +00:00
Mark Vejvoda 4478b8d1df - fixed compiler warnings in linux 32 gcc 2013-11-17 09:03:57 +00:00
Mark Vejvoda ff9faf7a4a - fixed warnings in 32 bit linux gcc 2013-11-17 09:01:32 +00:00
Mark Vejvoda d0ac27353a - fixed compiler warnings in linux 32 gcc 2013-11-17 08:44:47 +00:00
Mark Vejvoda e89210cf6c - updating version # to v3.9 in preparation for release 2013-11-16 21:50:54 +00:00
Mark Vejvoda 303746df80 - updated cmake scripts to fix build problems on debian 2013-11-16 19:18:09 +00:00
Mark Vejvoda 1dd1b8febb some minor bugfixes (proper variable init, added validation error message) 2013-11-16 18:36:54 +00:00
Mark Vejvoda aa1efb5d3a added a check for missing data in menu 2013-11-16 10:02:32 +00:00
Mark Vejvoda 77fba5a65e bugfix for clients that have no data, no need to crash 2013-11-16 03:33:13 +00:00
Mark Vejvoda 09818dfdc1 - added a warning code comment to avoid this in the future 2013-11-16 02:12:26 +00:00
Mark Vejvoda 4c4bcd40a3 see if this helps stuttering 2013-11-16 00:28:55 +00:00
Mark Vejvoda c9a6078689 revert network code back 2013-11-15 20:04:12 +00:00
Mark Vejvoda 98bc4b190e attempt to see how this affects network games for tomreyn 2013-11-15 19:21:14 +00:00
Mark Vejvoda ea88a4c990 roll back last change 2013-11-15 18:58:28 +00:00
Mark Vejvoda 119a8cce4a attempt to see how this affects network games for tomreyn 2013-11-15 18:41:21 +00:00
Mark Vejvoda 9080ade759 small cleanup from cppcheck 2013-11-14 23:24:17 +00:00
Mark Vejvoda 445e39ab2d updated compressor to skip non mode game data by default unless additional parameter specified 2013-11-14 23:18:28 +00:00
Mark Vejvoda 9350b16c4a cleanup from cppcheck 1.62 2013-11-14 16:42:22 +00:00
Mark Vejvoda b3a9ad5411 fixed some vc++ compiler warnings 2013-11-14 13:56:05 +00:00
Mark Vejvoda cc21dbbc5c cpp check warnings cleanup 2013-11-14 13:22:55 +00:00
Mark Vejvoda 3671bd0617 - removed debug code 2013-11-14 13:17:58 +00:00
Mark Vejvoda d48d63b1fa a bit more refactoring for command line parameters 2013-11-14 12:54:05 +00:00
Mark Vejvoda 53eca42a11 - Disable performance warnings by default. To enable, either press ' in a game top toggle on/off or add this key: PerformanceWarningEnabled=true 
- refactor data compress into its own function
 2013-11-14 12:38:03 +00:00
Mark Vejvoda a300621415 - added a new commandline command to create data archives for network xfer for techtrees and tilesets: 
megaglest --create-data-archives=all
 2013-11-14 06:59:29 +00:00
Mark Vejvoda 5db18c76f4 bugfix for load games when xml is bad 2013-11-14 04:13:40 +00:00
Mark Vejvoda 85799eddc2 more user friendly handling of loading corrupt saved game files 2013-11-14 03:33:15 +00:00
Mark Vejvoda ccd6e19683 bug fix for font handling of newlines and added unit test 2013-11-14 00:23:01 +00:00
Mark Vejvoda 0bc9ed082f attempt bugfix for bad screenshots on saved games 2013-11-13 23:37:12 +00:00
Mark Vejvoda 1067e89915 move text lower as it interferes with progress bar 2013-11-13 23:34:23 +00:00
Mark Vejvoda 5249ecc45d some code cleanup for xml parsing and loading saved games 2013-11-13 22:28:05 +00:00
Mark Vejvoda 4e1c9be664 some memory leak cleanup 2013-11-13 21:22:56 +00:00
Mark Vejvoda 2d8f0f7430 clear cache lookups when appropriate 2013-11-13 19:00:33 +00:00
Mark Vejvoda 94b8a346f2 bugfix to properly show render performance 2013-11-13 18:16:59 +00:00
Mark Vejvoda 5e7e440c5d attempt to see if this improves performance 2013-11-13 18:05:47 +00:00
Mark Vejvoda 0a0e3f408a - added experimental Right To Left 'mixed mode' support to attempt to make RTL languages with lines having mixed RTL and LTR words display properly (this is a manual hack). To enable, add this to the languages lng file: FONT_RIGHTTOLEFT_MIXED_SUPPORT=true 2013-11-13 07:56:19 +00:00
Mark Vejvoda 0557a1195e - added console output for socket errors (lets see if we get this on windows when they slow down) 
- fixed missing reload ui items in menu
 2013-11-12 15:01:37 +00:00
Mark Vejvoda 41083f9f32 small cpp check cleanup 2013-11-12 02:30:26 +00:00