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

1744 Commits

Author SHA1 Message Date
filux
f594e8a037 removed one redundant message [ci skip] 2015-11-16 21:49:20 +01:00
SoftCoder
492d821e0b - small code cleanup 2015-11-12 04:18:08 -08:00
SoftCoder
f97e8d5fc3 - clipboard working now for utf8 2015-11-11 21:52:22 -08:00
titiger
8d315ba744 first steps for ctrl-v for input 
Problems remaining:
paste probably iss too long for ( problem for text input labels )
paste is countet as one single input which deletes the whole pasted string 
on pressing backspace.
 2015-11-09 01:31:24 +01:00
filux
8a4ee15e59 Merge branch 'develop' into feature/sdl2 2015-11-05 20:45:53 +01:00
titiger
dbee447a9a eventSdlKeyDown 
Give the real SDL_KEYDOWN to the Window/Program states.
This fixes issues with group keys and SDL2.
 2015-10-30 01:04:01 +01:00
SoftCoder
d5edf6f973 - trying to fix issue #71 alt-enter toggle 2015-10-28 16:07:15 -07:00
SoftCoder
952e0a6315 - editor and g3d viewer work in wxwidgets 3.0.2 2015-10-26 19:49:25 -07:00
SoftCoder
76d41dfc09 - attempt to see if IRC chat works better with sdl2 textinput 2015-10-24 09:02:23 -07:00
SoftCoder
75077c4a50 - added support for miniupnpc 1.9, this fixes #79 (cherry-pick to develop & RC) 2015-10-22 17:34:14 +02:00
SoftCoder
49ce8e729b - added support for miniupnpc 1.9 2015-10-21 18:11:19 -07:00
SoftCoder
6d0592d4ab - attempt to fix bugs related to sdl2 key handling 2015-10-17 22:46:42 -07:00
SoftCoder
92aa2a7e04 - updated windows build for sdl2 2015-10-17 17:58:25 -07:00
titiger
c402509853 no more SDL_WINDOW_RESIZABLE 
This gave strange effects with missing parts on the screen 
and bad mouse positioning. No more window resize in windowed 
mode, likein old MG
 2015-10-13 02:29:19 +02:00
SoftCoder
45598620fa - additional bugfixes for keyboard entry in sdl2 2015-10-08 18:25:28 -07:00
SoftCoder
6707343ac4 - fix special keys in sld2 (like arrow key) 2015-10-08 17:04:43 -07:00
titiger
8991507526 Mouse pointer works a bit better 
SDL2 showed native and MG mouse pointer at the same time. Attempt to fix it.
 2015-10-07 02:14:07 +02:00
SoftCoder
d80ca9e0b2 - for now make fullscreen mode ONLY use desktop resolution, all other tries seem buggy in SDL2 2015-10-04 20:34:54 -07:00
SoftCoder
9e6e4dd6fe - try to fix fullscreen mode a little better 2015-10-04 14:03:12 -07:00
SoftCoder
32f3729f0a - attempt to fix res changage in fullscreen 2015-10-04 13:30:17 -07:00
SoftCoder
5b9eccd10b - allow changing resolution in video settings menu 2015-10-02 17:27:55 -07:00
SoftCoder
5a29608b9c - attempt to fix keyboard inputs for sdl2 2015-10-01 03:40:19 -07:00
titiger
9dda6b59dc toggle fullscreen/windowed works again 2015-09-29 21:37:26 +02:00
SoftCoder
95e5d2782c - bugfix to get proper typed character in sdl2 2015-09-29 06:22:54 -07:00
SoftCoder
41ae158a9c - bugfix for sdl2 compile using wrong object 2015-09-29 02:13:49 -07:00
SoftCoder
8e439a2325 - got sdl2 branch compiling and game loads 2015-09-28 23:28:11 -07:00
titiger
23ea9f6201 first steps for sdl2 ( still many compile errors ) 2015-09-29 01:30:28 +02:00
filux
4bef525bf3 removed not required CURL module, renamed several cmake-build options for be more easy sortable by name 2015-09-27 19:46:35 +02:00
filux
4ad684deaf updated modules: LUA, GLEW 2015-09-22 01:04:22 +02:00
filux
6ac255095a implemented basic support for SDL2 in cmake files (only); changed a general idea of how and where are showed deprecation warnings 2015-09-18 19:17:52 +02:00
filux
5afa6c68ba added missing option for lua 5.3 2015-08-20 16:52:27 +02:00
filux
617bc9a89e extended support for lua to v5.3; removed some duplicate messages showing up during 'cmake configuration' time 2015-08-20 16:43:14 +02:00
filux
455b4731e2 even mode fixed dialog code 2015-06-28 19:43:10 +02:00
filux
68cfb32e96 fixed configuration for kdialog, added support for yad 2015-06-23 22:08:42 +02:00
filux
72539021f9 in default OpenSSL is not required, closed #67 2015-06-13 00:09:56 +02:00
Rémi Verschelde
56ac448177 Ensure libcurl also links against libssl and libcrypto 
ssl and crypto seem to be lacking in ${CURL_LIBRARIES} at least on my distro,
and that causes underlinking issues.
 2015-06-12 21:42:50 +02:00
Tom Reynolds
fecf89f295 Cosmetics 
[CI skip]
 2015-06-10 12:02:45 +02:00
filux
e26ea22378 more universal and matched entry, fixed #65 2015-06-05 01:54:05 +02:00
Michael Palimaka
fc07d9caf2 Fix build with >=cmake-3.2. 
The FindOpenGL module no longer pulls in X11 libraries.
 2015-06-05 00:47:52 +02:00
filux
34d52e40d7 updated support for new versions of ubuntu 2015-04-29 20:23:03 +02:00
titiger
b3cf4bf1fd meshes can glow 2015-03-18 20:21:59 +01:00
titison
12102f8791 Specific Tileset on map-preview option 
Tell the game a specific tileset to use together with the --preview-map
option. The Tileset is optional. Default is forest.
! EVEN IF FOREST DOES NOT EXIST ! (like before)
./start_megaglest --preview-map=Map,Tileset
 2015-03-08 01:36:16 +01:00
titiger
4c5440f78c map editor has much more powerful random height function 
You can give parameters now, to influence the map height calculation.
 2015-02-10 02:06:02 +01:00
filux
69e9dff754 better support for static build on debian 2015-01-31 11:53:59 +01:00
filux
9977fd2606 fixed 'Not a git repository' bug related with real out of source build from the git repository 2015-01-31 10:30:19 +01:00
titiger
0616483452 faster Particlesystem 
removed a useless validation call which was pretty expensive for many 
particle systems alive
It checked for existance of particle system in the vector we were curretnly 
cycling through.
 2015-01-17 15:14:38 +01:00
Tom Reynolds
d3d0fbf9bf lossless images compression 
keeping file formats, comments + EXIV meta data intact
 2015-01-14 23:58:30 +01:00
titiger
ab02478096 enabled depth_test for colorpicking 
To do it many changes were needed, because mouse position on map was 
calculated using the depth buffer with current rendering state
 2015-01-04 14:38:32 +01:00
titiger
109a5b9985 sort map lists non case sensitive in menu 2015-01-03 02:03:31 +01:00
titiger
f4529566fa bugfix for version checking 
We can  have versions with only one dot.
 2015-01-02 01:24:45 +01:00
titiger
4a292ed1d1 don't mix functionality 
Not a bug fix, just trying to keep things more clean.
 2015-01-01 17:16:24 +01:00
SoftCoder
efa7cb0346 - bugfix for shared team resources 
- added some new internal feature code to test auto updates for a future release
 2014-12-30 12:16:35 -08:00
titison
7cd1cb242f Fix for meshBound Particles 
There was a bug if you used multiple units of the same type with mesh bound
particles. The given model was the same for all units with the same 
unitType/skill.
 2014-12-26 20:51:37 +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
SoftCoder
4dea67cff9 - attempt to fix thread crash when ending game for network play 2014-12-19 19:08:04 -08:00
SoftCoder
5099f19709 - update miniz code to 1.15 2014-12-17 07:28:06 -08: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
c51817d8d5 fixed missing cast found by Coverity CID 1232666 2014-12-16 01:49:26 +01:00
SoftCoder
5e292e931c - memory leak and a few other minor bug fixes as discovered by coverity scan. 2014-11-30 15:30:02 -08:00
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