Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,728 Commits 1 Branch 0 Tags 27 MiB
6a6b58fa20
Commit Graph

2405 Commits

Author SHA1 Message Date
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
f626ebbe45 - attempt to fix lua code to properly get unit's killer: 
lastDeadUnitKillerName
lastDeadUnitKiller
 2011-11-18 15:43:05 +00:00
Mark Vejvoda
93f0813033 - fixed headless server (dont call glew) 2011-11-18 15:07:28 +00:00
Mark Vejvoda
0787c09d9b fixed g3d viewer (to use glew) 2011-11-18 08:50:52 +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
d29293d3cf - added new lua method lastDeadUnitCauseOfDeath, possible int values are: 
None = 0
	Attacked = 1
	AttackBoost = 2
	StarvedResource = 3
	StarvedRegeneration = 4
 2011-11-16 21:43:19 +00:00
Mark Vejvoda
2d367bd26e - added new lua functions from Muwum: 
new events:
    unitAttacked
   unitAttacking
 
   methods:
   lastAttackedUnitName()
   lastAttackedUnit()
   lastAttackingUnitName()
   lastAttackingUnit()
   giveKills(unit,amount)
 2011-11-16 21:38:12 +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
Mark Vejvoda
3e3bcb6af8 - on console error show proper error message 2011-11-16 04:39:26 +00:00
Mark Vejvoda
204d2bea86 - added some extra error output on poll looping 2011-11-16 04:03:17 +00:00
Titus Tscharntke
29d535894e We try it with the bold font. 2011-11-15 23:57:46 +00:00
Mark Vejvoda
85ed894cdb - moved player game version text over and made its font smaller to be able to see more when long 
- bugfix of segfault when in mod menu
 2011-11-15 22:28:51 +00:00
Mark Vejvoda
9c59bc7273 - change game load defaults for less stress on CPU 2011-11-15 22:10:32 +00:00
Mark Vejvoda
043cd5789c - default to english is a selected language is missing 2011-11-15 18:38:13 +00:00
Mark Vejvoda
ccb86ef373 fixed windows build 2011-11-15 18:09:57 +00:00
Mark Vejvoda
b2adc16ca6 - added Muwums lua function 2011-11-15 17:39:49 +00:00
Mark Vejvoda
33e1af022a lowered numbers for sleeping when game is loading in network mode and allow ini override of values 2011-11-15 16:41:10 +00:00
Mark Vejvoda
e8279621b1 - fixed build on windows 2011-11-15 06:37:47 +00:00
Mark Vejvoda
41ae17757b - just for you james! Fixed about screen text alignment 
- re-enabled unit titles in special debug mode (requires special keys to toggle)
 2011-11-15 04:48:57 +00:00
Mark Vejvoda
7c7c050d78 bugfix for intro 'still shots' were broken for beta1 2011-11-14 09:09:31 +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
Mark Vejvoda
8e9aef2d09 - attempt to fix issue where user can switch to an invalid slot in network game lobby 2011-11-14 05:44:43 +00:00
Mark Vejvoda
8050e25538 - attempt to fix masterserver losing publish setting and/or open network slot 
- attempt to fix high cpu usage on masterserver (and clients) when waiting for others during the start of a network game
 2011-11-14 05:18:09 +00:00
Mark Vejvoda
252080b3b0 modified sound fade on app exit as per tom's forum post 2011-11-11 18:15:46 +00:00
Mark Vejvoda
0039354c15 - added name to attack-boosts and shared attack boosts per unit type 2011-11-11 04:17:55 +00:00
Mark Vejvoda
0b62b4137e - added a validation / warnhing logic to handle cases of duplicate resource values entered in XML 2011-11-10 22:36:44 +00:00
Mark Vejvoda
1e34bc66c1 added a detailed error message to try to hunt down a bug discovered by Elimnator 2011-11-10 21:00:50 +00:00
Mark Vejvoda
9f316bef08 added an override for map preview rendering to use legacy non FBO code: 
LegacyMapPreviewRendering=true
 2011-11-08 16:41:10 +00:00
Mark Vejvoda
c8649f8cd1 added ability to override throttle settings for future customization if required: 
RenderFPSCap=500
RenderFPSCapSleepMillis=1
RenderFPSCapHeadless=250
RenderFPSCapHeadlessSleepMillis=1
 2011-11-08 16:27:15 +00:00
Mark Vejvoda
08de3e8f18 added code to throttle cpu usage in headless mode because there is no rendering (should cut down on un-needed cpu cycles) 2011-11-08 16:16:57 +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
0b511efe36 bugfix for particles, proper checking for valid particle states when using particles 2011-11-05 05:45:02 +00:00
Mark Vejvoda
1c4480cb02 added a check for missing map when admin is connected to headless server and server has a map that the client doesn't 2011-11-05 01:27:34 +00:00
Mark Vejvoda
143e5873da bugfix when client connects to headless server and headless has a tileset or techtree the admin doesn't have 2011-11-05 01:17:11 +00:00
Mark Vejvoda
6650efdd14 updated version to beta1 in prep for beta release 2011-11-04 05:25:55 +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
Titus Tscharntke
cbdde66999 we dont need to be too picky with translations which are mainly meant for logfiles 2011-11-04 01:12:05 +00:00
Titus Tscharntke
f0fb35b64d menu layout ... 2011-11-04 00:36:07 +00:00
Mark Vejvoda
22c8881902 - update fonts for console when language is toggled 2011-11-03 23:38:43 +00:00
Titus Tscharntke
772cdd9ad0 new newgame menu order. Improved german intro 2011-11-03 21:24:22 +00:00
Mark Vejvoda
96e0602ead small code cleanup 2011-11-03 20:36:56 +00:00
Mark Vejvoda
c1fb997a8b fixed bug (found my MumuM) related to ep regen and attackboost 2011-11-03 20:11:24 +00:00
Mark Vejvoda
4930ec109d added a new lua method from Muwuum 2011-11-03 18:24:02 +00:00
Mark Vejvoda
5b0c3accfc changed lua method to camelcase 2011-11-03 17:04:49 +00:00
Mark Vejvoda
6f6544e837 - fixed text width calculation 
- updated JApanese translation (thanks Hagekura)
 2011-11-03 14:29:35 +00:00
Mark Vejvoda
0b18d22700 fix for wrong path used to load overridden intro data 2011-11-03 14:23:21 +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
45d9261163 fixed autoconfig and default keys (thanksfor the patches david) 2011-11-02 19:11:58 +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
Titus Tscharntke
5caf2ee82f new default multiplier .... AI is playing too good now 2011-11-02 00:34:59 +00:00
Titus Tscharntke
c82ad4689b earlier food warning / fixed norsemen medbar texture ( had visible white borders before ) 2011-11-02 00:30:10 +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
bb25e0ec79 fix for macosx 2011-11-01 21:47:34 +00:00
Titus Tscharntke
81c5d12324 mouse over highlighting for create game button and bugfix 2011-11-01 21:30:05 +00:00
Mark Vejvoda
193354865c another attempt to fix things on macosx 2011-11-01 21:17:24 +00:00
Mark Vejvoda
e15d9cab5d attempt to see if eariler init helps on macosx 2011-11-01 20:07:18 +00:00
Mark Vejvoda
279ef96fd1 another attempt to supplant macosx's weakness 2011-11-01 17:38:51 +00:00
Mark Vejvoda
a2110f21c7 see if this helps fix macosx issue 2011-11-01 16:40:29 +00:00
Titus Tscharntke
9bc8ecb2c8 Host_Game instead of Custom_Game in Lan_Game/Internet_Game 2011-10-30 22:23:57 +00:00
Mark Vejvoda
0f6e8ba928 attempt to bugfix attackboost segfault discovered while playing vs Romans 2011-10-30 06:12:40 +00:00
Mark Vejvoda
ca45749cd8 see if this fixes command transitions issues outstanding 2011-10-28 22:49:00 +00:00
Mark Vejvoda
b5d4867316 added one too many invalid position messages to console 2011-10-28 22:28:24 +00:00
Mark Vejvoda
9ffad02f8f - bugfix for detecting if one unit is next to another 
- now repair command does NOT require a move skill. If a move skill is not defined then the repairer must be beside the unit he will repair or they get an invalid position console message
 2011-10-28 05:22:41 +00:00
Mark Vejvoda
64eeba93cb bugfix for command transition not properly resetting status 2011-10-28 04:37:10 +00:00
Mark Vejvoda
4223567f2b attempt to fix weird command transition behavior 2011-10-28 04:17:26 +00:00
Mark Vejvoda
1293771964 removed limit of network commands count (2496) and just use dynamically sized vectors (this may make game play more stable when there are lots of commands issued) 2011-10-28 01:58:15 +00:00
Mark Vejvoda
421e38cab4 cleaned up the code a bit for the command transition 2011-10-28 01:22:36 +00:00
Mark Vejvoda
b08516e7de fixed command transition choppiness 2011-10-28 01:11:42 +00:00
Mark Vejvoda
fdb2b65bf7 make transition to new command less choppy 2011-10-28 00:51:01 +00:00
Mark Vejvoda
f2e497f855 bugfix for switching to another command should be immediate and not wait until the current skill in finished 2011-10-28 00:22:03 +00:00
Mark Vejvoda
1c96073db4 fixed the headless horseman segfault 2011-10-27 19:02:15 +00:00
Mark Vejvoda
f7a4730fff when client is waiting only for the server at game start we now display this 2011-10-26 20:30:41 +00:00
Mark Vejvoda
33549e2b0b no longer show resource info in debug stats in game 2011-10-26 05:10:36 +00:00
Mark Vejvoda
c045f06f44 allow pause hotkey for network games 2011-10-26 04:13:14 +00:00
Mark Vejvoda
d088028685 bugfix player control listbox to properly be enabled / disabled 2011-10-26 02:36:00 +00:00
Mark Vejvoda
c6fe352da7 disabled 'grouped' commands to see if this is the cause of out of synch (try this out guys) 2011-10-26 00:30:58 +00:00
Mark Vejvoda
0b6dbdf411 ensure language toggle only happens outside of a render event 2011-10-25 22:40:28 +00:00
Mark Vejvoda
9848a6c529 - bugfix for windows compiling 2011-10-25 20:34:13 +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
Titus Tscharntke
aebe2aba24 reverted new game menu structure, as it is inconsistent 2011-10-23 10:55:54 +00:00
Titus Tscharntke
21760072a4 fixed name editing and cleanup 2011-10-23 10:49:36 +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
6863876359 bugfixes from transition to battle end and back to menu 2011-10-22 19:45:05 +00:00
Titus Tscharntke
0e44925191 singleplayer / multiplayer section 2011-10-22 17:20:37 +00:00
Mark Vejvoda
927a0db45e try new intro song (edited so timing is better). Also added debug timer on intro screen, add the following to ini: ShowIntroTiming=true 2011-10-22 08:40:31 +00:00
Mark Vejvoda
9135b6155d fix legacyfont on intro and changed linux default legacy font to arial since helvetica is not working on ubuntu 2011-10-22 03:13:23 +00:00
mnaumann
284f4d0277 * clear comments and missing translation keys off existing translation files 
* make merge_new_language_vars.pl report, in comments it adds to language files, only its filename, not path
 2011-10-22 03:06:31 +00:00
Mark Vejvoda
e64bd1bf6e updated intro to add extra text and proper centering of text 2011-10-22 03:01:22 +00:00
Mark Vejvoda
d46354ed67 - fixed bug where we could not pick human player clicking right arrow 2011-10-22 01:02:29 +00:00
Mark Vejvoda
bd2206f51b bugfixes for headless mode (when admin picks things that server doesn't have).. added a 2 second delay timer for sending out changes 2011-10-22 00:19:38 +00:00
Mark Vejvoda
5ee20018d8 d new way to manage the sound fade for game start/stop via optional ini: GameStartStopFadeSoundMilliseconds=3500 2011-10-21 22:42:59 +00:00
Mark Vejvoda
5ac681ca73 changed app exit sound fade to 1.75 seconds and allow it to be set via new optiona lini setting: ShutdownFadeSoundMilliseconds 2011-10-21 22:36:36 +00:00
Mark Vejvoda
b10c489418 just for you tomreyn (fade sound on application exit) 2011-10-21 22:07:34 +00:00
Mark Vejvoda
c305af8063 bugfixes when going from one scenario to another (sound fades ok now) 2011-10-21 20:57:42 +00:00
Mark Vejvoda
0a2a6794f3 cannot fade when transitioning scenarios until we change how sound files are used. 2011-10-21 20:06:18 +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
c6d4e898a0 small bugfix for handling morph commands in the UI (was not properly handling commandclass). Added validation to tell modders that we have a max if 6 morphs that can display in the UI 2011-10-21 16:04:21 +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
Titus Tscharntke
5e8e8ffc6c my fix ( I like it somehow .. :-D ) 2011-10-21 00:23:05 +00:00
Mark Vejvoda
35a5f44db0 bugfix for game name when not in headless mode 2011-10-20 23:44:01 +00:00
Titus Tscharntke
a58451333e headless servers have special game names 2011-10-20 23:27:39 +00:00
Titus Tscharntke
900f08e02f Configurable multiplayer game name 2011-10-20 22:30:09 +00:00
mnaumann
8a87d26863 Rearrange text block on grapic info menu (davidou) 2011-10-19 00:16:10 +00:00
Titus Tscharntke
c151f538b1 3 cycle resource warning instead of percentage warning / sailboat texture fixed in menu 2011-10-18 22:00:59 +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
c40ca18966 - added commented out code for loading md5 models (and obj format models) on intro page 2011-10-18 07:10:19 +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
b30fdea0d0 only output error filename once 2011-10-18 02:11:55 +00:00
Mark Vejvoda
62f1ad0464 output to console before trying to write to error.log 2011-10-18 02:02:37 +00:00
Mark Vejvoda
dc4b367f69 - changed contact email address to bug report URL 2011-10-18 01:40:49 +00:00
Mark Vejvoda
d98e35f245 bugfix when shutting down after visiting internet menu 2011-10-18 01:29:08 +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
d86ac7d4a7 bugfix for xerces include path 2011-10-15 18:00:47 +00:00