a9eca31bad
Even more GLES compatibility
...
This was SVN commit r11060.
2012-02-13 15:06:25 +00:00
4bf59b9a7d
More GLES compatibility, mainly around terrain rendering.
...
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00
baff889321
Fix invalid varargs
...
This was SVN commit r11054.
2012-02-12 21:05:13 +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
1185ebdea5
Fix build
...
This was SVN commit r11051.
2012-02-12 13:26:57 +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
4029d409bb
Handle CBrush assertion failure less fatally
...
This was SVN commit r11049.
2012-02-12 12:36:05 +00:00
202a8e17c4
Fixes camera constraints by clamping the camera focus point to within the map bounds instead of outside, since the constraints are partially based on terrain height. Should improve scrolling behavior on both circular and square maps. Refs #656 , #850
...
This was SVN commit r11044.
2012-02-10 02:17:40 +00:00
2bf3383624
Attempt to fix minimap rendering issues
...
This was SVN commit r11041.
2012-02-09 20:45:19 +00:00
a3f168b887
Initial support for GLSL generic vertex attributes in shader API, for GLES compatibility.
...
Specify GLSL version in shader files, for better error detection.
This was SVN commit r11040.
2012-02-09 17:55:25 +00:00
1f5b8f1c9a
Move GUI renderer towards using shader infrastructure.
...
Remove support for unused GUI sprite effects.
Use vertex arrays for bounding box rendering.
This was SVN commit r11039.
2012-02-08 20:43:38 +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
046729dfa7
Fixes Atlas double-click behavior in simulation test, by handling the events in Canvas and recognizing wxWidgets' ButtonDown and ButtonDClick events are mutually exclusive.
...
This was SVN commit r11035.
2012-02-07 00:40:55 +00:00
3fab2729b5
Partial SDL2 compatibility
...
This was SVN commit r11033.
2012-02-06 22:47:35 +00:00
ba84c54535
Render GUI quads with consistent winding order, to stop them vanishing with negative sizes.
...
This was SVN commit r11030.
2012-02-05 22:57:58 +00:00
275e5b9620
Fixes signed/unsigned comparison warnings in GCC.
...
This was SVN commit r11014.
2012-02-04 06:17:17 +00:00
374242bcfc
Fix warnings in autobuild script
...
This was SVN commit r11012.
2012-02-03 17:08:43 +00:00
868b256cce
Throw error in PSA converter if animation has no frames, as this will lead to a divide-by-zero error in the engine, and it's good to catch that as early as possible.
...
This was SVN commit r11009.
2012-02-03 01:49:32 +00:00
0f4928bd0a
Use dummy IO tracer, to avoid overhead of storing data that will never be used. (See #1143.)
...
This was SVN commit r11007.
2012-02-02 23:12:36 +00:00
b9c406551b
Cache shader effects. Fixes #1143 .
...
This was SVN commit r11006.
2012-02-02 22:58:42 +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
5cdb2ebd70
Fix cursor winding
...
This was SVN commit r10992.
2012-01-30 12:13:43 +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
2d0e8021aa
Fixes old g++ build error with default template arguments, by wrapping them in parentheses.
...
This was SVN commit r10990.
2012-01-30 04:57:39 +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
63572a5247
Fix build
...
This was SVN commit r10986.
2012-01-29 20:16:47 +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
8be430eb30
Remove obsolete ogl_shader
...
This was SVN commit r10984.
2012-01-29 12:23:16 +00:00
9884d21830
Be more consistent in using the ARB forms of functions. Fixes #1138 , based on patch by Echelon9.
...
This was SVN commit r10983.
2012-01-29 12:15:22 +00:00
8324a8981d
Simplify GLSL program files.
...
Move water shaders to new shader system.
This was SVN commit r10982.
2012-01-29 12:04:39 +00:00
adbd7633dd
# Initial GLSL rendering support
...
This was SVN commit r10978.
2012-01-29 01:22:22 +00:00
8ca59d418d
Partially fix hotloading (see #848 )
...
This was SVN commit r10977.
2012-01-29 01:19:54 +00:00
63e151fbd5
Slightly more Android compatibility
...
This was SVN commit r10975.
2012-01-28 16:38:21 +00:00
27687873d5
Fix SSE skinning normalisation ( fixes #1136 ). Add a few more comments.
...
This was SVN commit r10974.
2012-01-28 12:17:44 +00:00
7f679a7975
# Support separate rotation and scaling for each terrain texture
...
This was SVN commit r10952.
2012-01-22 18:20:33 +00:00
d40e4797de
Report timer_Resolution via hwdetect
...
This was SVN commit r10947.
2012-01-22 13:49:09 +00:00
8fabaa4f8c
Fixes Atlas crashing when random map generator fails, load the blank map for now.
...
This was SVN commit r10939.
2012-01-21 00:53:34 +00:00
d068c1dd09
Fix build with old versions of Mesa
...
This was SVN commit r10936.
2012-01-19 18:23:54 +00:00
95e6673ed4
Fixes include in wsdl.
...
This was SVN commit r10932.
2012-01-18 22:51:49 +00:00
91652bdf6e
Implemented nested territory boundaries. Fixes #918 .
...
Fixed out of bounds memory access in Atlas due to always using global
terrain in TerrainOverlay
Fixed wrong player ID calculation in TerritoryOverlay
This was SVN commit r10929.
2012-01-18 21:22:58 +00:00
8099388bec
final sync with work - add VECTOR_ALIGNED, fix wsdl to match new SDL include path
...
This was SVN commit r10926.
2012-01-18 15:36:44 +00:00
182bf2b4af
Vague start at hypothetical Android support
...
This was SVN commit r10923.
2012-01-17 22:05:43 +00:00
09907adae3
Prevents game from running with root permissions with appropriately scary message on Unix-like OSes, based on patch by leper. Fixes #1058 .
...
This was SVN commit r10916.
2012-01-16 03:30:55 +00:00
e64a3d3946
Experiment a little with OpenGL ES
...
This was SVN commit r10915.
2012-01-15 23:15:31 +00:00
c8bf34948c
Fixes no PCH build. Fixes #1113 .
...
This was SVN commit r10914.
2012-01-15 21:48:41 +00:00
e4b2de4bba
Delete obsolete AoE3Ed code
...
This was SVN commit r10909.
2012-01-14 19:12:18 +00:00
c9cdde256f
Disable GCC warning triggered by wx headers
...
This was SVN commit r10908.
2012-01-14 19:06:47 +00:00
1389e754de
Include *.DELETED files when building archives. See #1110 .
...
This was SVN commit r10907.
2012-01-14 18:46:20 +00:00
893cb2668e
Renames our sdl.h to libsdl.h, to avoid case sensitivity errors when it includes SDL.h.
...
This was SVN commit r10904.
2012-01-12 23:32:27 +00:00
72bd886f80
Delete ancient obsolete simulation code.
...
This was SVN commit r10903.
2012-01-12 12:56:15 +00:00
ce67dfd333
Rename CELL_SIZE to TERRAIN_TILE_SIZE, to free up the term "cell" for other concepts.
...
This was SVN commit r10902.
2012-01-12 12:51:10 +00:00
4f559e8aff
Report quicksave/quickload times, to help identify performance problems.
...
This was SVN commit r10901.
2012-01-12 12:47:24 +00:00
ed237ff1a6
Implements GetVideoMode on OS X (10.6+ compatible), based on patch by Echelon9. Fixes #847 .
...
This was SVN commit r10897.
2012-01-11 23:41:59 +00:00
6bb54ee1d4
Fix Windows build
...
This was SVN commit r10896.
2012-01-11 23:04:33 +00:00
d07eac218c
SDL 1.3 build fixes.
...
Support SDL_CONFIG environment variable in update-workspaces to pick
non-default sdl-config.
Avoid non-standard use of SDL/ in include paths.
This was SVN commit r10895.
2012-01-11 22:50:39 +00:00
1e4b950ed1
This was SVN commit r10870.
2012-01-05 03:38:54 +00:00
29a8f01254
Adds missing attributes when using autostart-random (caused undefined variable warning in saved games list).
...
This was SVN commit r10869.
2012-01-04 22:48:32 +00:00
10527b4551
Fix #1092 (script runtime mismatch when saving games)
...
This was SVN commit r10868.
2012-01-04 15:28:48 +00:00
6f2eec3c2e
Fix warnings
...
This was SVN commit r10867.
2012-01-04 13:19:38 +00:00
c1c741be9a
Fix dangling pointer in Atlas
...
This was SVN commit r10866.
2012-01-04 13:18:45 +00:00
f73e3c7668
Fix uninitialised members
...
This was SVN commit r10865.
2012-01-04 13:17:26 +00:00
8b6a3923d3
instead of wcscasecmp, use std::string operator< (i.e. case-sensitive comparison)
...
closes #1036 (see rationale/discussion there)
This was SVN commit r10862.
2012-01-04 00:25:34 +00:00
56bd4b37cd
Fix #1064 more
...
This was SVN commit r10860.
2012-01-03 15:42:03 +00:00
785b6efa4b
by default, don't attempt to start the aken driver
...
addresses security concerns
[http://www.wildfiregames.com/forum/index.php?showtopic=15482 ]
This was SVN commit r10858.
2012-01-02 23:38:46 +00:00
5bf70e52de
Fixes Atlas startup in Windows when using SDL.
...
This was SVN commit r10855.
2012-01-02 22:48:43 +00:00
fa37c9b441
Reverted some of bad commit (10853) because I hit the wrong button
...
This was SVN commit r10854.
2012-01-02 22:15:21 +00:00
a4e1f3c292
This was SVN commit r10853.
2012-01-02 21:46:09 +00:00
0ec4242962
Detect and fix printf signedness errors. Fixes #1086 , #1087 .
...
This was SVN commit r10846.
2012-01-01 16:43:10 +00:00
cc405939c2
Fix #1085 (incorrect buffer size), based on patch by Echelon9
...
This was SVN commit r10845.
2012-01-01 14:42:58 +00:00
e1f7d7e599
Detect and fix characters missing from fonts
...
This was SVN commit r10840.
2011-12-31 16:34:42 +00:00
325c344ddd
increase size of error message buffer, don't complain about "invalid image hash" (known issue with aken.sys on Win7 x86).
...
fixes #1083
This was SVN commit r10834.
2011-12-29 20:15:47 +00:00
ca56add718
Add GUI and civ files to reference checker
...
This was SVN commit r10833.
2011-12-29 19:25:41 +00:00
a18195d0a1
Add checks for terrain texture references
...
This was SVN commit r10832.
2011-12-29 17:57:01 +00:00
7380d2c615
Add incomplete script for detecting data errors (broken references and unused files)
...
This was SVN commit r10830.
2011-12-29 17:39:27 +00:00
1e0074e9da
Fix crash with missing shader support
...
This was SVN commit r10829.
2011-12-29 13:35:07 +00:00
78ba79209d
more minor fixes. rename uname.machine to x64 (less confusing than amd64)
...
This was SVN commit r10827.
2011-12-29 09:47:42 +00:00
23308f0259
wsdl: add error checks, add support for bpp in sdl_surface
...
This was SVN commit r10826.
2011-12-29 09:01:09 +00:00
1e210165f2
Fix some MSVC static analysis warnings
...
This was SVN commit r10825.
2011-12-29 02:06:09 +00:00
9ef1cd8ba8
Avoid the deprecated (and fallible) SHGetMalloc, per current MSDN documentation
...
This was SVN commit r10824.
2011-12-29 01:50:18 +00:00
dbf27dbc5e
Fix #1065 (incorrect printf format string), based on patch by Echelon9
...
This was SVN commit r10823.
2011-12-29 01:40:24 +00:00
c4bb67a1ca
Fix #1064 (use ++it instead of it++ for consistency), based on patch by Echelon9
...
This was SVN commit r10822.
2011-12-29 01:17:03 +00:00
6ac6d4f1ec
Fix #1062 (incorrect check for empty string), based on patch by Echelon9
...
This was SVN commit r10821.
2011-12-29 01:07:20 +00:00
eb45a8e0f0
Fix profile visualiser
...
This was SVN commit r10820.
2011-12-28 22:01:30 +00:00
52756535f3
Fix crash in GL_EXT_timer_query profiler
...
This was SVN commit r10819.
2011-12-28 22:00:52 +00:00
c134221739
minor fixes
...
waio: ensure error is disk_full on failure
cache_adt: scaffolding code wrongly used std::remove_if instead of
list::remove. thanks to Echelon9 for catching this! fixes #1063
This was SVN commit r10818.
2011-12-28 11:21:05 +00:00
0d05c96be2
[gcc] compile fix.
...
fixes #1074
thanks to Echelon9!
This was SVN commit r10816.
2011-12-27 18:56:20 +00:00
3537ae31d5
sync with work:
...
x86_x64: update MSR definitions to include model 2F (westmere ex);
update bus clock computation for sandy bridge; remove unused
cpu_Serialize; use namespace, add model names
mahaf: cope with stricter security for services/drivers
ApicId -> GetApicId, move to apic module
aken: add batch file to install driver (optional)
This was SVN commit r10815.
2011-12-27 14:12:31 +00:00
1f38526444
Fix test failures on Windows
...
This was SVN commit r10802.
2011-12-23 13:37:11 +00:00
4f6f0b7baf
Fix tests, and warnings, and non-PCH build
...
This was SVN commit r10801.
2011-12-23 13:01:29 +00:00
587487811b
Fixes typo in pool allocator stats, based on patch from Echelon9. Fixes #1061 .
...
This was SVN commit r10799.
2011-12-23 03:54:36 +00:00
9f0e357f09
Add a hack for a-macron-acute characters (see #1039 )
...
This was SVN commit r10796.
2011-12-22 22:44:57 +00:00
c989f52c46
Use heap-based queue in pathfinder to improve worst-case performance (in exchange for terrible VS2008 debug-mode performance)
...
This was SVN commit r10790.
2011-12-22 16:58:03 +00:00
6399ec0cd2
# Partial support for saved games with AI.
...
Support cancelling loads while inside a loader callback.
Fix use of ArchiveReader/Writer since their API changed.
Improve error-detection in deserializer to avoid crashes.
Report deserializer errors to users.
Expand load-error message box to fit message about invalid saved games.
This was SVN commit r10787.
2011-12-22 14:04:32 +00:00
5f0d5e4137
Tidy some whitespace
...
This was SVN commit r10786.
2011-12-22 13:50:11 +00:00
0c84a6125b
Support larger profiler JSON output
...
This was SVN commit r10781.
2011-12-21 11:28:24 +00:00
2bc2666e4e
sync with work - minor fixes
...
This was SVN commit r10770.
2011-12-19 11:55:30 +00:00
286ce58b1c
more restrictive permissions required by tightened vista/win7 security (still unable to launch services without admin - but could install them once)
...
This was SVN commit r10762.
2011-12-18 12:21:57 +00:00
36ef0a376d
workaround hardware/BIOS craziness
...
fixes #1047
This was SVN commit r10754.
2011-12-17 20:41:32 +00:00
292ed1d9e0
Allocated rally point flag entity on-demand instead of at initialization time. Fixes #1042 .
...
This was SVN commit r10722.
2011-12-13 14:14:41 +00:00
6156fa7c9a
Changed default idle animation speed to 1 so that waypoint flags will animate properly
...
This was SVN commit r10712.
2011-12-11 13:35:51 +00:00
46a09ced71
Fixed some compilation warnings
...
This was SVN commit r10710.
2011-12-11 02:11:05 +00:00
427674f713
Fix for compilation failure of [10703] on 64-bit systems
...
This was SVN commit r10705.
2011-12-10 11:53:39 +00:00
db864f10c3
Rendering marker lines between buildings and rally points
...
Added command button to focus on rally point
(implements #524 )
This was SVN commit r10704.
2011-12-10 07:07:04 +00:00
fbb0e3995f
Added prop point axes markers to Atlas' Actor Viewer panel
...
This was SVN commit r10703.
2011-12-10 05:11:25 +00:00
1c19e905b1
Added prop points to Atlas' Actor Viewer
...
This was SVN commit r10696.
2011-12-09 10:49:08 +00:00
f4e46d166d
sync with work; minor fixes (wsdl must report gfx memory in KB to match sdl)
...
This was SVN commit r10678.
2011-12-06 09:17:39 +00:00
0ba908816f
Fix line endings
...
This was SVN commit r10635.
2011-11-29 21:04:38 +00:00
8492426a14
Rough support for profiling replay mode and scripts
...
This was SVN commit r10634.
2011-11-29 20:32:43 +00:00
4da8bf001f
Add pathfinders to new profiler
...
This was SVN commit r10633.
2011-11-29 20:29:50 +00:00
2d017698e1
Fix random maps in replay mode
...
This was SVN commit r10632.
2011-11-29 20:29:06 +00:00
24aa71b566
safely handle the case where an archive required for populating a directory cannot be opened (e.g. because it is open within 7-zip, which apparently wants exclusive access)
...
fixes #1021
This was SVN commit r10631.
2011-11-29 16:51:58 +00:00
ee417e8fd0
Attempts to fix incorrect destructor order in random map generator. See #1037 , #1035 .
...
This was SVN commit r10627.
2011-11-29 00:14:34 +00:00
ede60520a0
Fixes Atlas and Actor Editor's wxMouseCaptureLostEvent handling, which caused assertion failures in Windows debug builds. Mouse capture events are currently wxMSW only.
...
This was SVN commit r10623.
2011-11-28 01:12:18 +00:00
e74d6707e4
Avoid calling glGenQueries while a timer query is active (hopefully fixes #1033 )
...
This was SVN commit r10622.
2011-11-27 22:24:05 +00:00
b1fa90b8ef
Use a deterministic order when loading multiple archive files from within a single mod
...
This was SVN commit r10620.
2011-11-27 17:33:42 +00:00
301854702c
add support for removing individual files from VFS and a mechanism for automatically doing so (add filename.extension.DELETED to the same directory/archive), as discussed in meeting.
...
refactor: split up Invalidate into RemoveFile+RepopulateDirectory
GameSetup: fix: ensure the first mod always overrides game files,
irrespective of timestamp.
This was SVN commit r10610.
2011-11-26 18:37:53 +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
85186c98b2
Better selection boxes. Closes #914 , #295 , #810 .
...
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
8cbab40137
Barter. Closes #23 .
...
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
8d977e4818
Allows building in fog of war. Fixes #958 .
...
This was SVN commit r10584.
2011-11-24 00:58:34 +00:00
2878102ed7
Avoid some code duplication
...
This was SVN commit r10583.
2011-11-23 21:26:14 +00:00
ab88151ed0
Fix uninitialised value
...
This was SVN commit r10582.
2011-11-23 21:24:41 +00:00
18eefc7303
Fixes simulation replay mode in Windows.
...
This was SVN commit r10563.
2011-11-20 02:00:54 +00:00
31bcb5c803
Fixes buggy selection behavior due to incorrect camera plane calculation.
...
This was SVN commit r10558.
2011-11-19 05:05:59 +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
6b1ce04aad
Fix VC2008 compatibility
...
This was SVN commit r10544.
2011-11-16 17:49:28 +00:00
f66a3e726f
Avoid overflow identified by /RTCc warning
...
This was SVN commit r10537.
2011-11-14 22:22:38 +00:00
5bd7b74ec7
Fix ABI incompatibility with --with-system-mozjs185 in debug mode (see #990 ).
...
This was SVN commit r10535.
2011-11-14 18:18:04 +00:00
ade841efdd
Avoid assertion failures on abnormal exit() (e.g. dumpSchema mode)
...
This was SVN commit r10530.
2011-11-13 21:37:12 +00:00
fbff0aa98d
Fix printf argument types
...
This was SVN commit r10529.
2011-11-13 18:31:06 +00:00
e7f0639054
Set Atlas canvas size before potentially rendering to it. Fixes #987 .
...
This was SVN commit r10526.
2011-11-13 12:57:34 +00:00
72237c32a2
Avoid release-mode warnings
...
This was SVN commit r10525.
2011-11-13 12:31:41 +00:00
f0f81827f3
Fix build with old GCCs
...
This was SVN commit r10522.
2011-11-13 01:04:40 +00:00
f865401136
Detect allocation failure
...
This was SVN commit r10520.
2011-11-12 23:57:33 +00:00
99e012ba56
Fix comments
...
This was SVN commit r10517.
2011-11-12 22:08:59 +00:00
95bd6f874e
Fix OS X build by using GL_TIME_ELAPSED consistently
...
This was SVN commit r10516.
2011-11-12 19:29:48 +00:00
70224e7940
Fix missing symbols in old glext
...
This was SVN commit r10515.
2011-11-11 11:56:51 +00:00
0192c24ebc
Fix warning in old GCCs
...
This was SVN commit r10514.
2011-11-11 11:55:27 +00:00
56d634bf49
Fix invalid characters in entity templates. Add script to find unrecognised characters.
...
Fixes #960 .
This was SVN commit r10503.
2011-11-10 19:31:35 +00:00
3916c25b84
Optimise vertex skinning code with SSE, based on patch by gruby.
...
Fixes #905 .
This was SVN commit r10499.
2011-11-09 23:11:28 +00:00
87b3b0856f
Fix warning
...
This was SVN commit r10496.
2011-11-09 22:35:31 +00:00
8617dfd0e1
Avoid fatal error on printf overflow in profiler
...
This was SVN commit r10495.
2011-11-09 18:29:08 +00:00
f2ea307507
Moved warning and debug messages to below the top bar.
...
This stops them obscuring the useful inormation in the bar.
This was SVN commit r10494.
2011-11-09 17:01:57 +00:00
b090ec48ce
Add query counter bits to hwdetect
...
This was SVN commit r10493.
2011-11-09 13:10:34 +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
8fba3f92b1
Allow better hwdetect debugging
...
This was SVN commit r10491.
2011-11-09 11:54:05 +00:00
ab347de754
Fixes PMD converter's handling of static prop points. Coordinate conversion was not performed correctly according to the model's up-axis orientation. Fixes #886 , #243 .
...
This was SVN commit r10484.
2011-11-09 00:10:14 +00:00
cb27a680bf
Fix profiler shutdown order
...
This was SVN commit r10483.
2011-11-09 00:09:19 +00:00
8f3255f9c8
Fix tests and Atlas with new profiler
...
This was SVN commit r10471.
2011-11-05 23:09:31 +00:00
b13f1cade5
# UI for new profiling tool
...
This was SVN commit r10467.
2011-11-04 01:43:46 +00:00
