1
0
forked from 0ad/0ad
Commit Graph

3544 Commits

Author SHA1 Message Date
6af0cba958 This was SVN commit r4117. 2006-07-14 22:28:56 +00:00
3608c1da4a #Roman Hastatus Basic, Advanced, and Elite textures completed. Also fixed the rome_isw_e entity with the correct parental properties.
This was SVN commit r4116.
2006-07-14 22:28:17 +00:00
3914fa16ed This was SVN commit r4115. 2006-07-14 22:26:29 +00:00
4a259aa439 # add cppdoc, refactor EntityManager
entitymanager: remove duplication, move refcnt && !destroyed check into
helper function in preparation for caching result of that calculation
scriptglue: improved timer calibration

This was SVN commit r4113.
2006-07-14 14:00:00 +00:00
85959bb073 Fixed a crash that happened for me in release mode when pressing the shift key. In Hotkey.cpp:594, there was a line like
if( !unified[(*itKey)-UNIFIED_SHIFT] ) accept = false;

This was causing an index out of bounds when the key at *itKey was
AND'ed with the HOTKEY_NEGATION_MASK and thus became greater than 65536
and way out of bounds of the array. For now I added a check that *itKey
< HOTKEY_NEGATION_MASK, but maybe this is not the intended usage.

This was SVN commit r4111.
2006-07-14 00:14:44 +00:00
3f91cbe3c1 # Brightened default ambient lighting
This was SVN commit r4109.
2006-07-13 22:41:49 +00:00
08f363bb45 This was SVN commit r4108. 2006-07-13 22:10:23 +00:00
e202373983 #New curved Roman Scutum shield. Looks awesome!
This was SVN commit r4107.
2006-07-13 21:51:57 +00:00
7bc8de70c7 #New Roman Hastatus texture and unit entity. Enjoy.
This was SVN commit r4105.
2006-07-13 21:28:14 +00:00
edacfef847 This was SVN commit r4104. 2006-07-13 21:27:00 +00:00
7cd347a8d3 This was SVN commit r4103. 2006-07-13 21:26:28 +00:00
1f92aa7b8f This was SVN commit r4102. 2006-07-13 21:25:54 +00:00
b9334ec9b9 This was SVN commit r4101. 2006-07-13 21:25:11 +00:00
d6408e89c6 More profiling tests in entityInitQuasi.
This was SVN commit r4100.
2006-07-13 21:17:30 +00:00
3954604890 compensation for timer overhead (measurements now more precise; timer undershoots by 0.5us per start/stop session)
This was SVN commit r4099.
2006-07-13 21:04:06 +00:00
1ce628c354 This was SVN commit r4098. 2006-07-13 20:35:53 +00:00
812cf08f70 This was SVN commit r4097. 2006-07-13 20:31:35 +00:00
1ef12292b5 add xtimer measuring code (safe to remove at any time)
This was SVN commit r4096.
2006-07-13 20:15:38 +00:00
ed7b4b5fca # simple profiler/timer for JS scripts
cheezy but low-overhead. call startXTimer(i) and stopXTimer(i), where i
can be 0..9 for now. results are displayed via debug_out at end of
program run.

This was SVN commit r4095.
2006-07-13 20:09:20 +00:00
ac71eefbff Removed and #include for JSI_Entity.h.
This was SVN commit r4094.
2006-07-13 19:27:02 +00:00
b701269b0b # cleanup
replace it->member with variable=it->member for easier debugging. also
skip the AddProperty redundancy check in release mode instead of only
final builds

This was SVN commit r4093.
2006-07-13 19:12:50 +00:00
e2c0302ddf # Roman Helmets
This was SVN commit r4092.
2006-07-13 05:08:11 +00:00
a56ec5bdcd Some cleanup - renamed CBaseEntity to CEntityTemplate, and removed JSInterface_BaseEntity.h and JSInterface_Entity.h (which were unused).
This was SVN commit r4091.
2006-07-13 03:29:33 +00:00
eb467745b3 Fixed a small bug - CEntity::m_extant was not initialized to true.
This was SVN commit r4089.
2006-07-13 00:16:11 +00:00
d2e8804ce0 Removed old attribute table code since it's no longer used.
This was SVN commit r4087.
2006-07-12 22:50:09 +00:00
c3879b182d # CSimulation cleanup and optimization.
- Modified CJSSharedProperty so it can be inherited. It now acts as our
"static property" class with a pointer-to-member field. It did much of
this before but it wasn't used much because of the way XML properties
were loaded.
- Modified CEntity and CBaseEntity so that virtually all properties are
now CJSSharedProperty's added with AddClassProperty in ScriptingInit.
- Removed m_run SEntityAction field, replacing its fields with separate
variables, so we can have proper pointer-to-members for them.
- Modified CTechnology to use CJSComplex::Get/SetProperty so that
attributes no longer need to be "registered" for use in techs.

This was SVN commit r4086.
2006-07-12 22:24:25 +00:00
bd3a188cf9 m_sectorValues should be per-entity, not a property of BaseEntity.
This was SVN commit r4084.
2006-07-12 19:31:27 +00:00
ca4a4613f1 # CSimulation optimization+cleanup (2)
made many (*)of the bools in CEntity into a bitfield (flags). this saves
a lot of space inside CEntity.
* only those that are not specified in XML and/or accessed via JS

This was SVN commit r4082.
2006-07-12 16:18:31 +00:00
397a350e45 svn:ignore auto-generated test .cpp files.
Territories: Fixed memory leaks.
Atlas: New section-toolbar. Fixed colour of brush grid. Moved open/save
into File menu. Added 3D-ish lighting control. Added 'busy'
notifications.

This was SVN commit r4079.
2006-07-12 14:49:10 +00:00
e4ed1d52b9 # CSimulation cleanup and optimization (1)
moved some fields (e.g. size of health bar) out of CEntity and into
BaseEntity so they can be shared between entities (instead of duplicated
in each).

TODO: is it ok to remove AddProperty for those properties in CEntity?
(BaseEntity is still adding them)

This was SVN commit r4078.
2006-07-12 14:36:59 +00:00
77b6565f7c Scenario tidyness
This was SVN commit r4077.
2006-07-11 05:32:05 +00:00
ef74236219 #Cantabrian Highlands proof-of-concept map created in the 'Atlas Editor.' May be used to assist random map scripters in designing the Cantabrian Highland RMS.
This was SVN commit r4075.
2006-07-10 06:23:57 +00:00
590086571b # More work on territories - Settlements are now claimable.
This was SVN commit r4074.
2006-07-09 23:13:20 +00:00
1034a980fe Added code for placement of socketted buildings.
This was SVN commit r4073.
2006-07-09 23:12:37 +00:00
eaf12ae666 #fix to isnan() bug
big thanks to philip for seeing the problem! :D
cause: not popping FPU stack. didn't happen on my athlonXP presumably
due to different FPU usage (possibly in drivers): pushing 8 values could
clear the stack and mask overflow. the cause was not due to compiler
(and FLD/FSTP param passing) because Philip uses VC2005 as well, but saw
the crash (on P4 CPU)

fixes #130

This was SVN commit r4072.
2006-07-09 00:24:21 +00:00
b0241cc4c8 Entity changes for territories (added the traits.is_territory_centre field).
This was SVN commit r4071.
2006-07-08 22:41:55 +00:00
7926b3d93c # Some groundwork for territories.
Entities with traits.is_territory_centre == true will act as territory
centres, and territory areas are calculated and displayed on the
minimap. It remains to display these areas in the game view and to make
Civ Centres "socketable" so you can build them on Settlements to claim
them.

This was SVN commit r4070.
2006-07-08 22:40:01 +00:00
e2e61b2e16 This was SVN commit r4069. 2006-07-07 01:40:32 +00:00
f1d984897b This was SVN commit r4068. 2006-07-07 01:29:23 +00:00
f3b3e0be6e # big refactor of error display code. fixes crash in release-mode selftest
* debug_write_crashlog and debug_dump_stack are now responsible for
detecting reentrancy (reported via new ERR_REENTERED error code).
* export debug_error_message_build to allow unit test of stack dumper
* split+clean up debug_display_error to allow this.
* error_description_r now returns buf for convenience
* ia32: fix typo causing disassembly to fail
* wdbg_sym: bugfix causing incorrect debug_walk_stack return value.
prevent recursive locking, provide locked version of
debug_resolve_symbol. add skip_this_frame for convenience.

refs #130

This was SVN commit r4067.
2006-07-07 01:22:23 +00:00
dd6679b0b8 # fixes to string_s selftest
snd_mgr: fix cppdoc comments (got shredded by IDE autofmt)
string_s: disable WARN_IF_PTR_LEN (too many false positives)
test_string_s: add missing debug_skip_next_err (fixes complaints on
VC2003)

refs #130

This was SVN commit r4066.
2006-07-06 15:52:59 +00:00
pyrolink
a95c72d0c1 Upgraded console (text wrap, help text), cinematic stuff
This was SVN commit r4065.
2006-07-06 03:17:44 +00:00
66306b553a This was SVN commit r4064. 2006-07-04 07:49:25 +00:00
dd31fa8d6a This was SVN commit r4063. 2006-07-04 07:49:04 +00:00
7e73481a2c This was SVN commit r4062. 2006-07-04 07:47:14 +00:00
266ec3f09d This was SVN commit r4061. 2006-07-04 07:29:24 +00:00
cd444810a5 This was SVN commit r4060. 2006-07-04 04:08:07 +00:00
7fc71ff1e2 This was SVN commit r4059. 2006-07-04 04:06:28 +00:00
7f1b7bd399 Basket texture; tech script. (I must have forgotten to re-add these when restoring the lost SVN revisions.)
This was SVN commit r4058.
2006-07-03 20:07:11 +00:00
b0600a9fd9 #New Hellenes Female Citizen
This was SVN commit r4056.
2006-07-03 00:59:59 +00:00