b3391ebe39
Fix build warnings. Patch by Markus. Refs #1851 .
...
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
ada7702bec
add UI sound channel, clean up external interface and javascript calls
...
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
71b25d5bd4
big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
...
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
a8a968d32c
Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
...
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
72a8b88b7d
Fixes some unconventional assignment operators, patch by Markus, refs #1852 .
...
Fixes typo in test_ShaderManager
This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
94c57085e9
Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
...
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
bf959e1c46
fix build when using --without-audio
...
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
0cad19ecec
double check that the sound manager has been created before using
...
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
b301d5c84d
fades music in and out when switching to background, also honors g_PauseOnFocusLoss
...
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
c9a5d5cee5
pause music and ambient sounds when game pauses
...
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
161d6c1ba7
Improves SDL 2.0 support
...
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
16de5c75ac
Adds game speed option to match setup, adds in-game control for single player games, fixes #785 .
...
Refactors some GUI utility functions.
This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
03c3b1daa3
Fixes a few changes in my previous commit. Makes "Medium" the default difficulty setting.
...
This was SVN commit r13303.
2013-03-16 12:55:03 +00:00
5af7544918
Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
...
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
25293ce0cc
Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
...
Adds -autostart-aidiff to set the difficulty from the command line from
testing.
This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
2c17ab70ac
Add support for -autostart-civ to set civilizations when quickstarting.
...
Put the AI memory heap back to 32 MB to avoid OOM errors with numerous
AIs in late game.
Fix a bug that made ProductionQueue not broadcast progress.
Fix many issues with Aegis in defense, pathfinding, foundation
construction, training building choice, strength calculations, building
placement and mostly attack. Aegis should be much more aggressive.
This was SVN commit r13247.
2013-03-09 14:09:06 +00:00
73951b75fc
Adds the server-side part of the javascript debugger. Refs #410
...
This was SVN commit r13238.
2013-03-07 13:49:49 +00:00
10373892be
Adds support for Apple command/meta hotkeys by grouping them with unified "Super" hotkey (not bothering to handle the distinction which is only relevant to Apple keyboards and SDL 1.2).
...
Adds Super+Q hotkey to close the game on OS X.
This was SVN commit r13195.
2013-02-24 21:42:21 +00:00
92fdbb49b6
Moves particle interpolation to its own simulation component.
...
Fixes inconsistency between Atlas and in-game particle rendering during
pauses.
Fixes some issues related to Atlas simulation test and map loading.
This was SVN commit r13184.
2013-02-22 23:20:59 +00:00
a87019ea5a
Render initial game view during loading screen, to begin loading assets and eliminate ugly terrain blending artifacts. Refs #1663
...
This was SVN commit r13181.
2013-02-22 07:32:22 +00:00
1e3bdc439b
Fix MSVC warning. Refs #1838 .
...
Remove special support for removed internal mod.
This was SVN commit r13180.
2013-02-21 19:59:39 +00:00
2f19cf86d3
Fix mod priority. Add user mod support. Fixes #1838 .
...
This was SVN commit r13167.
2013-02-14 00:40:02 +00:00
f9bbd97dde
Adds startup warning(s) about removing fixed renderpath, fixes #1795
...
This was SVN commit r13156.
2013-02-09 22:55:42 +00:00
3e8bdebc6d
Add Clang detection and add BSD to the collected stats.
...
This was SVN commit r13111.
2013-01-23 16:01:17 +00:00
75a23856cf
Fix some static analysis warnings
...
This was SVN commit r13101.
2013-01-21 20:33:25 +00:00
a074eb814a
Adds blinking cursors with configurable rate, based on patch by kingadami. Fixes #876
...
This was SVN commit r13068.
2013-01-12 01:20:01 +00:00
276f0a41a0
New Year's clean-up.
...
Throw a warning if a invalid (not present) AI is specified in a map.
Replace the last occurences of jubot with qbot.
Exclude the common siege templates from the Units Demo map.
Fix an error with flying units.
Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to
CFG_GET_VAL to reflect its behaviour better.
Fix linker error with clang 3.2. Refs 1588.
Remove some useless includes.
This was SVN commit r13031.
2013-01-01 18:33:53 +00:00
adc4012944
Save last multiplayer server. Based on patch by Aurium. Fixes #1778 .
...
Fix bug in ConfigDB: Creating a value could result in changing a value
in a different namespace.
This was SVN commit r13021.
2012-12-25 22:49:18 +00:00
9a2dfa3fc0
Read default multiplayer server name/IP address from config. Patch by Aurium. Refs #1778 .
...
This was SVN commit r13003.
2012-12-20 21:44:56 +00:00
39910affd0
Changes various urls to point to the new website and fixes some broken forum urls.
...
This was SVN commit r12980.
2012-12-11 23:04:03 +00:00
eb4805d73d
Adds command-line and config options for OOS log and serialization test modes: -ooslog and -serializationtest
...
This was SVN commit r12930.
2012-12-03 20:06:58 +00:00
a4a060cd86
Fixes build warning and cleans up a few things
...
This was SVN commit r12895.
2012-11-26 02:28:35 +00:00
116281f830
Fixes Atlas and Collada dylib loading on OS X, for non-bundled binaries. Thanks to wraitii for the suggestion.
...
This was SVN commit r12834.
2012-11-08 01:57:50 +00:00
c722fbd93f
Change hwdetect to handle slightly more cases with the water detection.
...
Updates a few more maps with new settings.
This was SVN commit r12830.
2012-11-07 10:53:37 +00:00
76676b1e38
Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
...
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
ed7c66eb82
Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
...
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
fb035d08e3
fixes #1572 and fixes #932
...
Changes the water rendering in game to support higher quality effects
and to look nicer.
This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
7fafeec767
Fixes splash screen to display only once at startup. Fixes #1701 .
...
Adds some spacing between splash screen icons and text.
This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
1fb7889539
Postproc manager
...
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
7d8dc05c68
Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562 .
...
Adds water plane option to actor viewer.
This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
f91111aec8
Load default MP player name from the config.
...
This was SVN commit r12673.
2012-09-14 05:38:29 +00:00
89c8bccbde
Sound system patch by stwf:
...
Fixes sound system to work with archives (use VFS files instead of
POSIX), fixes #1604 .
Improves error handling and logging, refs #1594 .
Allows sound to be disabled with -nosound/-quickstart runtime options or
--without-audio build option, fixes #1609 , #1614 .
Experimentally increases default buffer size to help prevent sound
stoppages.
This was SVN commit r12566.
2012-08-31 19:08:41 +00:00
6de082abca
Forgot a semicolon :P
...
This was SVN commit r12514.
2012-08-22 08:04:55 +00:00
e50bf9e539
Sky toggling through config and with Alt+Z
...
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
0af34b1fcb
Removes some unread variables reported by LLVM. Refs #1114
...
This was SVN commit r12501.
2012-08-20 23:59:50 +00:00
8e996cedab
Adds sensible default sound gains, when the config file(s) omit them
...
This was SVN commit r12458.
2012-08-17 23:00:41 +00:00
011ba8255e
New sound system implementation by stwf, refs #1223 , #961 .
...
Enables audio on OS X, refs #685 , #931 .
Fixes music not playing after a game, refs #946 .
This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
da8c673a0a
ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines
...
This was SVN commit r12300.
2012-08-06 19:10:47 +00:00
20d75a3880
Free cursors before shutting down SDL. Fixes #1355 .
...
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
2c8adb1aea
Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527 . Refs #1360
...
This was SVN commit r12229.
2012-07-29 23:04:22 +00:00
637c09b204
Add support for OpenBSD. Fixes #1463 .
...
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.
This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
6b50a660b9
Added elapsed real time (as opposed to elapsed simulation time) to MT_Interpolate messages. Fixes leftover TODO from #824 . Refs #824 .
...
This was SVN commit r11944.
2012-06-06 19:37:03 +00:00
1f5f82f375
Fixes invalid civ check in rmgen.
...
Removes some default data from the Atlas blank map.
Changes default civ in autostart-random mode.
This was SVN commit r11809.
2012-05-09 23:06:03 +00:00
1674a7503f
Fixes error from 79c6a2cecc.
...
This was SVN commit r11780.
2012-05-07 01:29:02 +00:00
79c6a2cecc
Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186 .
...
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
0c233487ec
Disables broken window resizing and fullscreen toggling on OS X. Fixes #1381 . Refs #741
...
This was SVN commit r11752.
2012-05-04 23:30:46 +00:00
32d2927449
Adds UTF-8 support for JavaScript files.
...
This was SVN commit r11750.
2012-05-04 21:48:46 +00:00
da4c1c8f2b
Fixes handling of UTF-8 encoded JSON files (stripping BOM if necessary). Fixes #1375 .
...
This was SVN commit r11739.
2012-05-04 03:46:05 +00:00
f72bfb1cf1
Add option to disable particles, based on patch by rogue-spectre. Fixes #1222 .
...
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
97f49954cd
Allocate VBO buffers in OverlayRenderer only after graphics capabilities and shader path have been properly determined. Fixes #824 .
...
This was SVN commit r11654.
2012-04-23 18:55:32 +00:00
80277e3da9
Fix #953 (local.cfg adds keys instead of replacing them)
...
This was SVN commit r11535.
2012-04-17 13:14:34 +00:00
789036fb90
Fix #1299 (page up in console doesn't scroll up)
...
This was SVN commit r11493.
2012-04-13 12:15:50 +00:00
55e576177d
Fix non-pch build. Fixes #1313 .
...
This was SVN commit r11491.
2012-04-12 20:55:21 +00:00
f2260892bd
Add config option to force alpha-tested materials.
...
This was SVN commit r11475.
2012-04-10 21:03:22 +00:00
11115770ec
Fix memory leak
...
This was SVN commit r11474.
2012-04-10 20:56:18 +00:00
b7888aea52
Add support for specular materials.
...
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.
This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
b253cbbee6
Don't unnecessarily die when loading empty files
...
This was SVN commit r11449.
2012-04-07 21:36:27 +00:00
6d57808b84
Fix build with old Boost
...
This was SVN commit r11427.
2012-04-04 11:48:07 +00:00
6bc33fe8bd
Update renderer design to be more flexible and data-driven based on material and shader definitions.
...
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.
This was SVN commit r11423.
2012-04-03 18:44:46 +00:00
a56169ff8c
Add interned string class, for fast comparisons and reduced memory usage.
...
This was SVN commit r11422.
2012-04-03 18:26:52 +00:00
3792b02963
Fix CPreprocessor uninitialised data causing error messages on "#endif" followed by EOF with no newline. Warn about unrecognised "#elif".
...
This was SVN commit r11418.
2012-04-02 16:12:46 +00:00
0fda0019d1
Updates data paths on OS X and Windows. On OS X only write to locations inside ~/Library. On Windows make the distinction between local and roaming appdata, and use folder inside My Documents for user-created data. Fixes #1145 .
...
Adds proper OS X app bundle support.
Updates Windows installer script.
This was SVN commit r11389.
2012-03-22 00:23:31 +00:00
0e1b5522d6
Fix #868 (move wxWidgets Unix config files to XDG basedir location), based on patch from leper.
...
Fix handling of set but empty XDG environment variables.
This was SVN commit r11374.
2012-03-19 22:40:06 +00:00
700e28480d
Add command-line option to enable archivebuilder compression
...
This was SVN commit r11373.
2012-03-19 21:16:12 +00:00
4eec2bf5d2
Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
...
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.
This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
6fc508f662
Fix non-PCH build.
...
Fix typo.
This was SVN commit r11327.
2012-03-13 21:39:01 +00:00
e9bbf25997
Remove some redundant code
...
This was SVN commit r11252.
2012-03-05 18:30:00 +00:00
dc715fe57f
Remove some unused includes
...
This was SVN commit r11250.
2012-03-05 16:15:07 +00:00
d60df4b127
Adds saved game deletion. Refs #1090
...
Documents a few things related to saved games.
This was SVN commit r11233.
2012-03-04 05:27:17 +00:00
4cb7972ec2
Renamed some Atlas classes and g_GameLoop to better reflect their Atlas-related nature and to lower potential confusion with similar main-game-related functionality. Refs #678 .
...
This was SVN commit r11232.
2012-03-03 23:48:04 +00:00
7fa6afac37
Corrects some Doxygen comments and adds a few others of interest.
...
This was SVN commit r11209.
2012-03-01 03:55:05 +00:00
7d9e98b00e
Adds multiple entity selection to Atlas (including move/delete). Fixes #678 .
...
Makes all actors selectable in Atlas and gives them selection rings (an
EditorOnly flag is used in the template for Atlas-only selectables).
Adds player colors to Atlas selection rings.
Fixes decal selection by falling back to old-style AABBs. Refs #1032 .
Replaces UnitManager selections with EntitySelection helpers.
Adds DrawOverlays to Atlas views, for Atlas-specific rendering.
Fixes bug where selection rings conflicted with Move/rotate tool in
Atlas simulation test.
This was SVN commit r11177.
2012-02-27 05:32:35 +00:00
5009636e39
Improve Android compatibility.
...
Basic touchscreen input for testing.
Better GLSL support for map rendering.
This was SVN commit r11155.
2012-02-25 17:29:27 +00:00
c888c00377
Avoid unnecessary use of printf in text renderer.
...
This was SVN commit r11154.
2012-02-25 17:14:47 +00:00
b4a33851e6
Improves CColladaManager caching behavior: skeletons.xml changes now invalidate cached .pmd/psa files, CCacheLoader is used for consistency, adds support for archived files. Fixes #1167 .
...
Adds COLLADA conversion to archive builder.
Fixes archive builder on Windows.
Moves error logging from CCacheLoader::TryLoadingCached to its callers,
because this failure can be legitimate (in the case of uncached .pmd/psa
files).
This was SVN commit r11100.
2012-02-19 03:30:59 +00:00
832a51da80
GLSL text support
...
This was SVN commit r11080.
2012-02-15 21:53:13 +00:00
f4625e69af
Partial Android compatibility.
...
Remove unnecessary VM allocation (which seemingly causes problems on
Android due to mmap during static initialization).
Allow building without NVTT.
This was SVN commit r11074.
2012-02-15 13:58:58 +00:00
d70a981377
Android fixes
...
This was SVN commit r11068.
2012-02-13 23:53:09 +00:00
9972eb8cae
Enough GLES compatibility to reach the menu screen
...
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
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
db85833655
More GLES compatibility.
...
Move more rendering code to shader API.
This was SVN commit r11050.
2012-02-12 13:20:49 +00:00
08bd07ddd6
Adds safe bool operator to ICmpPtr, replacing the null() method, based on patch by leper. Also changes bool operator in AtSmartPtr to safe bool. Fixes #1077 .
...
Changes some CmpPtr variable names for consistency.
This was SVN commit r11036.
2012-02-08 02:46:15 +00:00
3fab2729b5
Partial SDL2 compatibility
...
This was SVN commit r11033.
2012-02-06 22:47:35 +00:00
41e3bad341
More build fixes for FreeBSD.
...
Adds BSD sysdep.
Adds support for MAKE variable, overriding make command in our build
scripts.
Fixes more files not ending with newline.
This was SVN commit r10994.
2012-01-31 00:06:56 +00:00
fc27a5c0ea
More FreeBSD build fixes.
...
Fixes some warnings about files that don't end with newline.
This was SVN commit r10991.
2012-01-30 06:21:11 +00:00
cc5a0fba4e
Use shader API for GUI text.
...
Flip GUI quads so we don't have to disable back-face culling.
This was SVN commit r10989.
2012-01-30 00:27:23 +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
8ca59d418d
Partially fix hotloading (see #848 )
...
This was SVN commit r10977.
2012-01-29 01:19:54 +00:00
d40e4797de
Report timer_Resolution via hwdetect
...
This was SVN commit r10947.
2012-01-22 13:49:09 +00:00
c8bf34948c
Fixes no PCH build. Fixes #1113 .
...
This was SVN commit r10914.
2012-01-15 21:48:41 +00:00
