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

524 Commits

Author SHA1 Message Date
Mark Vejvoda
37c2ace11a - rollback last commit 2013-09-26 16:37:32 +00:00
Mark Vejvoda
7349a1f126 - attempt to convert use of more floats to double 2013-09-25 15:40:19 +00:00
Mark Vejvoda
875eb95790 bugfix for particle cleanup 2013-09-24 03:44:15 +00:00
Titus Tscharntke
440ec7dd7e shadow intensity with better performance 2013-09-22 13:55:20 +00:00
Titus Tscharntke
416ccaae4b Shadow intensity can be set in video options. 
Tilesets can set their own default shadow intensity with <shadow-intensity value="0.3"/>.
ShadowAlpha is beeing removed form ini files
 2013-09-22 00:51:47 +00:00
Mark Vejvoda
f9c991edda add a guard for null texture and warning on console 2013-08-01 22:22:21 +00:00
Titus Tscharntke
511ba5134f default selection is colorpicking now 2013-06-20 21:42:01 +00:00
Mark Vejvoda
0ead6a36dc full support for translated techtrees 2013-06-13 08:55:48 +00:00
Titus Tscharntke
1f96dae8c7 tilesets can set default air unit heights 2013-06-13 07:34:32 +00:00
Mark Vejvoda
a8662c8b31 updated menus to display translated tech name 2013-06-13 01:37:15 +00:00
Mark Vejvoda
1e1676a34a more render improvements 2013-06-12 06:14:55 +00:00
Mark Vejvoda
a516b0eb0d more render improvements 2013-06-12 01:07:53 +00:00
Mark Vejvoda
929381e3ee see if this fixes the black flicker we sometimes see 2013-06-12 00:53:52 +00:00
Mark Vejvoda
55653c10b5 try to see if this affects performance? 2013-06-12 00:25:43 +00:00
Mark Vejvoda
668b34db8e more mad attempts to squeeze better performance 2013-06-11 06:44:26 +00:00
Titus Tscharntke
819622f40e I hope this fixes the black flickering when selecting units you sometimes see (this was very obvious with selectbuffer , but visible in colorpicking too ) 2013-06-03 23:09:02 +00:00
Mark Vejvoda
6cc8f6ac75 attempt to fix the model render not properly timed 2013-05-31 07:09:25 +00:00
Mark Vejvoda
995617e91e bugfix to allow admin to kick player in same slot multiple times 2013-05-28 07:10:13 +00:00
Mark Vejvoda
aa69a5818b added some new lua methods to determine day or night and new event 2013-05-25 20:46:36 +00:00
Titus Tscharntke
218c540bea In graphics option new screenmodes are "tested" now. 
Animate only a given number of objects in tilesets.
 2013-05-19 12:30:10 +00:00
Mark Vejvoda
8408526b12 code cleanup based on cppcheck results 2013-05-17 03:59:34 +00:00
Titus Tscharntke
db921c3fb7 attack enemy units even if you missed them and only hit the map cell. 2013-04-29 23:05:56 +00:00
Titus Tscharntke
d303170b3f colorpicking: first we render buildings then we render units. By this we can select units in or behind buildings with colorpicking. 2013-04-28 10:26:25 +00:00
Titus Tscharntke
6849d432bf colorpicking improved again and hopefully fixed false clicks on attacks ... ( works with low display resolutions too now) 2013-04-27 17:38:35 +00:00
Titus Tscharntke
9d3c99d6d0 Speed for colorpicking :-D. Its nearly as fast as selectbuf now . ( and tree selection for colorpicking is fixed ) 2013-04-25 23:12:34 +00:00
Titus Tscharntke
c8b6a9f410 fixed colorpicking selection for units in front of trees ( flying units above forests for example ) 2013-04-24 23:06:11 +00:00
Titus Tscharntke
e7907394de lighting of rotated tileset objects was wrong. 2013-03-14 21:16:16 +00:00
Mark Vejvoda
2210d48c49 - added a temp ini setting: DebugGameSynchUI=true 
to show all units in minimap to compare on two screens if the game is going out of synch.
 2013-03-10 00:40:38 +00:00
Mark Vejvoda
13665d58f1 - attempt to fix light sources handling as reported by tomreyn 
- allow speed up / slow down for network game as long as no-one is connected
 2013-02-26 20:48:20 +00:00
Mark Vejvoda
aca17684a7 - attempt to see if this fixes drawing of starting points for some bad video drivers 2013-02-12 20:47:46 +00:00
Titus Tscharntke
41671ac997 frustRum ->frustum 2013-02-11 22:51:36 +00:00
Mark Vejvoda
f87b8b6ee2 - updated code to protect against null pointers and uninitialized values and threading issues 2013-02-04 08:30:43 +00:00
Mark Vejvoda
3ccdd1a0c7 - updated windows exception handler to catch all error types 2013-02-01 05:26:07 +00:00
Titus Tscharntke
c5dd29f4ff new way to define the selectionType. No more use of EnableColorPicking and so on! 
allowed values are: selectbuf color frustrum

Default is selectbuf again as Colorpicking still makes trouble.
 2013-01-27 22:10:24 +00:00
Mark Vejvoda
8cd7aa0e43 - code cleanup from cppcheck 2013-01-25 02:55:28 +00:00
Mark Vejvoda
87b39a3cb5 - fix unit selection 2013-01-24 15:52:11 +00:00
Mark Vejvoda
d7d83f7c5e - attempt to speed up color picking 2013-01-23 23:20:54 +00:00
Mark Vejvoda
69568f5b1a - attempt to speed up color picking 2013-01-23 21:53:02 +00:00
Mark Vejvoda
93438d42f4 - attempt to see if this fixes units that do not attack when right clicking enemy 
- see if this fixes crashes when using color picking
 2013-01-23 21:03:00 +00:00
Mark Vejvoda
7ecc7325ac - trying to trace nig's crash (more debug info and safer code) 2013-01-23 14:51:28 +00:00
Mark Vejvoda
141f7eaa48 - cleanup some warnings in VC++ 
- more consistent project settings in vc++
 2013-01-23 06:53:55 +00:00
Mark Vejvoda
e7e5ac8987 - only render live units when picking selected units 2013-01-23 06:26:26 +00:00
Mark Vejvoda
7146a20976 - attempt to fix / improve performance of color picking 2013-01-22 04:30:06 +00:00
Mark Vejvoda
11392c69c9 - see if this speeds up color picking 2013-01-16 18:23:29 +00:00
Mark Vejvoda
ccb402d42e - fix build on windows 2013-01-16 17:51:31 +00:00
Mark Vejvoda
06a135301b - set color pciking as the default selection type. Possible ini entries are: 
EnableSelectBufPicking=true
EnableColorPicking=true
EnableFrustumPicking=true
 2013-01-16 17:13:51 +00:00
Mark Vejvoda
ce7982dc91 - see if this speeds up color picking 2013-01-16 16:58:28 +00:00
Mark Vejvoda
21f674abd9 - see if this fixes color picking 2013-01-15 03:34:01 +00:00
Mark Vejvoda
ceedef5200 - see if this fixes color picking 2013-01-15 03:18:26 +00:00
Mark Vejvoda
4d0811f0ec - update debug stats to remove unused items 
- disable interpolation when doing unit or resource selection
 2013-01-12 07:36:14 +00:00
Mark Vejvoda
ee2ad95164 - attempt to improve ai decision performance by having each ai player updates done in a thread 2013-01-01 18:55:26 +00:00
Mark Vejvoda
3773736212 - bugfix for headless admin to get message in his own language (if possible) 2012-11-15 14:45:22 +00:00
Mark Vejvoda
11fdaf899b - attempt to see if this fixes tomreyn's selectbuf problems 2012-11-15 07:28:48 +00:00
Mark Vejvoda
490c538086 - bugfix from tomreyn's stacktrace for resource selection 2012-11-14 23:42:12 +00:00
Mark Vejvoda
ff58a868b3 - attempt to bugfix windows using proper printf syntax for data types 2012-11-10 06:37:23 +00:00
Titus Tscharntke
a43ebdb69e changed way of showing the quick marker in the minimap ( x + mouseclick ) 2012-11-10 00:01:44 +00:00
Mark Vejvoda
cc8b983b99 - stop internet lobby chat from overflowing into other UI elements 2012-11-09 18:09:32 +00:00
Mark Vejvoda
b178b1d1e9 - fixed messagebox word wrap with lua messages 2012-11-08 23:54:43 +00:00
Mark Vejvoda
16b85dbe79 - added another patch from cygal (he's on fire people!) to word wrap messagebox text 
- remove newlines from english text where appropriate
 2012-11-07 21:24:44 +00:00
Titus Tscharntke
6880b06152 fix to prevent selecting units and resources ( like trees) at once 2012-11-06 22:29:13 +00:00
Mark Vejvoda
3419127632 - proper way to handle size_t objects (cleanup warning on other platforms) 2012-10-26 02:42:10 +00:00
Mark Vejvoda
8b1000cbfb - don't save the transifex password to the ini (but still allow the user to enter the value manually in the ini) 2012-10-22 22:06:30 +00:00
Mark Vejvoda
ba0bf98b9e - hide password until editing 
- move transifex ui items to the right
 2012-10-22 19:38:28 +00:00
Mark Vejvoda
011e0263b0 - lots more code cleanup, using safe buffer size code to avoid buffer overflows 2012-10-19 01:31:20 +00:00
Mark Vejvoda
e63e634e1e - added a bit more lua and updated capture enemy flag 2012-10-13 07:33:33 +00:00
Mark Vejvoda
0180aa6bba - added new lua functions: 
triggeredCellEventUnitId()
showMarker(int flashCount, int factionIndex, string note, string textureFile,Vec2i pos)

1. The first one can be called in a cell trigger event and tell you which unit triggered the event
2. The second flashes a position in the minimap
 2012-10-13 05:06:53 +00:00
Mark Vejvoda
c5ac0cc8e3 - fix min player for headless game message 2012-10-06 17:50:27 +00:00
Mark Vejvoda
5e42c6dc03 - loads of code cleanup based on verbose output from the latest git version of cppcheck 2012-10-06 07:06:40 +00:00
Mark Vejvoda
c39da4cd69 - code cleanup from cppcheck 2012-10-06 02:10:23 +00:00
Mark Vejvoda
732f5260a1 - corrected default progress bar height (since its often chopping off font) 2012-09-27 06:12:53 +00:00
Mark Vejvoda
7c0e10684a - added lua functions to add / remove cell markers: 
addCellMarker(0,'test from scenario!','',cellMarker)
param1=factionindex
param2=cell hint
param3=empty string
param4=cellPosition

removeCellMarker(0,{46,13})
param1=factionindex
param2=cellPosition
 2012-09-25 07:05:52 +00:00
Mark Vejvoda
e0bf4df646 - cppcheck round #2 cleanup 2012-09-22 20:37:42 +00:00
Mark Vejvoda
1c211e4ce6 - lots of code cleanup from the cppcheck 2012-09-22 20:13:57 +00:00
Mark Vejvoda
c50469acd7 - limit users to a max of 5 cell markers and use team color when placed 2012-09-21 00:54:22 +00:00
Mark Vejvoda
d4edad893c - changed cell mark / unmark icons 2012-09-20 04:53:58 +00:00
Mark Vejvoda
6ea34ea46c - added cell hint text entry when placing cell markers (supports \n and \t for text formatting) 2012-09-20 04:10:34 +00:00
Titus Tscharntke
5373c9cf6b only render morph effect if morphed units will have bigger size or will be in another filed ( air/land ). Stil something is wrong with blocking units in the air while morphing. 2012-09-11 22:50:59 +00:00
Titus Tscharntke
6bd5e236de a bit slower animation for morphing effect 2012-09-11 22:29:54 +00:00
Titus Tscharntke
75dfebade5 does this morph effect look better? Morph to/from air/land is also supported now 2012-09-11 22:16:44 +00:00
Titus Tscharntke
75032c3287 reserve unit place while morphing. (first try) 2012-09-11 21:16:24 +00:00
Titus Tscharntke
2bdc487cce fix for "non-selectable" feature, its tested and works now! 2012-09-01 18:38:01 +00:00
Mark Vejvoda
7d3a5ae43e - make everyone happy regarding the clock: 
InGameClock=true
InGameLocalClock=true
 2012-08-16 21:15:31 +00:00
Mark Vejvoda
d58ea5f57c - added titles and local time as well 2012-08-16 06:31:02 +00:00
Mark Vejvoda
648c3e190a - added patch from Taoki for showing time of game day under minimap (thanks) 2012-08-15 14:37:27 +00:00
Mark Vejvoda
e2fcf9ed94 - bugfix for lighting of tileset objects, when rotated objects had weird lighting causing random light patterns to show on them. 2012-08-13 21:46:27 +00:00
Mark Vejvoda
4b586bc7b3 - added more opengl checking to see if the user has enough support to run megaglest. 
- for windows users, bring error message dialog in front of everything else
 2012-08-10 06:19:35 +00:00
Mark Vejvoda
b665258897 - improve ability to force label edit mode rendering to be a static width regardless of font size used 2012-07-26 15:26:59 +00:00
Mark Vejvoda
6662f35347 - fixed input text segfault and corrected entry of playername in menus and added a box around the field when editing. 2012-07-26 06:27:00 +00:00
Titus Tscharntke
d10d5fc770 hopefully working implementation of mpfNoSelect from this discussion: http://glest.org/glest_board/index.php?topic=8165.msg82932#msg82932 2012-07-14 21:29:15 +00:00
Titus Tscharntke
0043511e0a less alpha for building ghosts, 'X' key for highlighting, no camera move while highlighting 2012-07-13 23:19:53 +00:00
Titus Tscharntke
73919c860d New quick highlight pointer for minimap ( we need another key for this, at the moment its "shift" ) 2012-07-13 21:50:34 +00:00
Mark Vejvoda
04442af2e9 - more alpha on building ghosting 2012-06-24 02:09:13 +00:00
Mark Vejvoda
0f5cb29919 - build silhouette now uses team colour and you see all team players building placement 
- improve performance when rending cell markers
 2012-06-22 13:30:15 +00:00
Mark Vejvoda
acc2a5f9c9 - show light green with alpha silhouette of building when unit is moving to a location to build another unit 2012-06-22 04:58:44 +00:00
Mark Vejvoda
81cc68305c - added the ability to remove cell markers 2012-06-13 16:19:44 +00:00
Mark Vejvoda
943dcef9fe - first pass of VERY ROUGH crude implementation of 'cell markers'. Need to properly find icons, apply alpha to icon on the map and add support for notes when user hovers over the marker. 2012-06-12 20:37:00 +00:00
Mark Vejvoda
dcc615d427 - allow overriding text colors 2012-06-01 05:26:01 +00:00
Mark Vejvoda
4c016dfbdf - attempt to fix segfault from menu handling after playing a few games 2012-05-28 16:51:56 +00:00
Mark Vejvoda
68bfe9e455 - fixed rendering on battle end screen 2012-05-28 02:36:12 +00:00
Mark Vejvoda
827f4fb89d - cycle alpha channel on please wait text for video loading 2012-05-24 07:37:43 +00:00
Mark Vejvoda
599cae0235 - cycle alpha channel on please wait text for video loading 2012-05-24 07:15:15 +00:00
Mark Vejvoda
b6a4e33e7d - replaced calls to glgenlists and family as these gl calls are deprecated in newer opengl (and really did not do anything for us) 2012-05-24 06:16:54 +00:00
Mark Vejvoda
0fac755a5e - video player now displays 'please wait' while loading the video 2012-05-23 19:59:52 +00:00
Mark Vejvoda
ef39f93457 - try to speed up water rendering a bit, but especially pathfinder 2012-05-12 00:01:05 +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
a37dc8a7b3 - fix headless server crash due to new call to setgama in headless mode 
- a few code optimizations to start to improve performance
 2012-04-16 06:14:10 +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
Titus Tscharntke
4aae520da6 Highlighting rendering without cycling through all units each frame ... 2012-04-04 22:57:32 +00:00
Titus Tscharntke
6c12bfbec8 Improved resource object selection implementation which allows highlight effects now too. 
Generally changed highlight effect to something more obvious
 2012-04-04 00:30:16 +00:00
Titus Tscharntke
8c6dde365b mouse pointer shows multi click command state 2012-04-02 23:37:03 +00:00
Titus Tscharntke
42b289fe1e cursor work in progress ... ( for tomreyn and me to test ) 2012-04-02 22:17:10 +00:00
Mark Vejvoda
fce4d55dd5 - better error handling, try to display proper error message and restore state as best as possible 2012-04-02 01:45:13 +00:00
Titus Tscharntke
7f0aaebf50 XML option to hide a resource from the HUD 2012-04-01 19:42:59 +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
9286130138 - bugfixes and code cleanup found using cppcheck 2012-03-28 06:25:57 +00:00
Mark Vejvoda
6bff5c0687 - try to improve error handling a bit for more accurate stack trace and less chance of garbage info 2012-03-27 22:44:16 +00:00
Mark Vejvoda
63af39e034 - hide map objects and their particles if not in current frustrum view 2012-03-27 06:09:30 +00:00
Mark Vejvoda
163271203d - tilesets now support animated models: 
<model path="models/copter_sit.g3d" anim-speed="190"/>
 2012-03-26 23:24:29 +00:00
Mark Vejvoda
b481fbcbb5 - proper save and restore for particles 2012-03-19 21:35:54 +00:00
Titus Tscharntke
91dce63aac savegame screenshot has smaller size (configurable)/ screenshots are deleted too 2012-03-17 11:26:39 +00:00
Mark Vejvoda
8d5de12d42 - added some particles to load game logic 2012-03-14 07:23:41 +00:00
Titus Tscharntke
38bd33acf9 Gamma Correction in inGame options with direct feedback. 2012-03-13 18:59:33 +00:00
Mark Vejvoda
e3fde99359 - fixed gamma correction so it works now 
- added more state when loading saved game
 2012-03-13 01:34:14 +00:00
Titus Tscharntke
edd7f732ea alpha correction in options menu ( checkin with error included , which needs to be fixed! ) 2012-03-13 00:44:55 +00:00
Mark Vejvoda
04e16819aa - fix segfault when converting models 
- fix segfault when mod menu cannot connect to masterserver
 2012-03-03 18:40:18 +00:00
Titus Tscharntke
9870c13a6b GraphicMessageBox can handle multiple buttons now 2012-02-19 17:37:53 +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
Mark Vejvoda
b6473b69ab - added ability to turn off some screen selection items for better recording ability. Set RecordMode=true in glestuser.ini to disable some selection effects for recording a video and not seeing selection circles etc. 2012-02-03 06:16:50 +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
7b69d3040f - bugfix on windows for autoscreenshots in g3d viewer 2012-01-04 21:43:34 +00:00
Mark Vejvoda
a20b848646 - discovered a possible bug that may have caused people with valid VBO support to crash, this fix may resolve that issue. 2011-12-30 06:24:59 +00:00
Titus Tscharntke
3e7b8a5aa8 Little fix to get rid of annoying black squares on left and right screen border when moving camera. It fixes some missing(black) parts of hills too ( not all of them but the obvious ones ). 2011-12-14 22:38:02 +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
ddca84a8b4 - default to regular selection buffer selection, but make optional support for color picking or frustum picking in case some players need it. 2011-12-14 02:25:14 +00:00
Mark Vejvoda
d64bf0a4c9 - disable color picking by default, and add error codes for selection buffer 2011-12-14 01:15:27 +00:00
Titus Tscharntke
dc4ba27048 no more long distance unit rendereing 2011-12-13 20:29:32 +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
d33e1174a5 - bugfixes related to cppcheck report 
- bugfixes found using valgrind (memory leaks)
 2011-12-02 16:07:59 +00:00
Mark Vejvoda
cd2daf09dc - new visibility frustum calculation is enabled by default 2011-11-30 21:27:03 +00:00
Mark Vejvoda
410201b313 - attempt to fix bug for new render visiblity 2011-11-30 17:56:58 +00:00
Mark Vejvoda
97378cf0ec - adding more debug info to rendering 2011-11-30 17:47:07 +00:00
Mark Vejvoda
ed072d27bb - adding more debug info to rendering 2011-11-30 16:51:51 +00:00
Mark Vejvoda
3b7e873a02 frustrum code can be re-enabled via ini setting: 
EnableFrustrumCalcs=true
 2011-11-30 07:39:24 +00:00
Mark Vejvoda
8996938e86 - disable new frustrum code for now 2011-11-30 07:27:45 +00:00
Mark Vejvoda
8445a5f616 - attempt to fix visible quad bug 2011-11-30 07:13:17 +00:00
Mark Vejvoda
4015520702 - bugfix the quad cache is now cleared properly at game start and end 
- bugfix for debugging headless server caused segfault
 2011-11-30 06:58:26 +00:00