Commit Graph

2566 Commits

Author SHA1 Message Date
a2622cdef7 hotfix for bug in ia32 (code path where ebx was clobbered due to cpuid; incorrect ptr arithmetic passing cpu_type to ia32_cpuid)
+ manual Release build that fixes it

This was SVN commit r2718.
2005-09-14 04:08:23 +00:00
f8ed148370 cpuid -> ia32_cpuid
considerable continued cleanup in ia32
came across article detailing HT detect on multicore systems. that
requires new code, working on it.
pthread: while reading, came across idea of wrapping thread trampoline
in __except -> more reliable exception handling

This was SVN commit r2716.
2005-09-14 01:34:16 +00:00
4ab25c7274 * Fixed the "can't interact with the world" glitch. Turns out it was my fault. :)
* Restored the resource pool (and cleaned up the JS interface to it ...
array and counters are updated in one spot (wrapper functions to
add/deduct/define), without need for constant refresh).
* Added crude boxes in game setup to enter initial resource value.
* The command buttons still don't work when clicked (and clicking
continues to be erratic, only triggering if hammering the mouse button
... I think it's related to the return function() hack Philip set up),
but that's next on the list. :)
* Oh, and the command buttons don't currently realign to the different
corners with Alt+G, but all the rest should.

This was SVN commit r2715.
2005-09-14 00:50:25 +00:00
093e5c2519 Enanced the Cantabrian Highlands map some more, and added a few more comments and utility functions to rmgen and JS API.
This was SVN commit r2714.
2005-09-13 23:00:56 +00:00
2766242181 This was SVN commit r2713. 2005-09-13 22:58:54 +00:00
fd3437d181 lib: add CPU error code.
ia32: replace get_cur_processor_id with cpuid(0); move cpuid(func, regs)
to asm - it takes care of detecting cpuid.

This was SVN commit r2710.
2005-09-13 21:12:29 +00:00
2ab9584840 snd.cpp: initialize listener orientation and position (my OpenAL drivers complained about the old random values)
premake stuff: call assembler objects *.asm.obj instead of *.obj (so
that ia32.asm doesn't collide with ia32.cpp)
ia32.asm: use .text section for proper linkage

This was SVN commit r2709.
2005-09-13 20:42:01 +00:00
d8da47bd0a quick fix to alleviate breakage until build system accepts .asm files
This was SVN commit r2707.
2005-09-13 04:27:08 +00:00
808a0f7cbe config: additional macro is checked
lib: add bits() function (actually moved it from zip.cpp)
ia32: start moving code out to external asm file (will use NASM in
pre-build step; avoids needing MSC and GCC-specific inline code). move
memcpy test code out to other file

This was SVN commit r2706.
2005-09-13 04:00:41 +00:00
0b72d0f86c Atlas: More portable GL context usage. Smoother and more responsive terrain editing.
This was SVN commit r2705.
2005-09-13 03:57:34 +00:00
35591f4d24 Premake support for assemblying .asm-files with nasm (now also on windows!)
This was SVN commit r2704.
2005-09-13 03:51:48 +00:00
884418aed9 Linux support for including nasm in the build process
This was SVN commit r2703.
2005-09-13 00:16:47 +00:00
a0a01e7a7d Linux/GCC Compat, added some includes, ported inline assembly stuff to gnu syntax (and misc. cleanup in ia32.cpp)
This was SVN commit r2702.
2005-09-12 23:37:52 +00:00
3fdf41bd54 misused SVN to transfer from laptop. fixed a compile error that was in there
This was SVN commit r2701.
2005-09-12 22:58:55 +00:00
15ca12311b more WIP; initial memcpy code
This was SVN commit r2700.
2005-09-12 22:13:03 +00:00
aa118403bb Terrain: CalcFromPosition, to convert world-space to tile-space.
ScEd: Compilation fixes.
Atlas: Screen-space to world-space conversion when editing terrain.
Wireframe option. Minor wxWidgets 2.6.1 fixes. AoE3Ed.

This was SVN commit r2698.
2005-09-12 20:04:26 +00:00
d3f41e1b9f Finally put the command buttons back in, but the GUI doesn't seem to be accessible when a unit is clicked, so I can't be sure it works. I think it may be due to no left-click options in Simon's world click event handler. Need to ask him about it.
Also it's much slower as the buttons are constantly updated ... Mark's
shouldUpdateStat() doesn't seem to be registering in this case. Need to
check with him about that too.

This was SVN commit r2697.
2005-09-10 17:30:57 +00:00
d64e2ed19f dyn_array: use memcpy2
add tex error codes
move memcpy code to ia32
tex: simplify codec call with separate tex_codec_for* calls
codecs: use error code instead of string; remove redundant params
ia32: heavy WIP - testing memcpy implementations
util: prepare for zero-copy improvement to screenshot code

This was SVN commit r2695.
2005-09-10 14:28:55 +00:00
189786928e minor error path improvements+comments; add WARN_IF_FALSE et al.
This was SVN commit r2693.
2005-09-08 17:14:19 +00:00
3c9ad073bc minor error reporting / wording changes while cruising through.
This was SVN commit r2691.
2005-09-08 01:48:57 +00:00
494d27bdd4 moved SAFE_DELETE to lib.h
dyn_array supports "wrapping" other types of memory (stopgap measure)
texture codecs now load via DynArray (intermediate step to all mem stuff
going through res/mem.cpp)
simplified tex codecs by doing as many checks as possible in
tex_load_mem ("template method"-esque)

This was SVN commit r2690.
2005-09-08 01:47:45 +00:00
5c4069f5e1 This was SVN commit r2689. 2005-09-08 01:34:24 +00:00
467b14e928 - Added stay-in-tile-class and border-tile-class constraints.
- Made objects snap to terrain (the game does this automatically for
entities but it was a problem with actors)
- Small enhancements to the RMS API
- New version of cantabrian_highlands

This was SVN commit r2688.
2005-09-08 01:20:51 +00:00
c428f510f6 This was SVN commit r2687. 2005-09-08 01:18:55 +00:00
4cc30aeb56 This was SVN commit r2684. 2005-09-07 02:24:13 +00:00
55107c69fe This was SVN commit r2683. 2005-09-07 02:17:29 +00:00
8b467d6f2f This was SVN commit r2681. 2005-09-06 22:54:41 +00:00
6b284a8b95 This was SVN commit r2680. 2005-09-06 22:47:26 +00:00
1a7d67a97f dyn_array: efficient expandable array that doesn't waste mem or relocate itself. TODO: self test and dox
file: expose block size constant; always round user transfers up
tex: transform() now receives what to change, not what to achieve.
tex*: encoding works with DynArray+VFS backend
GameSetup: free g_BuildingPlacer to avoid mem leak.
fixed some warnings+bugs.

This was SVN commit r2679.
2005-09-06 22:44:48 +00:00
9dc8a71b15 Added health properties to BaseEntity so they work properly for Entity as well (on units that don't directly specify them).
This was SVN commit r2677.
2005-09-06 19:30:41 +00:00
5f2857b6b8 Modified health bar height on buildings and added default of -1.0 (which means don't display health bar) on all entities.
This was SVN commit r2676.
2005-09-06 19:29:31 +00:00
6f10e8c09c Updated building placement cursor to make the object glow read and not be placeable if trying to place in an invalid area.
Also a small fix: made the selection bandbox not appear when the view is
being rotated using left+right drag (it doesn't make sense to show it
then).

This was SVN commit r2674.
2005-09-06 08:25:41 +00:00
d867f0c5fc box_height parameter for Matei.
This was SVN commit r2673.
2005-09-06 00:51:18 +00:00
11de356225 Improved building placer to show the actor that will be placed instead of the original white lines.
This was SVN commit r2671.
2005-09-05 23:44:21 +00:00
65e90614f2 Added hitpoint bars above selected and mouseovered units.
This was SVN commit r2669.
2005-09-05 21:45:26 +00:00
1af9aa074e Added initial version of building placement cursor, which can be shown with the startPlacing(templateName) JS function.
Also activated depth test for selection outlines so they don't overlap
units.

This was SVN commit r2667.
2005-09-05 19:48:28 +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
7b144a11ca ogl_tex: has to be aware of multitexturing because if hotloading a texture on TMU1, we have to re-bind it to that. done
waio: fix bug with SetErrorMode usage triggered by reading "The old new
thing" (Raymond Chen's blog)

This was SVN commit r2664.
2005-09-04 20:49:58 +00:00
819aca0f1c work around flaw in some DDS headers (not setting alpha flag). this is critical because renderer/GUI code now uses TEX_ALPHA flag instead of just checking against all known GL formats containing alpha
This was SVN commit r2663.
2005-09-04 20:05:21 +00:00
c6215a1451 guirenderer: fix bug that was breaking the ScEd button in main menu. it was calling glEnable/glActiveTextureUnit before ogl_tex_bind, which is now also doing that.
self_test: added another note
wtime: fix evil bug - was casting FILETIME* to u64*, which has different
alignment guarantees.

This was SVN commit r2662.
2005-09-04 19:48:26 +00:00
c0c08bd851 This was SVN commit r2661. 2005-09-03 21:54:11 +00:00
b071585610 Added tile class and "avoid at distance" support to RMGen.
This was SVN commit r2659.
2005-09-03 21:53:07 +00:00
436de9b0ff Committing updated font with a bit of test text while experimenting with accented characters.
This was SVN commit r2658.
2005-09-03 21:00:43 +00:00
2b55945893 doc clarification as requested by Philip (thanks for feedback!)
This was SVN commit r2656.
2005-09-03 14:41:06 +00:00
f4c535a326 lib.cpp: forgot to use TEST (for self-test)
self_test: add dox (also to wiki)
tex_codecs: further work; renamed+reorg for clarity. separating codecs
from IO implementation

This was SVN commit r2654.
2005-09-02 18:38:25 +00:00
93313f61bf no more changes!
This was SVN commit r2653.
2005-09-02 08:57:59 +00:00
6b0b64b0f9 roman roof again
This was SVN commit r2652.
2005-09-02 07:40:24 +00:00
50ea8c532c - PathPackage now does CHECK_ERR. adjusted callers appropriately
- mem.h: export mem_assign (needed to wrap a mem buffer)
- use stricmp in some file extension comparisons
- wposix: properly sets last-error code when opendir fails
- also: misc comments

This was SVN commit r2650.
2005-09-02 03:03:06 +00:00
21709a5a7a (as before, belonged in the previous batches)
This was SVN commit r2649.
2005-09-02 02:58:40 +00:00
71f7fccd12 split texture loader into codecs (greatly eases navigation)
tex.cpp now has loader API and codec support routines.
provide for codecs "transforming" the image; this allows e.g.
decompressing DDS, which is currently done in ogl code (but belongs
here)

This was SVN commit r2648.
2005-09-02 02:56:54 +00:00