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

1683 Commits

Author SHA1 Message Date
SoftCoder
ad0b652727 - bugfix for g3d viewer and updated wxwidgets 2014-11-28 23:35:35 -08:00
SoftCoder
ceca2fc5aa - more fixes from cppcheck 2014-11-28 18:19:40 -08:00
SoftCoder
d0cdea1a6d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 16:23:14 -08:00
SoftCoder
ec0d9a7cd5 - bugfix to properly set defaults for particles 2014-11-28 16:22:29 -08:00
titiger
a37e7b398e blend mode set to normal after particle rendering 2014-11-28 23:52:13 +01:00
SoftCoder
cbf9a305c5 - attempt to improve loading of fire particle 2014-11-26 17:19:46 -08:00
SoftCoder
3647a610cc - attempt to improve mutex locking in irc client code to avoid dead locks 2014-11-20 17:51:24 -08:00
SoftCoder
5676a055ba Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-18 21:40:12 -08:00
SoftCoder
3b3132ccce - unit particles now support minHp / mapHp tags 2014-11-18 21:38:46 -08:00
titiger
b4e9f787bd several changes for loading saved games 
allow to load older compatible save game
introduced a "last backward compatible version" for loading games
fixed a bug allowing to load older games
 2014-11-18 18:59:45 +01:00
titiger
d21f7bd976 problems found by coverity 2014-11-10 21:53:10 +01:00
titison
de5135bfaf *added split(s,d) function for strings 
*reading unit xml healthbar node
*adjusted hpbars
 2014-10-29 00:50:45 +01:00
titiger
1f5b571c9d bugfix for bad {SCENARIODIR} replacement 
Done by softcoder in branch ce-gui, manually merged by me :)
https://forum.megaglest.org/index.php?topic=9553.0
 2014-09-24 01:16:28 +02:00
titiger
4fc4359d99 we don't want fancy commands from irc 
https://forum.megaglest.org/index.php?topic=7756.0
 2014-09-22 00:36:49 +02:00
titison
4c51677a9d Accidently doubled the gravity ^^ 2014-07-26 14:03:54 +02:00
titison
38ca1fd3f9 Unit and Splash particles can be speeded up. 
You can set a constant value and a relative value.
 2014-07-26 13:56:29 +02:00
SoftCoder
63863bac89 - updated unit test to compile on windows 
- updated vc++ 2012 compile flags and changed asm to use unsigned
 2014-02-07 15:42:00 -08:00
SoftCoder
fe25767b1c - updated asm code to only compile when x64 mode enabled 2014-02-06 21:39:54 -08:00
SoftCoder
2ed1c2ae2b - attempt to see if this win64 asm is more reliable for streflop 2014-02-06 17:03:15 -08:00
SoftCoder
d2f321a2df - attempt to bugfix win64 stability 2014-02-05 11:29:21 -08:00
SoftCoder
78ed6d4601 - attempt to add streflop to win64 build 
- CRAZY attempt to add x64 (win64) support to streflop via some new asm code!
 2014-02-01 01:28:30 -08:00
SoftCoder
5a48eb0b8a - bugfix for clang 2014-01-27 20:14:06 -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
filux
8ec938a940 Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat 2014-01-26 09:46:53 +01:00
SoftCoder
9cb0ba8833 - xerces included only if forced in cmake since it will be deprecated 2014-01-25 18:12:53 -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
filux
ea7b088919 Conversion of files (windows OS specific) from LF to CRLF. Removed 3 ignored files. 2014-01-25 21:52:02 +01:00
SoftCoder
85e659219b - small cppcheck code cleanup 2014-01-18 16:49:31 -08:00
SoftCoder
4583b8d4bc - bugfix for windows compile error for new particle feature from titi 2014-01-17 20:10:18 -08:00
SoftCoder
27316e8912 - added time to error console output log items 2014-01-17 13:32:42 -08:00
SoftCoder
0de4f33923 - error output now shows system time 2014-01-17 09:46:31 -08:00
SoftCoder
2c7d464abc - remove console output for pbo's 2014-01-12 09:59:08 -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
41553cc679 dumb bug writing mesh bound particle warnings all the time, even if not needed 2014-01-08 22:24:11 +01:00
titiger
aee2417ce1 Additional warning for modders to find problems with mesh bound particles. 2014-01-05 23:57:29 +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
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
SoftCoder
85319b30fc - fixup use of --data-path param 2014-01-03 08:01:33 -08:00
SoftCoder
5f1e67ec9b - updated network throttle check to output nothing if we cannot open the reg key (likely because it does not exist and does not apply) 
- updated libvlc use in windows to use 2.1.2
 2014-01-01 14:58:14 -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
7643c2b591 - changed registry branch to hkey local machine for packet throttle 2014-01-01 11:23:51 -08:00
SoftCoder
02cb5c235d - bugfix to compile in msvc 2014-01-01 11:08:51 -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
b109b26664 - attempt to add crude thread state tracking in thread class and force thread to die if it appears to be stuck (and output to console) 2013-12-30 21:23:49 -08:00
SoftCoder
e0aa65402d - added ability to force the LUA version to compile with (5.1 or 5.2) 2013-12-30 18:30:23 -08:00
SoftCoder
8742d36a06 - do not save empty lua tables 2013-12-30 17:12:49 -08:00
SoftCoder
5613b0739e - added more lua debug info 2013-12-30 14:00:04 -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
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
163a5a173a - bugfix when user has no sound device 2013-12-27 22:32:58 -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
220a0130dd - bugfixes for msvc compile 2013-12-25 11:48:08 -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
f06d474b60 - cleanup some socket issues and also a possible int overflow 2013-12-24 22:44:46 -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
25326c64b1 - cleanup some warnings from msvc 2013-12-23 10:34:52 -08:00
SoftCoder
1ba098d0f0 - clang compiler warning cleanup 2013-12-23 00:05:07 -08:00
SoftCoder
e0c2a388d4 - msvc compiler warning cleanup 2013-12-22 23:58:12 -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
6cd1d237ab - a little more code cleanup from coverity issues 2013-12-22 13:18:40 -08:00
SoftCoder
343a728911 - cleanup some network related code and try to remove uneeded noise 2013-12-18 23:35:27 -08:00
SoftCoder
998cabafac - a few more coverity reported fixes 2013-12-18 08:26:16 -08: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
ca12b7912a - cleanup clang warning 2013-12-16 19:25:07 -08:00
SoftCoder
b5243763a2 - added some device cleanup in case its needed 2013-12-16 19:11:17 -08:00
SoftCoder
1463dc0fc1 - bugfix for memory leak 2013-12-16 17:48:52 -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
SoftCoder
22beafe122 - fixed windows build for vc++ 2010 2013-12-14 03:09:12 -08:00
SoftCoder
b11932b92d - cleanup from cppcheck report 2013-12-14 03:03:19 -08:00
SoftCoder
d69e19b87b Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 
Conflicts:
	source/shared_lib/include/platform/sdl/factory_repository.h
 2013-12-14 02:45:25 -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
1d9f1f9432 - forgot to commit changes 2013-12-14 02:33:03 -08:00
SoftCoder
ec13e904d3 - fixed windows build (removed gl2 references) 2013-12-14 02:29:32 -08:00
SoftCoder
209458adee - removed deprecated gl2 code as it was not used 2013-12-14 02:22:30 -08:00
SoftCoder
b9d6b38e8f - coverity based bug fixes - round #1 2013-12-13 23:04:12 -08:00
SoftCoder
c887b0c357 - attempt to cleanup a few warnings 
- attempt to get git rev info each compile (not just when running cmake)
 2013-12-11 23:16:56 -08:00
Will
2d6da27807 Merge branch 'master' of github.com:MegaGlest/megaglest-source 2013-12-07 20:41:44 +01:00
SoftCoder
02d41bd5f7 fixed windows build 2013-12-06 09:08:47 -08:00
Will
46a0dab916 moved model constructor always behind factory 2013-12-05 21:28:20 +01:00
Will
6afadafa1e Start to abstract model 2013-12-05 16:17:41 +01:00
SoftCoder
6ae1d179bb - updated for proper build on Mac 2013-12-04 14:54:02 -08: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
f9e217df94 - bugfix so Mac builds 2013-12-04 13:34:00 -08:00
Will
7e4e98857b integrate upstream 2013-12-04 08:49:33 +01:00
SoftCoder
4b50560ca9 - added color picking used colors count in debug view 2013-11-30 17:38:32 -08:00
SoftCoder
f7bc5e8f92 - bugfix and additional code (for now) to track duplicates and problems in color picking. We now use will's implementation as it supports 64K colors. 2013-11-30 17:20:30 -08:00
Will
a869dd0fee Tweak to see if we can get the new colour picking code working 2013-12-01 00:43:49 +01:00
SoftCoder
c2929e3d2b merged 2013-11-30 14:31:05 -08:00
SoftCoder
2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
williame
125e1c53dc Got the colour conversion wrong in colour picking 2013-11-30 21:44:53 +01:00
SoftCoder
f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
SoftCoder
1a8673feb3 - bugfix for will's color pick optimization (was not properly doing cell selection) 2013-11-28 22:58:13 -08:00
Will
c6530c2783 merging in all Will's changes 2013-11-29 02:12:34 +01:00
filux
00b4d9ab4e resolved conflicts by conversion CRLF to LF 2013-11-28 08:26:39 +01:00
filux
d0836a6573 transfered .tx and tx-cleanup to data, added license/readme, basic configuration 2013-11-28 07:58:09 +01: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
f6806bd1ea - added unit tests for arabic handling in fribidi 
- added default property value for right to left mixed in english.lng
- fixed bug in arabic.lng file
 2013-11-20 00:22:39 +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
66761ba760 - code cleanup based on additional gcc warnings 2013-11-19 06:42:32 +00:00
Mark Vejvoda
39b41cdfea - code cleanup based on additional gcc warnings 2013-11-19 06:29:30 +00:00
Mark Vejvoda
4a4c7fbfde - code cleanup based on additional gcc warnings 2013-11-19 06:24:22 +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
e89210cf6c - updating version # to v3.9 in preparation for release 2013-11-16 21:50:54 +00:00
Mark Vejvoda
b2f3748168 - updates related to debian package standards 2013-11-16 20:27:51 +00:00
Mark Vejvoda
35714002e9 bugfix for vc++ compile 2013-11-15 15:58:23 +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
e3245eb7f4 disable rescursive ftp file download for techtrees and tilesets 2013-11-14 22:57:56 +00:00
Mark Vejvoda
429db5ff66 fixed rtl mixed support mode so that words are properly placed in the sentence 2013-11-14 22:19:40 +00:00
Mark Vejvoda
f0737ac682 fixed rtl mixed support mode so that words are properly placed in the sentence 2013-11-14 22:17:30 +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
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
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
5249ecc45d some code cleanup for xml parsing and loading saved games 2013-11-13 22:28:05 +00:00
Mark Vejvoda
b7267c9176 some memory leak cleanup 2013-11-13 21:26:08 +00:00
Mark Vejvoda
4e1c9be664 some memory leak cleanup 2013-11-13 21:22:56 +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
7f5d35ef0f - do not validate null fire particle 2013-11-12 01:00:03 +00:00
Mark Vejvoda
f1abe148ea - bugfix for background crc thread shutdown 
- more performance monitoring and better output of only warnings
 2013-11-11 04:46:49 +00:00
Mark Vejvoda
d32de80491 bugfix for precache crc thread unpause on game end 2013-11-10 21:55:22 +00:00
Mark Vejvoda
8ea6235495 ensure pre cache crc thread does not interfere with running game 2013-11-10 19:47:04 +00:00
Mark Vejvoda
b9e3f57894 - attempt to rollback change that causes game differences on different platforms 2013-11-10 04:26:57 +00:00
Mark Vejvoda
ba3e5a6030 added ip address for socket write errors 2013-11-09 19:32:13 +00:00
Mark Vejvoda
54338461dc add timer for socket write errors to avoid performance penalty when writing to console 2013-11-09 19:30:36 +00:00
Mark Vejvoda
8d69cc02fd update cmake script for mac and miniupnpc 2013-11-09 18:33:19 +00:00
Mark Vejvoda
d55af0355b added mac define for darwin compiling miniupnpc 2013-11-09 18:10:41 +00:00
Mark Vejvoda
342aba5caa - set curl connection timeout to 60 minutes 
- set curl ftp response timeout to 2 minutes
 2013-11-08 02:32:11 +00:00
Mark Vejvoda
3796b035cd remove font macro since it always made cppcheck report bad things about the code 2013-11-07 20:41:05 +00:00
Mark Vejvoda
95b7172260 vc++ warnings fixes 2013-11-07 19:00:47 +00:00
Mark Vejvoda
9b097fd911 decouple masterserver from network host game settings into two seperate threads 2013-11-07 18:39:08 +00:00
Mark Vejvoda
eb6466889f do not crash and exit game when core data textures are not found 2013-11-06 02:02:00 +00:00
Mark Vejvoda
70421d1b3d added a check for data and user data paths being the same 2013-11-06 00:31:36 +00:00
Mark Vejvoda
dbb2409d76 remove usless output from error message 2013-11-05 21:13:26 +00:00
Mark Vejvoda
345907fc18 attempt to make win64 faster by using avx (as opposed to sse2) 2013-11-05 06:31:48 +00:00
Mark Vejvoda
f4cbced3f4 more vc++ warning fixes as well as disable an unused font renderer in windows 2013-11-04 20:16:52 +00:00
Mark Vejvoda
b190968e6b - bugfix for save / restore game (spelling mistake) 
- vc++ warning fixes
 2013-11-04 19:16:28 +00:00
Mark Vejvoda
c6b42e4bf6 bugfixes in win64 for exception handling 2013-11-04 17:42:48 +00:00