Commit Graph

174 Commits

Author SHA1 Message Date
531b40578a More GLES compatibility.
Add config option to disable hardware cursors on Windows.

This was SVN commit r11053.
2012-02-12 20:45:31 +00:00
fbf1f9cb26 Altered some default hotkeys.
This was SVN commit r11031.
2012-02-06 05:56:31 +00:00
04c63a4093 Clean up some text rendering to avoid relying on deprecated GL matrix state.
Use scissor instead of deprecated clip planes for GUI text.
Remove unused support for generic font names.

This was SVN commit r10985.
2012-01-29 20:04:21 +00:00
adbd7633dd # Initial GLSL rendering support
This was SVN commit r10978.
2012-01-29 01:22:22 +00:00
1730dd6d8d Add military only drag select (Alt modifier) by gerbilOFdoom. Closes #277
This was SVN commit r10873.
2012-01-05 13:31:54 +00:00
a4e1f3c292 This was SVN commit r10853. 2012-01-02 21:46:09 +00:00
d82b85b8f3 Fix #1025 (add config option to toggle pause on window focus loss), based on patch by markcho.
This was SVN commit r10609.
2011-11-26 15:23:41 +00:00
8cbab40137 Barter. Closes #23.
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
901a87af2e Tweaked camera settings.
This was SVN commit r10562.
2011-11-19 20:37:16 +00:00
8b6714a62d Some minor tweaks to camera defaults.
This was SVN commit r10557.
2011-11-19 02:15:01 +00:00
39d100c732 Moves camera projection settings to default.cfg.
Changes field of view (FOV) to 45 degrees per discussion. Fixes #941.
Tweaks default camera zoom and rotation accordingly.

This was SVN commit r10548.
2011-11-17 23:34:01 +00:00
cfb79c3062 # Add GPU performance profiling support.
Add some profiler region attributes.
Render events in profile visualiser.
Change profiler from GPL to MIT.

This was SVN commit r10492.
2011-11-09 13:09:01 +00:00
09a02c96d5 Add initial code annotations for the new profiling tool
This was SVN commit r10466.
2011-11-04 01:35:50 +00:00
a3c03815c0 Experimental quicksave/quickload feature
This was SVN commit r10427.
2011-10-24 14:55:45 +00:00
d9820fb0cb Add optional time elapsed counter to session screen.
This was SVN commit r10402.
2011-10-13 23:20:34 +00:00
b08e142193 Graphics optimisations and features from eihrul.
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721, based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434).
Reduce shadow swimming effects.

This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
bfef903c94 Adds hotkey for finding idle warriors (comma). See #792.
Updates finding idle units to be more flexible.
Resets finding idle units when unit is deselected.
Adds Warship class to relevant templates.

This was SVN commit r9791.
2011-07-10 02:11:51 +00:00
33e8ac6fa5 Applies Kenny's patch for CInput pasting behavior (fixes #640)
Simplifies some clipboard hotkeys

This was SVN commit r9658.
2011-06-25 00:04:41 +00:00
05898c75d1 # Increase maximum camera distance
This was SVN commit r9647.
2011-06-23 12:52:43 +00:00
492e49da38 add support for selection and deletion of entire words in text controls (ctrl+backspace/delete/left/right) based on patch by Chakakhan/kenny (thanks!)
also refactored wclipboard
closes #511

This was SVN commit r9646.
2011-06-23 10:12:43 +00:00
26de01cdd1 Adjusts unit selection behavior to account for ranks. Triple-click now selects units regardless of their rank.
Adds modifier hotkey to select units offscreen.
Fixes #826.

This was SVN commit r9443.
2011-05-05 01:27:49 +00:00
8e20c00dd3 # Add numbered unit selection groups, based on patch from Badmadblacksad.
Fixes #773.

This was SVN commit r9322.
2011-04-26 18:19:16 +00:00
9526706b5c Fix reference to old vertexshader mode
This was SVN commit r9226.
2011-04-11 10:04:39 +00:00
6d3d93c355 # Add idle worker button, based on patch from veprbl.
Fixes #744.

This was SVN commit r9140.
2011-04-01 18:00:04 +00:00
0da7e822ff # Add opt-in automatic feedback system.
Add GL implementation limits to hwdetect.
Make the in-game manual support multiple text files.
Remove unnecessary instruction on how to close the manual window.
Make guitextobject.caption return the original value without stripping
formatting tags.
Remove unused non-VFS support from config system.
Support writing config files back to their original path.
Remove unnecessary user profile directory; use normal config directory.

This was SVN commit r8925.
2011-02-16 20:40:15 +00:00
40933c06e1 Primitive support for gamepad camera movement
This was SVN commit r8844.
2010-12-30 19:45:13 +00:00
95044194be fixed where the descriptions for both Shift + WheelUp and Shift + WheelDown said the same thing, now it should be correct (please fix it if I made any mistake)
This was SVN commit r8838.
2010-12-23 20:48:37 +00:00
8ddef2fee0 Add fast-forward/rewind commands, to help with testing.
This was SVN commit r8803.
2010-12-06 19:58:06 +00:00
252d9b831b Revert bogus config changes
This was SVN commit r8774.
2010-12-03 01:21:49 +00:00
e5792285ab This was SVN commit r8770. 2010-12-02 23:58:00 +00:00
25cd781641 Support horizontal scroll wheels for camera rotation
This was SVN commit r8582.
2010-11-13 01:00:54 +00:00
e43eb0c18b # Various hotkey fixes and cleanups.
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.

This was SVN commit r8546.
2010-11-07 20:42:52 +00:00
818ea52c3b Delete obsolete non-working i18n code
This was SVN commit r8527.
2010-11-03 17:52:07 +00:00
10c5dbcba4 Fix Atlas and autostart.
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.

This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
a1a7264aec Set force_s3tc_enable automatically for greater chance of compressed texture support on Linux (see #575).
This was SVN commit r8356.
2010-10-15 00:06:48 +00:00
82691683cb Fix #56 (add unit-following camera mode (press 'F')), based on patch from markelov.
Remove obsolete IsNewSimulation function.

This was SVN commit r8190.
2010-09-26 23:05:25 +00:00
96a8c7bd91 Remove default LOD bias.
Disable GL automatic mipmap generation.

This was SVN commit r8101.
2010-09-10 21:04:02 +00:00
ae4e03f1e5 Fix config typo
This was SVN commit r8047.
2010-08-29 20:04:39 +00:00
2529ae2a7b Fix #543 (Replace skybox with black background), based on patch from Jayschwa
This was SVN commit r8018.
2010-08-21 22:43:35 +00:00
5135bcb899 Default to fullscreen, since it's more useful for most players.
Make Alt+F4 always quit the program.

This was SVN commit r7933.
2010-08-13 14:20:05 +00:00
6c7b82130c # Redesigned the camera control system.
Add shift+wheel (and Q/E, and ctrl+arrows, and ctrl+WASD) to rotate the
camera.
Restrict the rotation and zoom to narrow ranges. (Constraints can be
disabled in the dev overlay).
Smooth the movement and rotation.
Fix some stupid whitespace.
Fix some const correctness.

This was SVN commit r7930.
2010-08-13 13:26:29 +00:00
4cfca1625d Added Multi-player chat in menu and hotkey (return key)
Made player names match custom names in multi-player

The chat window will still need some more aesthetic work

This was SVN commit r7909.
2010-08-11 22:16:16 +00:00
e19146cf25 # Added AI for chickens.
Add scripted HFSM system.
Add very basic animal AI.
Support script-only message types.
Add shift+D hotkey to toggle dev command panel.

This was SVN commit r7763.
2010-07-18 15:19:49 +00:00
0f611042b1 # Support alt+enter to toggle fullscreen mode. Make game window resizable.
Refactor the video mode setting logic to cope better with dynamic
changes.

This was SVN commit r7606.
2010-06-03 19:07:59 +00:00
23ab6dad38 Make session GUI visible and usable when playtesting from Atlas.
Fix Atlas icon on non-Windows.
Remove some nonexistent-hotkey config.

This was SVN commit r7602.
2010-06-02 00:36:21 +00:00
828400d82e # Support floating units in new simulation system.
Fix rendering of underwater lines.
Fix rendering of unit selection outlines in Atlas.
Remove some obsolete hotkeys.

This was SVN commit r7589.
2010-05-27 23:23:53 +00:00
b821f7a289 Add hotkey "M" to toggle in-game music
This was SVN commit r7515.
2010-05-08 17:51:01 +00:00
93c30810c8 Fix tests. Tidy up some old files.
This was SVN commit r7507.
2010-05-07 16:32:33 +00:00
76011715e7 Point at the new local.cfg locations
This was SVN commit r7399.
2010-03-26 11:40:17 +00:00
b2f5a6cafc Clean up some SVN properties.
Remove empty unused cache directory.

This was SVN commit r7398.
2010-03-26 11:30:49 +00:00
98b4ccf823 Fix typo in comment
This was SVN commit r6983.
2009-07-14 09:57:41 +00:00
9e3b4276f9 Fixed build on Windows
This was SVN commit r6938.
2009-07-02 14:04:59 +00:00
ea29b5fac2 # Simplified local configuration changes.
default.cfg shouldn't be edited by normal users; local.cfg can be used
for any local tweaks.
Removed old profile files, since they add clutter and aren't useful yet.

This was SVN commit r6919.
2009-06-23 17:48:34 +00:00
a2819b473a #Tweaked some animation speeds.
This was SVN commit r6900.
2009-06-04 01:20:51 +00:00
Zyi
6822796a95 Simplified the logger:
- Removed the configurable interestingness from system.cfg.
- InterestingLog contains all warning and errors now.
- Modified and implemented methods in CLogger to write messages,
warnings and errors to the log.
- Modified a warning in CLocale so that the log wouldn't get spammed.

To do:
- Modify all of the logging statements in the source code.
- Remove the current preprocessor directives LOG_INFO, LOG_WARNING and
LOG_ERROR so that they can be used to log messages.

This was SVN commit r6817.
2009-04-11 22:53:33 +00:00
a1e00ef213 Deleted Michael's accidentally committed system.cfg and added (i.e. replaced) a copy of the previous version I made before updating. (Sometimes it's good not to have the most recent revision :) )
This was SVN commit r6655.
2009-02-06 18:07:15 +00:00
bc34d2291d This was SVN commit r6654. 2009-02-06 07:16:27 +00:00
2e61a5c663 Added the killing feature. Now by selecting a unit and pressing [Delete], it will be killed.
This was SVN commit r6294.
2008-07-29 21:38:41 +00:00
837ef022bd Adding a list of currently playing players. Available at Ctrl+P
The system.cfg change only adds Ctrl+P hotkey.

This was SVN commit r6282.
2008-07-25 18:17:18 +00:00
50166bb456 This was SVN commit r6233. 2008-07-15 17:01:02 +00:00
3892f03e2e Use windowed mode by default.
This was SVN commit r5898.
2008-04-27 18:09:09 +00:00
761f0e5fdf This was SVN commit r5718. 2008-03-07 07:14:59 +00:00
4118e27783 Restored larger window resolution.
This was SVN commit r5402.
2007-10-11 04:36:15 +00:00
kai
7ba586b16e adding flag -triPathfind to enable triangulation pathfinding. it will use the orignial A* without the flag
This was SVN commit r5397.
2007-10-10 19:35:23 +00:00
kai
945490414f change back to fullscreen mode in system.cfg
This was SVN commit r5394.
2007-10-09 07:31:41 +00:00
118a7934e1 Disable fancy water by default.
This was SVN commit r5322.
2007-09-03 23:31:34 +00:00
fc966bcd13 add config variables for new s3tc/auto mipmap gen disable hooks
This was SVN commit r5317.
2007-09-02 21:50:53 +00:00
08d3ff2952 Updates for OS X and gcc 4.0 compatibility.
- Fixed some invalid member function references in wxJS code that gcc
4.0 didn't like.
- Some conversion changes.
- Don't try to construct wxSound from memory in OS X (it's not
available).
- Added dependency on zlib in AtlasUI (something there uses _compress).
- Added Mac code for finding current executable's path.
- Added dummy code for getting display size that does not use X.
- Fixed dir_get_changed_file stub to return ERR::AGAIN (end of files)
instead of INFO::OK.

This was SVN commit r5312.
2007-09-02 16:50:20 +00:00
e8071fa058 Added fancywater line in config file (but it's false).
This was SVN commit r4990.
2007-04-24 16:29:38 +00:00
8b7d1fcfb3 * Moved command-line options list from system.cfg into readme.txt. Updated the list to reflect reality. Removed -novbo option because you can use the .cfg file instead.
* Changed log files to trigger standards mode in Firefox (to be
consistent with other browsers), by making it valid HTML5. Changed the
font and some spacing.
 * Made CLogger default to ignoring messages if it hasn't been
initialised yet, instead of crashing.
 * Added leak reporting to the unit tests.
 * Renamed mods/_tests to mods/_test.xero, since it's only used by
Xeromyces and the other tests use mods/_test.otherstuff instead.
 * Fixed Atlas compilation on Windows.
 * Moved Atlas's DLL-loading code into a separate class, so it can be
shared.

This was SVN commit r4707.
2006-12-20 03:09:21 +00:00
6ed4ad6519 Added a hotkey to toggle rendering of territory outlines. (Currently "T").
This was SVN commit r4675.
2006-12-05 02:08:52 +00:00
086418993d Undid config change
This was SVN commit r3847.
2006-05-04 14:45:44 +00:00
pyrolink
39e89c406e #Fixes to flank penalty, notifications, sectors, terrain conformance. Added speed bonus based on terrain slope.
-added NOTIFY_ORDER_CHANGE, which is used for flank penalty instead of
idle.
-entity speed is now actions.move.speed_curr for the current speed, but
the original speed is still actions.move.speed.  Changes take place in
entityEventMovemen.

This was SVN commit r3840.
2006-05-04 04:14:48 +00:00
8fd256c458 #Use EXT_framebuffer_object when available
* noframebufferobject configuration in system.cfg can be used to
  disable EXT_fbo (in case drivers are flaky etc.)
* shadow texture size now honours the OpenGL maximum texture size as
reported
  by the implementation

This was SVN commit r3693.
2006-03-26 17:36:33 +00:00
0be99c65bf Removed hourglass from archive builder screen since it was ambiguous (user does have input, and can just click to skip that screen -- which isn't used at present anyway).
Also restored the Esc key to its previous role of quick-quit, as I'm
just too used to using it. :)

This was SVN commit r3560.
2006-02-24 18:12:54 +00:00
da2178db66 Basic progress bar UI at the start of the game requested by Jan, so player is aware of and can cancel archive building.
(Note that the Esc key is now used here, so you'll have to use another
key ... Ctrl+F4/Alt+F4/Ctrl+Break to quick-kill the game.)

Also set Matei's StartProduction to use entity's creation time.

This was SVN commit r3556.
2006-02-23 18:22:30 +00:00
7397615b5b Reenabled shadows (it was misspelled as shadow=true instead of shadows=true).
This was SVN commit r3481.
2006-02-05 06:50:24 +00:00
pyrolink
54101c169f Queue binding
This was SVN commit r3477.
2006-02-05 03:42:05 +00:00
6eb9bfa730 Reenabled shadows in system.cfg.
This was SVN commit r3445.
2006-01-29 23:54:29 +00:00
pyrolink
bbbb9e12af -hotkey for cinematic interface (not working)
This was SVN commit r3443.
2006-01-29 23:27:16 +00:00
0a3e9ec537 - Added pause game functionality.
- Removed CDamageType from the engine - damage is now handled only
within the entity script (easier to mod/modify).

This was SVN commit r3325.
2006-01-02 03:07:29 +00:00
2d477a09cf Profiler: Shift+F11 to save profile data into logs/profile.txt
This was SVN commit r3263.
2005-12-17 02:33:57 +00:00
52a8793450 Atlas: Bits of tool-related code.
Game: Large screenshots (with ctrl+alt+F2).

This was SVN commit r2994.
2005-10-24 01:53:03 +00:00
7b31f0372b GameView: move camera lock params here
wsdl: add proper event queuing mechanism (no longer requires hacky
polling for changes and avoids WM_USER)
rename keys[] and mouse_buttons to g_keys and g_mouse_buttons
fix flipped mouse wheel direction; wsdl now sends up AND down event
(removed 'reset' hack in main.cpp)
main: clean up event handler and kill_mainloop

This was SVN commit r2934.
2005-10-13 18:05:55 +00:00
f1ee2cd66d Add the notion of render paths and an appropriate configuration option.
Add Ogl_Shader and Ogl_Program handle types for shaders/programs loaded
from
files.
In the vertexshader render path, use a vertex program for lighting for
optimization.

This was SVN commit r2853.
2005-10-05 16:42:09 +00:00
bc3949db1a Added a fairly primitive water plane. This includes several things:
- Hotkeys Q, A, Z to toggle, raise and lower the water plane
respectively.
- A unit trait, named anchor, that says whether it attaches to the
terrain or the water.
- Small changes to rendering code.

This was SVN commit r2744.
2005-09-18 03:16:12 +00:00
84a980a344 Reimplemented session GUI refresh loop, with unit portrait as test subject. Fixed some broken things.
This was SVN commit r2666.
2005-09-05 03:21:20 +00:00
3c58f50ff3 GUI-toggle feature for Michael (toggle with the G key), and fixed alignment of watermark.
This was SVN commit r2634.
2005-08-26 21:02:00 +00:00
76f3524190 Fixed FPS, which had stopped working (since it no longer recognised the mouse.x and mouse.y component of the string).
This was SVN commit r2579.
2005-08-07 14:51:55 +00:00
Gee
4bf9c15ece This was SVN commit r2535. 2005-07-24 15:55:14 +00:00
c6ea4f36bf Changed the file naming convention again, mainly to annoy Jason. :) (I forgot that filenames are meant to be lowercase with underscore separators.)
Experimented with Philip's view-config-variables-workaround.

This was SVN commit r2534.
2005-07-24 14:04:56 +00:00
fca4bab2dd Re-enabled VBOs by default, since they're significantly faster.
This was SVN commit r2371.
2005-06-02 22:47:08 +00:00
cab424ce81 Creating playlist sub-window to soon try out file access functions. (Committing in-development stuff to get an auto-build incorporating change to GUI .xml names.)
This was SVN commit r2214.
2005-05-02 22:04:29 +00:00
69bf368d27 Uploading Michael's new map, and some hotkey redefinitions (F10 is used for the menu in Age games).
This was SVN commit r2104.
2005-03-31 22:04:44 +00:00
0b93abaa7c config: console alternate key=f9 (not f12, because that triggers a breakpoint in VC)
moved write-screenshot key to f10 and disable wsdl hook => printscreen
key copies to clipboard

This was SVN commit r2029.
2005-03-20 15:45:52 +00:00
0d6035ea68 Committing revised "game session" GUI coordinates (sorry, doesn't make much cosmetic difference, but it's an improvement on the code side). The command buttons and build lists still need to be revised (hence they're upside down -- the coordinate system has flipped), so please note that's a known problem.
This was SVN commit r1966.
2005-03-07 18:25:13 +00:00
16ad78abae add sound master gain and additionally bind console to F10 for non-us keyboard layouts (where backquote is a dead key)
This was SVN commit r1941.
2005-02-26 21:43:52 +00:00
c84ea97601 Implemented first draft of Terrain Editor controls. Increased size of toolbar arrows on Philip's behalf. :)
This was SVN commit r1723.
2005-01-15 22:49:34 +00:00
bdc0073b16 Added product/company watermark to aid in taking official screenshots. Press W to toggle it.
This was SVN commit r1613.
2005-01-02 19:25:22 +00:00
a8b7c8c0cf A little more GUI stuff.
This was SVN commit r1610.
2005-01-01 19:20:42 +00:00