Commit Graph

267 Commits

Author SHA1 Message Date
Mark Vejvoda
3ff0796bec - some in progress pathfinder work 2012-05-04 21:03:52 +00:00
Mark Vejvoda
20ffdbcf2d - fixed on windows platform 2012-05-01 15:21:09 +00:00
Mark Vejvoda
a70b1a9881 - patch to compile on gcc 4.7 2012-05-01 14:55:06 +00:00
Mark Vejvoda
dbb116f250 - load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010) 2012-04-20 01:04:05 +00:00
Mark Vejvoda
c8fdc9269f - fix win32 build
- cleanup a lot of win32 compiler warnings
2012-04-16 20:15:57 +00:00
Mark Vejvoda
8c0bf75bf5 - got built in memory leak working. Just edit leak_dumper.h and uncomment:
//#define SL_LEAK_DUMP
- got better / more accurate stack dumps when we detect errors in game.
- Both of these need to be worked on in windows next, win32 may not compile for now until i fix it on that platform.
- BE VERY CAREFUL when working in leak_dumper.* it may cause GCC and your system to crash if you don't know what you are doing!
2012-04-14 21:21:09 +00:00
Mark Vejvoda
c1f617481e - bug fixes for load saved game (now fixes loading on windows) and corrects memory bug for loading saved games on all platforms. 2012-04-04 15:36:09 +00:00
Mark Vejvoda
f3df72bb14 - added a new function to correct some file paths when loading a saved game from another persons computer (may need more tweaking)
- added support for saving and loading tables from Lua
2012-03-29 18:14:25 +00:00
Mark Vejvoda
b481fbcbb5 - proper save and restore for particles 2012-03-19 21:35:54 +00:00
Mark Vejvoda
8d5de12d42 - added some particles to load game logic 2012-03-14 07:23:41 +00:00
Mark Vejvoda
917adc8c98 - bugfix for game save and load (string buffer was too small for one item) 2012-03-13 21:58:31 +00:00
Mark Vejvoda
82cd1d3e9c - restore timeflow and gamecamera on load game 2012-03-12 23:40:54 +00:00
Mark Vejvoda
9271d7d7f6 - initial loading logic for loading of saved games.
- currently we always save the game during out of synch or on game quit.
- added a new commandline option to load the last saved game, this doesn't do much yet, just creates units in the map locations they were when the game was saved
./megaglest --load-saved-game
2012-03-12 23:08:22 +00:00
Mark Vejvoda
c5331b7e8a - initial work to save game state to XML. Current only saves when out of synch or game end occurs and saves to same folder as log files and file is called: megaglest-saved.xml
(Currently we store way too much info but this is a starting point)
2012-03-10 03:27:25 +00:00
Mark Vejvoda
4ad42518c0 - updated for better handling of streflop on different platforms
- attempt for bugfix on windows when socket send buffer is continuously full
2012-02-10 06:21:06 +00:00
Titus Tscharntke
e05984d527 - daylight effects for unit particles ( best use with mode "black" )
- meadow has good looking mist in night now
- startdelay for particles
2012-01-07 20:24:54 +00:00
Mark Vejvoda
fe72cb629b - updated to properly use fontconfig for finding fonts 2012-01-05 22:35:05 +00:00
Mark Vejvoda
835c886705 - few tweaks to get things compiling under mingw 2011-12-25 03:09:39 +00:00
Mark Vejvoda
2e94c32d59 - added ability to check if compiler supports SSE and if not fallback to X87 for streflop.
- added ability for clients to specify gamma override value for drivers which support it
2011-12-23 08:20:54 +00:00
Mark Vejvoda
2224d75d10 - updated copyright headers to the same as the rest of the main mg source for files i wrote. 2011-12-20 07:39:07 +00:00
Mark Vejvoda
dbd1e03f12 - updated copyright for md5 source code from David Henry (with his permission). Info pasted into docs/COPYRIGHT.source_code.txt 2011-12-18 15:18:46 +00:00
Mark Vejvoda
6a6b58fa20 - turn off building freetype-gl unless enabled in cmake flags 2011-12-16 05:30:46 +00:00
Mark Vejvoda
bb16ed2a65 - debian related changes 2011-12-15 11:16:14 +00:00
Mark Vejvoda
9852325da6 - fixed Martiño Figueroa's name in all copyrights in source code
- added copyrights to files that were missing it
2011-12-14 07:40:48 +00:00
Mark Vejvoda
2fd89f11d5 - performance improve for color picking using pbo 2011-12-13 22:50:14 +00:00
Mark Vejvoda
724d274367 - fixed pixel buffer logic on windows (wacky vc++ 2008 doesn't properly allocate memory on vector.reserve(); 2011-12-13 22:21:21 +00:00
Mark Vejvoda
c4dc1e616b - added support for pixel buffers and use it for color picking (eventually for screenshots) 2011-12-13 19:52:17 +00:00
Mark Vejvoda
2dd2afb296 - changed selection code to use color picking, can disable using new ini setting:
EnableColorPicking=false
2011-12-13 01:30:52 +00:00
Mark Vejvoda
b6d7d1234c - incremented version to 3.6.1-dev
- a few changes to opengl version checking (now uses glew)
2011-12-06 01:34:51 +00:00
Mark Vejvoda
01ea0787a3 - a few more updates to cut down on RAM use for headless server 2011-12-03 00:39:03 +00:00
Mark Vejvoda
8bdf863636 - cleanup of masterserver global flag
- attempt to cut down on resources required for masterserver mode to minimize RAM
2011-12-02 22:04:02 +00:00
Mark Vejvoda
1658306b59 - fixed debug output font position --> just for you james! 2011-11-28 05:54:31 +00:00
Mark Vejvoda
646ec7707a only update the font vertex buffer if text or color changed 2011-11-19 18:25:16 +00:00
Mark Vejvoda
53e1610234 - cleanup of header files related to opengl / glew 2011-11-19 10:13:27 +00:00
Mark Vejvoda
3fd8c1ef90 - updated findfont method to be shared and to use more default fonts if main ones are not found 2011-11-19 07:35:12 +00:00
Mark Vejvoda
31fafe4528 - fixed up font alignment and added a way to force ftgl font mode:
--force-ftglfonts
2011-11-18 19:53:56 +00:00
Mark Vejvoda
d0acde5d88 - fixed freetype-gl on windows compiler
- deprecated ancient opengl extension code and replaced it with glew
- testing new font renderer on windows (still in progress need to fix newlines)
(now need to check the Linux build and possibly make adjustments)
2011-11-18 08:28:42 +00:00
Mark Vejvoda
0e9b4851fd fixed new font rendering on Linux and removed glew dependency 2011-11-18 00:28:45 +00:00
Mark Vejvoda
ab9243ea38 - got freetype-gl working under windows 2011-11-17 23:21:08 +00:00
Mark Vejvoda
2251a7b2dc - added freetype-gl rendered and set as default font renderer (see: http://code.google.com/p/freetype-gl/) 2011-11-17 09:56:25 +00:00
Mark Vejvoda
50adfb3305 - added ability to switch languages from nearly anywhere (and new hotkeys to do so):
CTRL+L shows language popup selection, CTRL+SHIFT+L toggles to next language automatically
2011-10-25 18:39:11 +00:00
Mark Vejvoda
e5c5e22c26 initial attempt to add a visual food low warning (consumable falls to 25% and balance is ticking down) 2011-10-18 15:41:37 +00:00
Mark Vejvoda
6bf2d2697e - fix for compiling md5 files on windows 2011-10-18 06:09:58 +00:00
Mark Vejvoda
a2ae980986 - added md5 code to project (but not actively used, only compiled) 2011-10-18 04:32:02 +00:00
Mark Vejvoda
166d3b00ed - bugfix for mac osx 2011-10-13 20:33:19 +00:00
Mark Vejvoda
5d0eea51e3 - bugfix for rendering labels (now properly lines up with other controls) 2011-10-02 02:14:05 +00:00
Mark Vejvoda
77a2fa7d48 - getting fanatical about memory cleanup so that valgrind output is more useful 2011-09-30 23:55:07 +00:00
Mark Vejvoda
5a79cad34b - do not load models or sound files in headless server mode 2011-09-26 05:29:52 +00:00
Mark Vejvoda
d99a8236ae - added the ability to synch unit particles with model animation using start-time and end-time attributes 2011-08-27 06:52:17 +00:00
Mark Vejvoda
bc4f33bc9a - added new cmake build option (and fixed bugs from people who added code but did not respect NON streflop define) 2011-07-13 19:57:29 +00:00
Mark Vejvoda
970fe6a326 - some decent render improvement for surface terrain rendering (combined willvar's layer idea with visible quad, but no using vbo's at this point only vertex arrays) 2011-07-10 05:42:11 +00:00
Mark Vejvoda
1b2d4fddea - merged in willvarfar's particle patch 2011-07-06 22:23:51 +00:00
Mark Vejvoda
cb98df354d - pre-calc font height for ftgl and optionally allow for language specific characters to be used 2011-07-02 18:33:59 +00:00
Mark Vejvoda
50347b0a66 - cleanup of font work:
- removed uneeded code
  - set default scale font value to 0.8 to fit nicely on screen
  - added two new optional settings for ini or lng files to control scale and y centering:
  FONT_SCALE_SIZE=0.8
  FONT_SCALE_CENTERH_FACTOR=3.0
2011-07-02 01:56:06 +00:00
Mark Vejvoda
7c996e3296 - added percentage support for min / map hp on damage particles
- bugfixes for png support for pixmap3d (water textures)
2011-07-01 23:13:55 +00:00
Mark Vejvoda
d2c8cc0187 - bugfix for unit titles in special debug mode
- added support for png format for pixmap3d (Water) textures
2011-07-01 07:46:18 +00:00
Mark Vejvoda
1b72bcafe8 - i think this fixes the y centering for all resolutions, after testing we can remove lots of unused properties and code 2011-07-01 01:18:47 +00:00
Titus Tscharntke
baea45cae8 no fun with fonts 2011-06-29 23:48:48 +00:00
Mark Vejvoda
0e897ee94f - bugfix for y centering of font for different fonts / languages 2011-06-28 08:15:05 +00:00
Mark Vejvoda
ebd5bca7fe - attempt to fix 'blurry fonts' 2011-06-28 06:18:24 +00:00
Mark Vejvoda
f1aa231e4b - bugfixes for font display:
- workaround for a bug in freetype in some cases
  - better handling on different resolutions
  - new commandline option to override screen resolution settings
2011-06-11 08:52:49 +00:00
Mark Vejvoda
4aca4af404 - updated patch from willvarfar for animated models in particles 2011-06-11 00:26:26 +00:00
Mark Vejvoda
3efde1d31b - added will's patch for splash particle animation support 2011-06-10 19:44:34 +00:00
Mark Vejvoda
7c43628643 - included patch from willvarfar for animated attack particles (thanks will) 2011-06-10 17:33:09 +00:00
Mark Vejvoda
06999a8f88 - reworked fonts to now use 3d matrix positioning and render performance is much better.
*NOTE: Still need to deal with some letters getting partially chopped off in some cases.
2011-06-10 03:09:19 +00:00
Mark Vejvoda
fc3f5bbfa0 - added some logic to 'try' to figure out when to render font test right to left and when not to 2011-06-09 05:54:04 +00:00
Mark Vejvoda
f65bfe8710 - added some bug fixes to check if lng files are utf-8 or not and deal with it appropriately 2011-06-08 07:18:06 +00:00
Mark Vejvoda
226e8783c0 - added packaged game fonts
- updated code to search new default font folder
- added chinese language file from the fourm for testing
2011-06-07 02:37:58 +00:00
Mark Vejvoda
c808a5661a - added freetype2 / FTGL support 2011-06-06 21:38:25 +00:00
Mark Vejvoda
cc958d266e - updates for possible chinese support (but i really doubt this shows the right text) but stil la good start 2011-05-25 21:11:12 +00:00
Mark Vejvoda
e221011af2 - bugfixes so that the mingw compile builds 2011-05-24 22:51:45 +00:00
Mark Vejvoda
2f6f5df388 - bugfix for linux variable named wrong 2011-05-18 21:56:07 +00:00
Mark Vejvoda
60b8093f5b - attempt to get non ascii file paths working in megaglest (Japanese etc...) 2011-05-18 21:49:11 +00:00
Mark Vejvoda
ae47b47bc8 - bugfixes to avoid segfault when user has no sound card or openal cannot init
- more fallback handling for non power of two textures
2011-05-18 17:54:46 +00:00
Mark Vejvoda
e34e70a0c8 - added code to merge duplicate sounds used in a techtree 2011-05-06 07:47:31 +00:00
Mark Vejvoda
6492832c35 - added initial validation code to warn about duplicate data used in factions 2011-05-05 19:21:50 +00:00
Mark Vejvoda
15489b066f - added new ini setting to see if this helps fix non power of two texture loading for some ATI video cards, user needs to set this in the ini:
EnableATIHacks=true
2011-04-28 07:48:19 +00:00
Mark Vejvoda
1f3d97dbe1 - fixed strange messagebox display (was caused by map preview renderer setting glLineWidth to 14 and never resetting afterwards) 2011-04-24 05:39:13 +00:00
Mark Vejvoda
c4d32ae0d2 - bugfix for users toggling back from Linux tty session 2011-04-18 19:48:05 +00:00
Mark Vejvoda
cf706491e1 - added screenshot file format to options menu
- more cleanup from things discovered with valgrind.
- added an environment variable to use with openal so it is possible to specify which sound device to use if needed down the road
2011-04-02 21:17:17 +00:00
Mark Vejvoda
f7fdafbff4 - did some code refactoring, wanted to load some textures threaded but bailed out due to opengl's hideous problems related to multi-threads 2011-03-22 02:02:54 +00:00
Mark Vejvoda
7d38aec84a - new commandline options to discover and optional delete unused files in techtrees 2011-03-15 15:30:28 +00:00
Titus Tscharntke
c54174061f particles have more switches: day/night visibility , alternating value , radiusBasedStartenergy ( can be disabled now! ) 2011-03-13 23:16:07 +00:00
Mark Vejvoda
28f74a15f7 - we can now save jpg screenshots and can also convert model textures to jpg (WARNING jpg DOES NOT support alpha channel (for transparency) so use this wisely 2011-03-13 22:43:44 +00:00
Mark Vejvoda
d0a95b1ff5 - added another option when converting model textures (keepsmallest) 2011-03-13 09:57:04 +00:00
Mark Vejvoda
39bf1b986e - added new commandline option to convert folders of g3d models to use specified texture format
- added new utility methods and changed code to use them (like adding trailing slash on paths)
2011-03-13 08:23:43 +00:00
Mark Vejvoda
f35e920d47 - added logic to delete old texture after doing a model texture conversion 2011-03-12 22:11:09 +00:00
Mark Vejvoda
c67d7d48c2 - some initial work to allow saving models in the current v4 g3d format (new commandline option to test it also) and also convert textures into png 2011-03-12 21:29:37 +00:00
Mark Vejvoda
7dcb12ff60 - some more memory cleanup 2011-02-12 09:08:50 +00:00
Mark Vejvoda
86baa04a3b - added FBO's for map preview rendering, which improves fps in the custom menu for video cards that support Frame Buffer Objects 2011-02-08 05:54:05 +00:00
Mark Vejvoda
1574e05fcd - surface rendering is a step closer to using VBO's (code now works using Vertex Arrays, next stop Vertex Buffer Objects) 2011-02-04 23:27:55 +00:00
Mark Vejvoda
6ec92f2127 - attempt to add more randomness to pathfinding and faster AI decsions 2011-02-04 06:34:32 +00:00
Mark Vejvoda
dab57fcb34 - attempt to add "some" VBO rendering for static models (need to test if this improves performance in different environments) 2011-02-04 01:24:26 +00:00
Mark Vejvoda
2e5c5be357 - added more options to g3d viewer commandline options 2011-01-29 03:53:05 +00:00
Mark Vejvoda
ffc9347641 - bugfixes for G3D viewer (but applies to general texture loading in game also) we now handle better scenarios where binary or model are in different working directories 2011-01-21 01:53:58 +00:00
Mark Vejvoda
66261ad662 - updated line endings to unix style characters to fix Bug #3085838 2011-01-20 15:56:30 +00:00
Mark Vejvoda
6b0bc35e3c - working VBO code for static objects in game, currently disabled in code but to enabled edit model.h and uncomment #define ENABLE_VBO_CODE 2011-01-18 23:56:30 +00:00
Mark Vejvoda
c54e6dbf5d - a little bit of plumbing for VBO's for static models (currently disabled via # define)
- small small speed improvement when calculating interpolations
2011-01-18 07:52:06 +00:00
nosogo
f545edad68 more fixes for editor 2010-12-05 01:33:28 +00:00
Mark Vejvoda
d89953ee96 - improved performance and bug fixes. 2010-11-09 09:06:52 +00:00
Mark Vejvoda
9978cbeff5 - added some initial work to support FBO (frame buffer objects)
- added many NULL check guards throughout the code
- added a safe mutex around ptr access of background thread on custom menu
2010-11-01 16:44:05 +00:00
Mark Vejvoda
d8c11ebe71 - thread synch bugfix in Internet Lobby Menu (thanks tomreyn for the stack trace) 2010-10-30 17:31:57 +00:00
Mark Vejvoda
77bad3ce07 - added new default PNG format for doing screenshots AND the saving to disk is queued in a background thread allowing almost no delay when saving many screenshots! 2010-10-30 02:21:47 +00:00
Mark Vejvoda
e0d338b583 - added more texture compression supported types
- some in progress work related to texture reloading
2010-10-29 16:27:22 +00:00
Mark Vejvoda
01c26b4224 - added the ability to track pixmap memory usage at start and end of a game 2010-10-28 21:06:20 +00:00
Mark Vejvoda
df3f56a451 - cleanup of texture compression. We output stats for textures that we attempt to compress and what percent they were compressed (before and after byte sizes) 2010-10-28 06:59:43 +00:00
Mark Vejvoda
de3a92081d - a bunch of in progress work related to texture compression and more timely texture memory management cleanup. For now to test texture compression use the following ini setting: EnableTextureCompression=true 2010-10-28 00:51:25 +00:00
Mark Vejvoda
78f6f49cb6 - fixed shadow mapping by removing the use of the extension: GL_ARB_shadow_ambient
(thanks: asmodeus and Ishmaru)
- added some initial work for texture compression (but not active yet)
2010-10-27 15:04:47 +00:00
Mark Vejvoda
d5117ed7fa - cleaned up a whole pile of compiler warnings 2010-10-21 07:20:17 +00:00
Mark Vejvoda
a84f0d1b6d - bugfix to fallback to a default configured font if the specified font in the ini property fails to load. The default font is 'fixed' but can be overriden in the ini using:
DefaultFont=yourfonttype
2010-10-09 20:35:53 +00:00
Titus Tscharntke
268aa4793b particle limits are back again 2010-10-06 17:04:51 +00:00
Titus Tscharntke
3b1ef055b1 - new switch for unit_particle _systems called static-particle-count
- Bugfix for "wild particles". ( the splash particle systems never died before! )
- Better german language file ( cpu  player have english words again, words like ultra are common enough in germany  )
2010-09-25 14:38:00 +00:00
Titus Tscharntke
cd65927924 unit particles can now have float values for emission rates. This allows also emission rates smaller than 1 like 0.01 for example 2010-09-24 16:36:59 +00:00
Titus Tscharntke
3bfc7daddf renderMapPreview nearly done. 2010-09-15 23:49:26 +00:00
Titus Tscharntke
a38778deb1 map preview is scree resolution resistant 2010-09-14 23:02:50 +00:00
Mark Vejvoda
689b810d46 - some cleanup related to image loaders (valgrind complaints) 2010-09-14 15:59:04 +00:00
Mark Vejvoda
25912fa2bb - added proper constructor and initialize member vars 2010-09-14 06:36:55 +00:00
Mark Vejvoda
b95e2247cd - moved map render logic into a shared base class 2010-09-14 06:02:35 +00:00
Mark Vejvoda
4d9bc556d6 - a few more improvements to rendering cache 2010-09-10 00:41:51 +00:00
Mark Vejvoda
958184e018 - more memory cleanup 2010-09-07 21:01:22 +00:00
Mark Vejvoda
63cf199322 - more memory cleanup 2010-09-07 18:28:09 +00:00
Mark Vejvoda
9817e8a860 - memory leak fixes 2010-09-07 17:30:13 +00:00
Mark Vejvoda
ab44c83168 - added leak_dumper header all over the place (not yet functional in linux)
- Bugfix for particle cleanup
2010-09-07 05:25:40 +00:00
Mark Vejvoda
ca30612c9c - attempt to cleanup particles when a unit is deleted 2010-09-06 17:52:33 +00:00
Mark Vejvoda
f3278c3cf3 - bugfixes for stack overflow issue (static array size too large causing chkstk errors) 2010-08-26 19:01:44 +00:00
Mark Vejvoda
0ef23749b8 - allow non visible particles to fade out when its time to do so 2010-08-25 19:46:22 +00:00
Mark Vejvoda
0e3c0a8d0e - disabled staggered unit updates 2010-08-24 02:49:55 +00:00
Mark Vejvoda
65cf1bfdac - attempt to lessen memory footprint of particles and speed up rendering 2010-08-24 01:21:34 +00:00
Mark Vejvoda
4336ae3e37 - added new commandline param --validate-techtrees which will be used to check for known problems in the techtrees for an installation 2010-07-30 07:51:39 +00:00
Mark Vejvoda
8feaebb503 - added caching for computeVisibleQuad
- fixed bug when in chat mode and the deub view toggle key was intercepted
- added less than operators
2010-07-29 05:24:51 +00:00
Mark Vejvoda
d8e41495d0 - removal of sse2 compiler flags for better compatibility
- added workings for a future flag for interpolation cache
2010-07-28 23:24:56 +00:00
James McCulloch
e73324d317 * added DebugType debugPathFinder 2010-07-24 11:43:03 +00:00
Mark Vejvoda
d58a3d948c - fast caching of interpolation data 2010-07-17 12:16:02 +00:00
James McCulloch
bdd4f306f4 * added GAE path finder (SearchEngine and friends)
* some small changes to Unit, UnitType, Vec2<> & Map needed for the new path finder
 * compiles, but not hooked up yet, old PathFinder still in use
2010-07-11 18:31:02 +00:00
Mark Vejvoda
61b77fe645 - added the ability to toggle hardware acceleration and full screen anti-aliasing via ini settings
- added video card info screen to options menu
2010-07-11 07:38:08 +00:00
Mark Vejvoda
c04b83259e - attempt to improve rendering speed 2010-07-06 10:11:56 +00:00
Mark Vejvoda
646e8593f4 - made some small performance updates for rendering and updated beta version number 2010-06-25 05:41:50 +00:00
Mark Vejvoda
a81286cbba - added support for showing projectile particles in the g3d viewer 2010-06-24 10:52:58 +00:00
Mark Vejvoda
1d4f47718c - added many new things and fixed a number of bugs (too tried to mention them all) 2010-06-24 01:23:18 +00:00
Mark Vejvoda
87b4706940 - Attempt to use libcurl in a thread safe manner 2010-06-23 14:49:20 +00:00
PolitikerNEU
c703de994f Tried to fix the wrong error message given if the file could not be found 2010-06-01 18:40:14 +00:00
Mark Vejvoda
908b155d62 some changes to how we use streflop:
- Removed all unneeded includes of cmath
- added proper wrapper classes for lua calls to toggle streflop back and forth
- some code cleanup
2010-05-28 05:31:17 +00:00
Mark Vejvoda
43c00d5740 - removed interpolation thread as it did nothing to help performance.
- added a cache in the interpolation class
2010-05-12 21:49:12 +00:00
Mark Vejvoda
a68ae2fdfb fixed teamcolor bug from last code checkins dealing with threaded interpolation 2010-05-10 19:35:56 +00:00
Mark Vejvoda
cde5a52fd3 - experiemental code to process interpolation calcs in a background thread
Requires a new setting to be turned on in glest.ini:
ThreadedInterpolation=true
2010-05-10 17:50:57 +00:00
Mark Vejvoda
c3793d0cfb Added initial code changes to support Chinese Fonts 2010-05-03 06:16:32 +00:00
Mark Vejvoda
04bb6659ce Added more debugging and option to disable new streflop usage. 2010-05-01 20:14:25 +00:00
Mark Vejvoda
c53ff62c46 Moved most of the code from platform specific platform_util into a shared platform_common area 2010-04-30 18:16:54 +00:00
Mark Vejvoda
6d4838f470 Changed the logging system to be more flexible and to support world synch logging 2010-04-27 03:36:36 +00:00
Mark Vejvoda
f748874601 Ported streflop code to win32 2010-04-24 11:15:15 +00:00