Commit Graph

453 Commits

Author SHA1 Message Date
Mark Vejvoda
4f7559783c support backspace for multi-byte characters in chat mode 2011-10-15 09:27:55 +00:00
Mark Vejvoda
b88d51c3c6 - bugfix to not say teammode when not in game 2011-10-12 03:07:00 +00:00
Mark Vejvoda
c1eedabf84 - added current mouse xy in cell coords to debug stats 2011-10-07 03:48:07 +00:00
Mark Vejvoda
762699ef88 - bugfixes for passing from one scenario into another when keeping faction state 2011-10-07 03:25:17 +00:00
Mark Vejvoda
a7cfcc1d99 - added special placement code when carrying over units from one scenario to another 2011-10-06 22:19:58 +00:00
Mark Vejvoda
b126768d9c - updated scenario lua function to allow carry over of factions or not 2011-10-06 20:44:55 +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
e036d820d2 - bugfix, observer cannot join teams, and players cannot join an observers team 2011-10-05 16:02:26 +00:00
Mark Vejvoda
517222a91a - bugfix for special commands (switch team and pause network game) when initiating players is observer 2011-10-05 15:56:08 +00:00
Mark Vejvoda
5a7a37a678 - bugfix 3dlists when showing keyboard menu in game (water was showing wrong) 2011-10-05 03:42:29 +00:00
Mark Vejvoda
22e28c323f - cleanup popup menu sizing so it looks more clean 2011-10-04 00:50:43 +00:00
Mark Vejvoda
bc5c32deb1 - initial attempt to add 'pause game' for network games. The following apply:
- only the server (or headless admin) can pause/resume a network game.
- to pause/resume press ESC in game and select the pause/resume button to toggle the state.
- chatting works while the game is paused. If clients want the game paused they should ask this in the chat window
2011-10-03 20:48:09 +00:00
Mark Vejvoda
d719e8e318 - in game popup menu now also allows viewing/changing keyboard setup
- now display (team) when chat text is intended only for team members
2011-10-03 00:36:28 +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
26d0b71bd5 - turn off mouse and keyboard in headless mode 2011-09-26 04:26:44 +00:00
Mark Vejvoda
da57a589ba - more progress on masterserver, now the masterserver does not take a slot! 2011-09-24 21:07:15 +00:00
Mark Vejvoda
f0b795377b - when masterserver game is over go right back to custom game lobby 2011-09-24 20:22:47 +00:00
Mark Vejvoda
4df997d0ca - initial work for a headless server. Currently this code allows you to launch a server with the commandline option: --masterserver-mode
The first client that connects to the server is the administrator and is able to change most settings and launch the game. Still lots of work to do but this is a start.
2011-09-24 07:46:56 +00:00
Mark Vejvoda
4d31968966 - bugfix for team switching vote calculation 2011-09-23 19:31:47 +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
d52924f214 - added new strings to language file 2011-09-21 08:00:00 +00:00
Mark Vejvoda
7d53df698a - added new in-game popup menu and new ability to switch teams in game (turned off by default in advanced settings) 2011-09-21 06:51:28 +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
8f0db3e30d - added new commandline option --map-preview=x where x is the mapname (without extension) 2011-09-16 00:34:14 +00:00
Mark Vejvoda
aee6c948a2 - bugfix for scripted scenario function registerCellTriggerEventForUnitToLocation not working properly 2011-09-13 23:25:13 +00:00
Mark Vejvoda
470fac5136 - bugfix for scripted scenario function registerCellTriggerEventForFactionToLocation not working properly 2011-09-13 23:20:26 +00:00
Mark Vejvoda
e44170ea00 - bugfixes for lobby UI when map changes and player index is invalid 2011-09-02 00:08:35 +00:00
Mark Vejvoda
0a2c929fea - attempt #1 to support 'keeping' connected clients in the lobby when the map changes and slots would normally disconnect 2011-09-01 21:54:31 +00:00
Mark Vejvoda
d44959d69c - phase 1 of cppcheck verbose fixes 2011-08-31 23:10:43 +00:00
Mark Vejvoda
3af608151e - bugfixes found from cppcheck 2011-08-31 19:44:19 +00:00
Mark Vejvoda
a7e08e3b55 - can disable mouse movement which scrolls the world camera. in glestuser.ini add:
MouseMoveScrollsWorld=false
2011-08-31 00:24:14 +00:00
Mark Vejvoda
c4cbdd86e3 - disabled will's visible quad code as i cannot get it to work when rotating around with the camera. Bugfix for normal camera visible quad so we don't get black spots when moving camera around. Bugfix for menu keyboard entry if we get a bad utf8 conversion character 2011-08-30 18:28:30 +00:00
Mark Vejvoda
a2e6f81a0d - added initial code from willvar for visible quad calc (but disabled for now till we have time to fix issues) 2011-07-23 23:22:30 +00:00
Mark Vejvoda
a77606351f - attempt to change scenario timer to use world frames 2011-07-16 03:58:52 +00:00
Titus Tscharntke
9ef8c82441 extra team color markers ( by default use * to toggle/switch on ) 2011-07-06 22:02:38 +00:00
Mark Vejvoda
8c99c7e91f - fixed debug key 2011-07-05 05:40:14 +00:00
Mark Vejvoda
2c80543889 - attempt to group command execution so units given the same command at the same time will work more smartly (closer units go first and so on) 2011-07-05 04:37:35 +00:00
Mark Vejvoda
852b4aa2d2 - bugfix for some hotkeys not working properly 2011-07-04 18:05:02 +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
ec15c81d12 - added a FPS cap (at 800 fps we will sleep for 1 millisecond) to avoid pinning the cpu for hardware that has fps which is too good. Also user can toggle fps view on any screen now 2011-07-01 02:50:20 +00:00
Mark Vejvoda
f5b15bd402 - bugfix for filtering out non printable keys 2011-06-28 01:25:14 +00:00
Mark Vejvoda
aa677cfc97 - attempt to NOT convert to utf8 twice 2011-06-26 03:38:28 +00:00
Mark Vejvoda
4b6bc7a4a7 - loads of changes in order to prepare for better input (not using char but SDLKey instead) 2011-06-26 01:55:08 +00:00
Titus Tscharntke
d246a08a6d switch for rain/snow ; multipliers visible ; server can set his state too 2011-06-20 23:48:22 +00:00
Mark Vejvoda
7ad8510894 - don't render hud in 'photo' mode 2011-06-13 23:28:24 +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
Titus Tscharntke
ca75809f2d switch in options to show HUD or not ( if available ) 2011-06-09 22:54:45 +00:00
Titus Tscharntke
bc2c59a82a just put a hud.png in a faction dir and you got a HUD overlay 2011-06-09 00:59:03 +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
Titus Tscharntke
9ce83ed21b queued commands are displayed in a better way 2011-05-01 20:19:41 +00:00
Mark Vejvoda
3ed7d242d9 - added more detail on error message 2011-04-30 06:36:52 +00:00
Mark Vejvoda
0abca7fb7a - bugfixes for clicking outside of the map co-ordinates
- show up to 5 descriptions for queued items when producing
2011-04-27 22:35:45 +00:00
Mark Vejvoda
016771ed81 - adjust camera angle for more properly unit visibility calc
- more accurate unit titles when debugging
2011-04-18 16:51:30 +00:00
Mark Vejvoda
762a612e33 - better error message on error 2011-04-18 04:28:25 +00:00
Mark Vejvoda
88a81a6993 - removed useless items in debug view
- removed some noise from verbose output
2011-04-13 18:45:27 +00:00
Titus Tscharntke
4df5e0266c camera movement fixed 2011-04-11 23:26:50 +00:00
Mark Vejvoda
5a6418ac60 - removed some debug statements to see if it will improve debug logging performance 2011-04-11 00:11:52 +00:00
Titus Tscharntke
daf8f42f7e real camera movement! 2011-04-10 21:38:29 +00:00
Titus Tscharntke
36ebfcf95e end game stats with better PlayingTime, tomreyns endgame color problem (maybe) fixed ,updated german lang file 2011-04-09 23:25:18 +00:00
Mark Vejvoda
9b91bf5c68 - modified lua method addConsoleText to look in scenario language file for text
- added new commandline options to display CRC values for various items (like maps, tilesets etc)
2011-04-09 06:20:43 +00:00
Titus Tscharntke
6b63089612 pressed keys don't keep camera moving continously anymore ( has this side effects? ) 2011-04-08 22:49:10 +00:00
Mark Vejvoda
9cb1cd7bc8 - bugfixes related to multi-language text messaging 2011-04-05 20:19:25 +00:00
Mark Vejvoda
4a27e75891 - initial work to support multi-language text messages 2011-04-05 18:39:47 +00:00
Mark Vejvoda
4fb33d34ce - moved a few more strings into the language file 2011-04-05 14:59:48 +00:00
Mark Vejvoda
0fce64897e - added a few more things to end game stats as requested by ultifd
(now we can tell the difference between killed units and killed enemy units and final score is based on killed enemy units not all killed units)
2011-04-05 06:32:23 +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
085cb7d543 - added a cancel button when loading a game for the server user only
- updated client side loading screen to show who the server is waiting for
- moved some more strings into the english language file
2011-03-31 18:13:02 +00:00
Mark Vejvoda
438bedd4fa - now show scenario logo files when user selects a scenario with a loading screen 2011-03-30 22:14:51 +00:00
Mark Vejvoda
4344a958d6 - changed game unload so it doesn't try to render on exit 2011-03-30 21:15:20 +00:00
Mark Vejvoda
3ed636aae2 - fixes for some threading shutdown bugs
- We now display when a screenshot is taken in game showing an ingame console message
- Updated AI to attack closest attackers
- Updated found enemy to be closest attacker
2011-03-28 21:04:47 +00:00
Mark Vejvoda
3b56aa4475 - performance changes... (problem found by titi) most debug calls line are skipped when the debug flag is disabled even BEFORE getting into the handledebug method.
This improves performance VERY MUCH.
2011-03-28 03:54:23 +00:00
Titus Tscharntke
df2df4bcfc some rearrangement in options, player names in chat with colors again 2011-03-26 21:38:26 +00:00
Titus Tscharntke
5ccfc59819 Masterserver messages are highlighted in yellow now; console lines now can have individual colors (if not in game)! 2011-03-26 17:17:34 +00:00
Mark Vejvoda
9681e7f1bc - initial code for managing mod content (downloads and removal of user data) 2011-03-25 10:11:16 +00:00
Mark Vejvoda
6f523bb96a - small bit of code cleanup in unit_updater
- added alarmcount to debug view
2011-03-23 02:45:42 +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
18f2f531e3 - added map, tileset and techtree to debug view and also AI type 2011-03-20 23:41:46 +00:00
Mark Vejvoda
97017b2f1f - added a new lua method to add text on the console for Elimnator's scenario. 2011-03-19 12:19:22 +00:00
Mark Vejvoda
bca617cf18 - bugfix for socket mutex locked when deleting socket
- added faction detail in lobby when CRC's do not match on techtree
2011-03-19 12:04:18 +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
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
f88836203a - another keyboard bugfix (pressing esc properly cancels chat mode), Thanks ultifd 2011-03-12 03:10:07 +00:00
Mark Vejvoda
e070cf2cbb - added player status for network based games so players can indicate if they are ready to play or not 2011-03-11 11:11:46 +00:00
Mark Vejvoda
f46eaa159a - bugfix for bug reported by gonana (ascii hotkeys work properly once again) 2011-03-11 06:34:59 +00:00
Mark Vejvoda
2f18f96743 - bugfix for alpha letter keys used for certain hotkey operations 2011-03-10 18:26:45 +00:00
Mark Vejvoda
744602d0e3 - more keyboard handler cleanup related to special key presses (like shift) 2011-03-04 00:46:45 +00:00
Mark Vejvoda
bced200dd1 - bugfix when bad values are in map file, game would freeze at game start due to endless loop 2011-02-25 22:13:11 +00:00
Mark Vejvoda
9de151d975 - added more things to try to improve pathfinding (especially for the AI)
AI players should now detect when units are blocked (surrounded by other units from same faction) and tell the other units to move out of the way
2011-02-25 16:32:27 +00:00
Titus Tscharntke
922df8e025 up to 36 units selectable; maps can set camera heigth now ( be careful with this for performance reasons! ) 2011-02-25 00:31:42 +00:00
Mark Vejvoda
a0cfe3fa08 - a few changes and now seems to compile in VC++ 2010 (still need to checkin project files) 2011-02-15 23:53:48 +00:00
Mark Vejvoda
2357e2cfd1 - Titi, fixed the remove object so its done in the Object destructor (using an interface) 2011-02-15 04:34:19 +00:00
Mark Vejvoda
31e722287f - bugfixes for when players disconnect, do not switch observers to AI and only show message once.
- Attempts to debug/improve network performance
2011-02-15 03:32:14 +00:00
Mark Vejvoda
7cae047f15 - added more code guards around morph validation
- some render debug info
2011-02-11 04:48:17 +00:00
Mark Vejvoda
39e4d62133 - attempted bugfix for click like mad morph causing out of synch 2011-02-10 21:02:07 +00:00
Titus Tscharntke
91abdd3ed4 camera max height/ default are calculated based on the max height of a map 2011-02-10 00:14:21 +00:00
Mark Vejvoda
12dcc54c5a - more conversions to vertex arrays 2011-02-09 08:04:21 +00:00
Mark Vejvoda
c58e893047 - attempt to improve issues in the custom menu related to freezing
- modified debug UI display to support multi levels of UI debug info
- added more validations to mutexes
- improved client sockets to properly be setup as non blocking
2011-02-06 07:01:54 +00:00
Mark Vejvoda
6052ee6cc7 - bugfix to clear surface data cache on game exit (lest we overfill system RAM) 2011-02-05 05:50:42 +00:00
Mark Vejvoda
325ea2515a - nicely formatted out of synch messages (one per line).. all for tomreyn's happiness :) 2011-01-31 23:36:13 +00:00
Mark Vejvoda
0b4eef10c5 - added a very useful way to track mutex usage and performance timings of mutex locking to discover thread lock issues 2011-01-31 23:01:39 +00:00
Mark Vejvoda
4b085691df - added new LUA method togglePauseGame 2011-01-29 23:50:21 +00:00
Mark Vejvoda
a5a6cf76d6 - updated some new lua commands 2011-01-29 17:52:53 +00:00
Mark Vejvoda
041289770e - cleaned up more compiler warnings in VC++ 2011-01-29 17:42:34 +00:00
Mark Vejvoda
1a3545f8ab - cleaned up compiler warnings in g3d viewer
- added a bunch of new lua commands for 'da boys' to be documented after being fully tested.
2011-01-29 12:42:18 +00:00
Mark Vejvoda
177531c376 - commented out some debug statements and corrected stuck harvesting a bit 2011-01-28 08:37:48 +00:00
Mark Vejvoda
d10054f1c3 - moved sound system debug into a new debugSound property to lessen the impact of regular debug logging since sound processing is now threaded and therefore logging sound system items may slow down performance
- added texture caching for faction preview textures
2011-01-26 09:09:59 +00:00
Mark Vejvoda
e06639c78d - updated Internet games to use 2 new fields, country and game status.
for now svn users can edit glestuser.ini and add the following entry (pointing to your folder of course) to see the country flags in game:
CountryTexturePath=/home/softcoder/Code/megaglest/trunk/source/masterserver/flags
2011-01-25 07:41:12 +00:00
Mark Vejvoda
4670935fd0 - added a new check is there is a connection lost during command execution we now display a Connection Lost error along with possible out of synch. 2011-01-25 00:54:37 +00:00
Mark Vejvoda
ed90d620b3 - bugfix to disallow CPU players to be observers
- spelling mistake fix in error message
2011-01-25 00:42:09 +00:00
Mark Vejvoda
b73045b349 - turn off music playing while game is loading 2011-01-20 19:56:11 +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
fdaf9438d8 - added code so Alt-Enter etc. works during game loading phase 2011-01-20 08:19:14 +00:00
Mark Vejvoda
60b58eb44c - bugfix for multi-build segfault under special conditions (discovered today) 2011-01-20 07:56:02 +00:00
Mark Vejvoda
55d213435a - changed music change-over during game start so that background music continues to play while waiting for network clients 2011-01-18 04:56:42 +00:00
Mark Vejvoda
d16f6a93bc - sound system is now threaded by default (hopefully this fixes buffer underruns errors from openal)
- background music now plays when game is loading
2011-01-18 01:24:45 +00:00
Mark Vejvoda
ccbd707ae1 - numerous bugfixes including fixing a slowdown introduced in a previous recent checkin.
- Added Network Text Message queue as this is required in some tricky cases
- added more logging of memory cleanup events
- added memory safe snprintf calls
2011-01-11 22:09:46 +00:00
Mark Vejvoda
e319c2cf62 - attempt to fix game freeze when lag causes game pauses 2011-01-11 08:45:58 +00:00
Mark Vejvoda
1c78fca0fb - Added tileset and map CRC check in the network lobby
- numerous bugfixes
2011-01-09 04:49:21 +00:00
Mark Vejvoda
7347dc9545 - bugfix for multi-build queued commands 2011-01-08 21:53:05 +00:00
Mark Vejvoda
3fed09ab32 - removed a bad out of synch check as it was wrong
- added socket messages when out of synch detected.
2011-01-02 01:48:56 +00:00
Mark Vejvoda
896b1c308c - added a backtrace for gcc compiled binary when we get a runtime error.
- added more out of synch checks and better error handling
2011-01-02 00:39:13 +00:00
Titus Tscharntke
23f9d29769 too much red in the console ;-) 2011-01-01 22:08:34 +00:00
Titus Tscharntke
13c6fb49b3 chat highlighting, and more features related to chat 2011-01-01 20:31:25 +00:00
Mark Vejvoda
ba995d1131 - show more friendly message when out of synch detected. 2010-12-28 02:57:36 +00:00
Titus Tscharntke
36c4b4c5fa internet menu updated ( work in progress ) ; checkboxes ; lines 2010-12-27 00:59:57 +00:00
Mark Vejvoda
d997e2af5d - bugfix, threaded logging was NOT ever enabled because of a timing bug. Now threaded logging is enabled by default.
- Updated debug UI view to show threaded debug buffer count
2010-12-25 09:15:49 +00:00
Mark Vejvoda
03eaa2c033 numerous important bugfixes:
- observers and end game fog of war enable would most likely cause out of synch, I think its fixed now
- better handling of threaded logging
- cleanup of socket thread processing to ensure all network packets get processed properly and in order
2010-12-24 08:43:09 +00:00
Mark Vejvoda
97ee61165a updates to irc use in mastermenu:
- shows local username
- bugfixes for detecting new/dropped users in the irc channel
- lots of cleanup to remove use of so many static variables
2010-12-24 02:10:31 +00:00
Titus Tscharntke
45a3601286 you can attack teammates again; fix for attack queuing, units don't walk to dead bodies if next attack command is in queue ; 2010-12-20 20:01:14 +00:00
Mark Vejvoda
f204d4445c - added a new bit style gamesetting flag for future new game settings.
- added ability to see map resources but still keep fog of war (GAE's shroud of darkness), but not activated by UI yet, tested and works
2010-12-19 08:04:25 +00:00
Titus Tscharntke
7305391b6d Unit commanding via minimap 2010-12-18 17:18:36 +00:00
Mark Vejvoda
8f579e735f - bugfix for new CPU multiplier constants for VC++ compiler 2010-12-11 08:00:49 +00:00
Titus Tscharntke
ebcadc13f0 Constants for easy/normal/ultra/mega default multipliers
Multiplier example for scenarios
Version number is only shown with build date and so on for dev versions
2010-12-11 00:20:31 +00:00
Mark Vejvoda
045c2f95e8 - added new commandline options to tell the game where to look for data, ini's and where to write logs 2010-12-09 20:41:11 +00:00
Mark Vejvoda
b02da7d1e0 - finally found and fixed out of synch related to AI.
- added ability to log all unit activity to world synch logfiles so we can diff game info from different network clients
2010-11-30 23:32:39 +00:00
Titus Tscharntke
ede8977aff switched resourcemultiplier to int (using the index now) and added some debug output for testing. 2010-11-25 22:45:08 +00:00
Titus Tscharntke
c2c9cc0044 endgame stats screen shows multiplier now for CPU players
you cannot switch unvisible resource multiplier any more
2010-11-11 21:41:13 +00:00
Mark Vejvoda
cc4f268988 - some additional AI caching for improved performance 2010-11-11 08:02:50 +00:00
Mark Vejvoda
d89953ee96 - improved performance and bug fixes. 2010-11-09 09:06:52 +00:00
Titus Tscharntke
2440d475b3 beginning of new resource multiplier. Still work in progress but hopefully ready to test some things. 2010-11-08 23:15:50 +00:00
Mark Vejvoda
9d9fa0deeb - improved performance for when the AI decides which resource is closest. 2010-11-07 03:27:06 +00:00
Mark Vejvoda
8ab95a5305 - added stack trace for windows users when exceptions occur (snagged the idea from sauerbraten) 2010-11-05 06:46:30 +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
b1ff035f9e - added ability to turn on photo mode and zoom out while in a non network game (default key is f8) 2010-10-30 03:03:44 +00:00
Mark Vejvoda
44563b6f73 - allow screenshots to be taken ANY time (in menus etc.) and not only when a game is playing 2010-10-30 02:24:53 +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
13c4deb5b6 - added new screenshot format to be bmp (can be oveeriden by ini setting, and more formats may be added later) ScreenShotFileType=tga to revert to old default tga screenshots 2010-10-29 22:18:23 +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