Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,933 Commits 1 Branch 0 Tags 27 MiB
7f0aaebf50
Commit Graph

1023 Commits

Author SHA1 Message Date
Mark Vejvoda
d8f4c69a01 - ensure locale is properly set when converting numbers 2011-12-01 18:49:30 +00:00
Mark Vejvoda
99f8c23422 - added more deps to build static 2011-11-30 05:10:04 +00:00
Mark Vejvoda
156cc39311 fix for Mac osX 2011-11-29 10:16:29 +00:00
Mark Vejvoda
7cf9c189b2 - disallow non compressed tileset downloads when client IP not on same subnet as host 
- bugfix for LAN server broadcasting
- bugfix for empty message on player disconnect (now properly shows that player switched to AI mode)
 2011-11-29 05:07:18 +00:00
Mark Vejvoda
30972bcddb corrected font alingment when using combination of newline and tabs 2011-11-28 15:59:38 +00:00
Mark Vejvoda
1658306b59 - fixed debug output font position --> just for you james! 2011-11-28 05:54:31 +00:00
Mark Vejvoda
03a7a72ef5 revert network code back to beta1 code 2011-11-27 05:27:50 +00:00
Mark Vejvoda
5fd3457d70 - fixed socket changes for windows compiler 2011-11-27 00:11:18 +00:00
Mark Vejvoda
da854f103b - added some special ways to configure how sockets work on a system for testing 2011-11-27 00:07:55 +00:00
Mark Vejvoda
6c1c248d62 - attempt to fix network stuttering using a new multi-read single write mutex + semaphore class 2011-11-26 08:14:23 +00:00
Mark Vejvoda
ef125238e8 - continue trying to fix network issues 2011-11-25 22:38:25 +00:00
Mark Vejvoda
82c9002d0a - attempt to further stabilize cpu usage and network reliability 2011-11-25 20:03:07 +00:00
Mark Vejvoda
2a8c712b1a - more socket performance changes 
- auto complete now works also in IRC chat, and tabbing loops through all matched names.
 2011-11-25 09:12:53 +00:00
Mark Vejvoda
e2135f76eb - attempt to fix network game play 'stuttering' 2011-11-25 05:37:55 +00:00
Mark Vejvoda
c6b7d3991e - attempt to fix network game play 'stuttering' 
- bugfix for ip address gathering
- added tab autocomplete in chat windows for playernames
 2011-11-24 23:15:21 +00:00
Mark Vejvoda
1935f9314b added new commandline to specify internal/external port #'s to use when hosting: 
--use-ports=61390,61390
 2011-11-23 21:36:49 +00:00
Mark Vejvoda
aefdfd98f8 - added new commandline option to support whole standalone mods: --load-mod=x 2011-11-23 18:02:00 +00:00
Mark Vejvoda
5aa34ebd08 - bugfix for sockets on windows 2011-11-23 08:11:30 +00:00
Mark Vejvoda
3cdf50c399 - a load of bugfixes including: 
- proper handling of invalid client connects, after 6 bad attempts in a 60 second period of time the IP address is blocked from the current game
  - Added check for invalid particles for tileset objects
  - Made messagebox wider in game mod menu
  - Fixed numerous threading issues discovered while testing on my 8 core CPU
  - a Little bit of rendering cleanup
 2011-11-23 08:00:09 +00:00
Mark Vejvoda
cc1480fbe1 -re-enabled ftgl as default font renderer, as i have no more patience to get the other renderer working before a release. 2011-11-20 06:09:18 +00:00
Mark Vejvoda
a995fb9220 trying to fix mac build 2011-11-20 01:14:22 +00:00
Mark Vejvoda
b3879ce35a mac osx build 2011-11-19 20:11:41 +00:00
Mark Vejvoda
488f8792b2 fix mac build 2011-11-19 20:08:04 +00:00
Mark Vejvoda
ce72e71599 - another fix for mac build 2011-11-19 20:03:24 +00:00
Mark Vejvoda
b444318bf4 trying to fix mac build 2011-11-19 19:28:04 +00:00
Mark Vejvoda
41135b238b trying to fix mac build 2011-11-19 19:07:21 +00:00
Mark Vejvoda
e849f7ec0b does this fix the mac build? 2011-11-19 19:02:58 +00:00
Mark Vejvoda
dfc6caf41f does this fix the mac build? weltall? 2011-11-19 18:29:44 +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
cef0577e3e - added commented out debug code for future ref 2011-11-19 09:49:52 +00:00
Mark Vejvoda
127382441f - fixed build on windows 2011-11-19 08:09:33 +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
ce68ca0a7d - fixed freetype check for FT_Library_SetLcdFilterWeights (requires v 2.4.0 minimum) 2011-11-19 05:34:04 +00:00
Mark Vejvoda
5bb270fe41 - all languages now define their sio639-1 code and the commandline option can take it now: 
--use-language=en
 2011-11-19 03:33:01 +00:00
Mark Vejvoda
cd6b961a3b small tweak to font height calc 2011-11-19 02:31:47 +00:00
Mark Vejvoda
3ef4692b23 bugfixes for proper horizontal rendering of multibyte fonts 2011-11-18 20:54:41 +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
48da13808f - fixed newline font calc for non english languages 2011-11-18 16:18:36 +00:00
Mark Vejvoda
93f0813033 - fixed headless server (dont call glew) 2011-11-18 15:07:28 +00:00
Mark Vejvoda
316739c5bd - fixed Linux build 2011-11-18 08:42:50 +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
c751c1a2cf - a few minor bugfixes 2011-11-17 21:36:29 +00:00
Mark Vejvoda
0f195ca9e4 - render bugfix for new font renderer 2011-11-17 10:11:23 +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
54e4d7604c - added new option to headless modedisable reading from local console: 
--headless-server-mode=vps

can be comgined with exit option:

--headless-server-mode=exit,vps
 2011-11-16 05:20:35 +00:00
Titus Tscharntke
29d535894e We try it with the bold font. 2011-11-15 23:57:46 +00:00
Mark Vejvoda
5b821725e7 - cmake now compiles libpng statically if a static lib exists and static mode enabled 2011-11-14 08:54:42 +00:00
Mark Vejvoda
8f2e7ef5af - updated to compile compatible with libpng1.5 2011-11-14 07:16:51 +00:00
Titus Tscharntke
c346569de1 reverted accidently checked in file 2011-11-06 01:08:59 +00:00
Titus Tscharntke
d19a5930a6 release related things 2011-11-06 00:58:21 +00:00
Mark Vejvoda
db91ca6b9e allow attack boost to apply to self via attribute include-self="true" 2011-11-04 04:51:12 +00:00
Mark Vejvoda
6f6544e837 - fixed text width calculation 
- updated JApanese translation (thanks Hagekura)
 2011-11-03 14:29:35 +00:00
Mark Vejvoda
598ebb81c5 attempt to see if this fixes an SDL bug in windows described here: http://lists.libsdl.org/pipermail/sdl-libsdl.org/2005-February/048841.html) 2011-11-02 23:36:12 +00:00
Mark Vejvoda
2c5131e6bc added debug info for keyboard presses to track down issue in windows 2011-11-02 21:43:33 +00:00
Mark Vejvoda
cdb38730d9 trying to fix alt-tab issue in windows 2011-11-02 21:20:11 +00:00
Mark Vejvoda
70c5edea8d trying to fix alt-tab issue in windows 2011-11-02 20:25:55 +00:00
Mark Vejvoda
c0f62ff6f8 trying to fix alt-tab issue in windows 2011-11-02 20:12:55 +00:00
Mark Vejvoda
5c9f3484ec bugfix for compile on windows 2011-11-02 20:05:15 +00:00
Mark Vejvoda
bc7eda930d trying to fix alt-tab issue in windows 2011-11-02 19:58:39 +00:00
Mark Vejvoda
5dcd9d8714 fixed UI placement of playername in menus 2011-11-02 19:02:25 +00:00
Mark Vejvoda
30e1f45cc7 - intro is now fully translatable and configurable (see english.lng file at the bottom for intro strings) 
- added game loading text strings to language file
- ONLY load the font type we are using
 2011-11-02 17:17:28 +00:00
Mark Vejvoda
bcc97704b6 got ftgl raster fonts working when ini setting is: 
Enable3DFontRendering=false and NOT running legacy font mode
 2011-11-02 00:17:57 +00:00
Mark Vejvoda
3dfd316484 fixed legacyfont 2011-11-01 23:51:28 +00:00
Mark Vejvoda
e15d9cab5d attempt to see if eariler init helps on macosx 2011-11-01 20:07:18 +00:00
Mark Vejvoda
a2110f21c7 see if this helps fix macosx issue 2011-11-01 16:40:29 +00:00
Mark Vejvoda
1bb2693d65 - bugfix for windows compiling 2011-10-25 20:16: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
2cecb2c3a0 fixed horrible UPNP bugs related to timing, where ports would be either NOT properly opened or not closed due to thread timing and no thread protection. 2011-10-23 00:55:34 +00:00
Mark Vejvoda
14736ddfb7 now fade out of music when starting game and fade out of music when ending game 2011-10-21 19:52:55 +00:00
Mark Vejvoda
af2e2a8930 - added new debug compile option for UPNP: 
cmake -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DBUILD_MEGAGLEST_UPNP_DEBUG=On ..

This will output tons of stuff to console to help debug issues in miniupnpc
 2011-10-21 03:24:04 +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
9d1617e045 display thread counts on app shutdown / ftp server startup and shutdown only in verbose mode 2011-10-18 14:01:55 +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
5b7329594c - merging in changes from weltall for macosx 2011-10-18 01:13:38 +00:00
Mark Vejvoda
26afb589a3 - code cleanup (removing / commenting uneeded items) 2011-10-17 20:56:11 +00:00
Mark Vejvoda
dac61b9f5d added some new cmake directives to optional turn off subprojects from the build process. The new cmake options include: 
BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS
BUILD_MEGAGLEST_MODEL_VIEWER
BUILD_MEGAGLEST_MAP_EDITOR
BUILD_MEGAGLEST_CONFIGURATOR
BUILD_MEGAGLEST

By default these are all enabled (On). Turn turn off a module run cmake with the option turned off:
-DBUILD_MEGAGLEST_CONFIGURATOR=OFF
 2011-10-17 16:59:22 +00:00
Mark Vejvoda
9d1b6d592c removed test fil;es that are not required 2011-10-16 02:00:05 +00:00
Mark Vejvoda
3b8d07fc8d - don't allow game to start and show a message if network player connected and on an unassigned slot 2011-10-15 01:03:24 +00:00
Mark Vejvoda
5f0f6e322e -bugfix for bad static initialization 2011-10-14 21:09:08 +00:00
Mark Vejvoda
166d3b00ed - bugfix for mac osx 2011-10-13 20:33:19 +00:00
Mark Vejvoda
828069087b - removed un-necessary sendfile header 
- fixed compile when streflop disabled
 2011-10-13 20:05:39 +00:00
Mark Vejvoda
3d20c207d5 - bugfixes for supporting compile of miniupnpc1.4 -> 1.6. Added two new optional commandline options for cmake: 
-DMINIUPNPC_VERSION_PRE1_6=true
-DMINIUPNPC_VERSION_PRE1_5=true
 2011-10-12 22:04:00 +00:00
Mark Vejvoda
642581237d - fix windows build for updated libupnpc 1.6 2011-10-12 20:49:49 +00:00
Mark Vejvoda
f0fc8dc561 - updated embedded miniupnpc to latest version 1.6 2011-10-12 19:21:13 +00:00
Mark Vejvoda
e090df259d - bugfix for font height calc 
- updated intro
 2011-10-07 19:53:07 +00:00
Mark Vejvoda
2d42f59fe1 - added a new lua function to allow loading a new scenario from inside an existing scenario 
loadScenario('capture_the_flag2')
 2011-10-06 18:04:59 +00:00
Mark Vejvoda
7ce7230b2c - compile fix on windows 2011-10-05 14:09:03 +00:00
Mark Vejvoda
d37d360e21 - no more crash when ftgl raises font gl errors, just output to console and continue rendering 2011-10-05 05:59:44 +00:00
Titus Tscharntke
555e88f464 I accidently checked in a test value. ( reverted now ) 2011-10-05 00:23:01 +00:00
Titus Tscharntke
a011cb3b26 Font LinBiolinum_Re-0.6.4.ttf is default now and some default values are set according to this font. 2011-10-04 23:49:34 +00:00
Mark Vejvoda
9cb44c72bf - enabled sdl's key repetition when holding keys for easier typing in chat mode 2011-10-03 18:06:50 +00:00
Mark Vejvoda
ebc130f526 - added a few new chinese fonts and changed default to a new font 
- fixed location of player title in menus
- added better ftgl error checking
 2011-10-03 04:49:52 +00:00
Mark Vejvoda
7eb68c4023 - added new commandline option to override base font size 2011-10-03 02:45:43 +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
43ed4553ea - more memory cleanup and thread cleanup (found using valgrind) 2011-09-28 15:32:57 +00:00
Mark Vejvoda
a3bf4bfe32 - modified the following commands so they don't required SDL video mode: 
--help
--version
--show-ini-settings
 2011-09-28 07:04:42 +00:00
Mark Vejvoda
aed293bba2 - fixed a bunch of memory leaks that will hopefully mean less overall memory requirements. 2011-09-28 06:57:42 +00:00
Mark Vejvoda
59246056bc - bugfix for compilation in vc++ 2011-09-28 04:41:02 +00:00
Mark Vejvoda
fe8e76efd8 - applied some memory leak cleanups 2011-09-27 20:35:45 +00:00
Mark Vejvoda
0cf03a3562 - added option to quit headless server after game has completed: 
./megaglest --headless-server-mode=exit
 2011-09-27 18:44:01 +00:00
Mark Vejvoda
21005cc1e7 - in headless mode skip call to set window icon 2011-09-27 17:15:56 +00:00
Mark Vejvoda
ec554ffffb - do not init SDL's video subsystem in headless mode 2011-09-27 10:25:31 +00:00
Mark Vejvoda
2a86cb4f7d - added support for proper quiting and console input/output in headless mode. Type: quit followed by return into the console to properly shutdown in headless mode. 2011-09-27 10:16:09 +00:00
Mark Vejvoda
9caff9dac3 - in headless mode avoid init of sdl's video surface so that we stay in console window (no graphics window shown) 2011-09-27 07:01:08 +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
64d1e696b0 - compiler fixes for windows 2011-09-25 23:27:26 +00:00
Mark Vejvoda
7e16873efd - bugfix for team switching validation should be skipped 
- commented printf for tween debugging
 2011-09-22 05:14:20 +00:00
Mark Vejvoda
b4972f6365 - attempt to get international unicode characters working in ingame chat 2011-09-16 17:35:07 +00:00
Mark Vejvoda
cd321c0c77 - fix the tween bug by truncating after 6 decimals 2011-09-10 03:57:51 +00:00
Mark Vejvoda
ba35e3cc9f - fixed win32 compile errors 2011-09-02 04:22:04 +00:00
Mark Vejvoda
4a5a7f010d - final phase of cppcheck verbose fixes (outstanding items should be left alone) 2011-09-01 18:51:43 +00:00
Mark Vejvoda
57afc2d715 - phase 2 of cppcheck verbose fixes 2011-09-01 01:11:23 +00:00
Mark Vejvoda
3af608151e - bugfixes found from cppcheck 2011-08-31 19:44:19 +00:00
Mark Vejvoda
f542ce36e4 - commented assert and added more debug info when tween is invalid 2011-08-31 16:12:02 +00:00
Mark Vejvoda
b2fc331876 - added more debug info for font error mentioend in forums by james123 2011-08-31 00:06:50 +00:00
Mark Vejvoda
1a6cdf3a06 - bugfix for IRC nicks using non standard ascii chars (we replace invalid chars on IRC with - 2011-08-30 23:45:51 +00:00
Mark Vejvoda
a9f5563ab7 uncles IRC wish come true (display all IRC names but non MG names are not selectable in the UI) 2011-08-30 18:54:01 +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
Titus Tscharntke
3efe9e0263 changed default font to "LiberationSans-Regular.ttf"; new maps; fixed xmls(missing models); crossbow has rotated climb 2011-07-20 22:44:57 +00:00
Mark Vejvoda
ee2c7bbe98 - try to see if this helps with the tween bug 2011-07-19 01:25:38 +00:00
Mark Vejvoda
45db0a3290 - try to see if this helps with the tween bug 2011-07-19 00:47:25 +00:00
Mark Vejvoda
ae6b085d7a - try to see if this helps with the tween bug 2011-07-19 00:17:32 +00:00
Mark Vejvoda
732b44833b - add debug statement to track tween bug 2011-07-18 23:46:11 +00:00
Titus Tscharntke
b215f88a29 Now the anim is expanded to the whole length for non cycled anims. To demonstrate we have growing reed ... 2011-07-17 17:16:16 +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
73b400cea7 - removed deprecated curl header (still need to create a branch to apply the fix to 3.5.2.4) 2011-07-08 22:33:36 +00:00
Mark Vejvoda
0d248958c3 - added willvarfars vbo surface code when VBO is enabled in the video card, otherwise fallback to original code 2011-07-08 16:45:55 +00:00
Mark Vejvoda
3584a831cf - threadsafe cache manager and recursive checking in xml loader (possible fix for issue experienced by james in windows build) 2011-07-08 15:17:50 +00:00
Mark Vejvoda
d0d3af1fec - more keyboard fixes to allow more valid keys 2011-07-06 22:40:31 +00:00
Mark Vejvoda
1b2d4fddea - merged in willvarfar's particle patch 2011-07-06 22:23:51 +00:00
Mark Vejvoda
eb67fb8121 - added more debug info to check Cold's issue 2011-07-06 19:26:17 +00:00
Mark Vejvoda
ead3797368 - added better keybaord filtering to allow use of keypad numbers in grouped units 2011-07-06 12:23:43 +00:00
Mark Vejvoda
86724e1d2e - fixed some bugs with keyboard parser not properly figurong out ? and other keys in combination with shift etc 2011-07-06 11:56:30 +00:00
Mark Vejvoda
15488ddb31 - bugfixes related to attack-boost memory leaks 2011-07-06 05:16:25 +00:00
Mark Vejvoda
84870877ba - hopefully a fix for skankerror 2011-07-05 22:08:44 +00:00
Mark Vejvoda
ce8d54e7e0 - additional debug info to track skanks error :) 2011-07-05 21:05:13 +00:00
Mark Vejvoda
a5804f8219 - a little more debugging to gather info from sknakerrors issue 2011-07-05 20:08:51 +00:00
Mark Vejvoda
8c99c7e91f - fixed debug key 2011-07-05 05:40:14 +00:00
Mark Vejvoda
ece9755dfd - font ycenter fix on windows 2011-07-04 21:22:53 +00:00
Mark Vejvoda
852b4aa2d2 - bugfix for some hotkeys not working properly 2011-07-04 18:05:02 +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
8e1836220d - added more info if we get mutex errors in the lobby 2011-07-02 07:36:28 +00:00
Mark Vejvoda
1a5c70c76e - another small bugfix for water texture loading 2011-07-02 07:15:23 +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