385e26b64f
Made some changes to the map, per Jason the Wijitmaker.
...
This was SVN commit r3288.
2005-12-26 23:45:00 +00:00
14cb08fc20
Fixed a crash on units that could have props added & removed from them, such as javelinists. It seems that the CModel destructor was made to remove the prop point from the parent's prop point list, causing a problem in existing prop replacement code that tried to do the same thing.
...
This was SVN commit r3287.
2005-12-26 10:57:25 +00:00
f625290a39
Gave main-line Hellene spearmen the "standard" length spear.
...
This was SVN commit r3286.
2005-12-25 08:27:49 +00:00
91d5d9da28
Female updates
...
This was SVN commit r3285.
2005-12-24 13:15:50 +00:00
c74eff63f0
Some Map fixes - moving the ones that are no longer valid after the entity rename to the /old folder and updated the ken map.
...
This was SVN commit r3284.
2005-12-23 11:03:20 +00:00
b8f3adb225
Committed a screenshot I have been working on.
...
This was SVN commit r3283.
2005-12-23 10:16:08 +00:00
acbd00188e
Explicit cast to CStr() to fix Linux build.
...
This was SVN commit r3282.
2005-12-23 01:24:07 +00:00
6d137a5c41
wsdl: fix incorrect handling of mouse leaving the window. split complicated if logic into separate function.
...
wposix: use Liberror_set_errno
various other improvements spotted while looking through code.
This was SVN commit r3281.
2005-12-23 00:27:29 +00:00
d8149fe9a1
Doh, one more fix for some history and naming updates for the celtic dock
...
This was SVN commit r3280.
2005-12-22 05:55:59 +00:00
75113dae35
few more tweaks to entities
...
This was SVN commit r3279.
2005-12-22 05:52:36 +00:00
c6c0e0422d
Fixed some entities and added the missing greek ships
...
This was SVN commit r3278.
2005-12-22 05:35:35 +00:00
ed7c2fe3d6
Atlas: Allow placement of actors.
...
This was SVN commit r3275.
2005-12-22 04:20:16 +00:00
709d1389da
Removed a compile warning and changed scheduler's "tasks to cancel" set to a hash set.
...
This was SVN commit r3273.
2005-12-18 07:41:02 +00:00
5e0e3c32f3
Added support for cancelling a timeout or interval set using setTimeout/setInterval, which is used by the infidelity aura.
...
This was SVN commit r3272.
2005-12-18 07:33:16 +00:00
8f5b5b7b73
Added time parameter on infidelity aura (currently sheep convert instantly but female citizens take 10 seconds).
...
This was SVN commit r3271.
2005-12-18 07:30:11 +00:00
db0846c53f
All pglXYZ functions should be available everywhere (independent of system
...
GL headers).
Some minor cleanup in the patch rendering code.
This was SVN commit r3269.
2005-12-18 02:04:24 +00:00
3ea5fa5b46
Lots of fixes for the Linux build:
...
- renamed sysdep/unix/ functions where necessary
- more int -> LibError conversions in the sysdep/unix/ part
- added some explicit #include statements where necessary
- moved enum LibError/ErrorReaction declarations
(gcc doesn't support forward enum declarations)
This was SVN commit r3267.
2005-12-17 22:00:54 +00:00
74b8c5b15f
More Greek unit tweaks
...
This was SVN commit r3266.
2005-12-17 20:45:27 +00:00
1bedd9457a
- Fixed the issue that was causing crashes when you tried to place one of them. They had 2 problems: first the template_structure_special whose parent was itself, as Phillip pointed out, but second also incorrect actor names. I also made the Carthaginian wall refer to the right parent template.
...
- Added a "dropsite" aura to mills, farmsteads and civil centers, and
modified the gathering code so you can only gather objects that have
this aura on them from one of these buildings. You can also add a
traits.supply.forageable tag to an entity to make it ignore the
requirement for dropsites and gather it wherever it is. I did this for
hunting, so you can hunt without being near a farmstead.
This was SVN commit r3265.
2005-12-17 09:28:26 +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
a40ee4bcbc
Fixed the button flickering bug. It turns out that guiHide/guiUnHide were settings controls to hidden/unhidden each tick, which caused the C++ code to reset mouse interaction properties even if the thing went from unhidden to unhidden. I fixed it by making guiHide and guiUnHide check whether the control is already hidden/unhidden before changing it, though maybe we want different behaviour from the C++ code.
...
This was SVN commit r3262.
2005-12-17 00:24:43 +00:00
7af724889c
Updated unit training to work with the new entities.
...
This was SVN commit r3261.
2005-12-16 22:52:10 +00:00
cf4c27f2a9
Changed the create lists for the Civ Centres so they'e no longer invalid (needs to point to the _b versions of CSes).
...
This was SVN commit r3260.
2005-12-16 16:21:40 +00:00
299248ec46
Entity fixes, new greek material
...
This was SVN commit r3259.
2005-12-16 13:03:53 +00:00
4de14f47f7
Sheep should no longer be overly fond of trees & rocks.
...
This was SVN commit r3258.
2005-12-16 07:22:40 +00:00
2d969da879
Removed some debug messages.
...
This was SVN commit r3257.
2005-12-16 07:19:47 +00:00
54194e49ec
This was SVN commit r3256.
2005-12-16 07:13:13 +00:00
59eadae140
Fixed build buttons for new entities.Fixed command buttons for the new entities. Also fixed a bug where build buttons disappeared after you clicked a unit that couldn't build anything (there was a missing guiUnHide) and added infidelity aura to herdable animals.
...
This was SVN commit r3255.
2005-12-16 07:12:19 +00:00
3dc4d7d184
Removed the gaia_ designation from gaia entities, at Jason's request.
...
This was SVN commit r3254.
2005-12-16 05:37:27 +00:00
45255d3f37
Added a "collision patch" system that groups entities into a grid on top of the map to make aura checking and collision detection faster.
...
This was SVN commit r3253.
2005-12-16 05:35:26 +00:00
96df45e83d
This was SVN commit r3252.
2005-12-15 23:20:53 +00:00
6578c2c05c
Added the new entities.
...
This was SVN commit r3251.
2005-12-15 22:58:31 +00:00
2300a81070
C++ code changes for new entities (mostly referring to the right new properties or XML attributes in CEntity.cpp and CBaseEntity.cpp).
...
This was SVN commit r3249.
2005-12-15 21:59:48 +00:00
b14dc940ef
New entities and associated changes to scripts.
...
This was SVN commit r3248.
2005-12-15 21:55:18 +00:00
0e40dfc480
file: add note on pp_set_dir
...
CLogger: fix log file opening (now uses VFS path correctly)
ScriptingHost: fix error reporter - no longer does redundant write to
console
This was SVN commit r3246.
2005-12-14 18:32:02 +00:00
00a15f0ccb
Here are the celt ships!
...
This was SVN commit r3244.
2005-12-14 09:23:15 +00:00
15be1474bc
Archers should now be able to fire, though I don't know what exactly the problem was (it seems that you need the "event" parameter to be 0.5 and the "load" parameter to be 0 in the animation for it to work, and the animation is not completely right; not sure if this is intended).
...
This was SVN commit r3243.
2005-12-14 04:53:53 +00:00
213463fdfd
update JS code to use new fade code. fix some indentation.
...
This was SVN commit r3242.
2005-12-13 23:19:15 +00:00
8792731c5c
snd: support for fading (variable initial/final values and lengths; can choose linear,exponential or S-curve). also minor improvements.
...
timer: greatly speed up TIMER_ACCRUE by having it gather raw ticks and
only converting those to wall-clock time at exit when displaying the
values. old codepath remains and can be restored via TIMER_USE_RAW_TICKS
This was SVN commit r3241.
2005-12-13 23:17:50 +00:00
e4cf72e949
Rewrote InfidelityAura in a more correct way (if there are units from several players but none from your owner near you, you should switch to the player with the most units, not remain with your current owner; also, don't count other infidel things as units of your own player near you, so groups can be converted together).
...
This was SVN commit r3240.
2005-12-13 21:43:08 +00:00
d939a006ae
Added C++ code for auras. Some things that still need to be implemented are:
...
- Times on auras (a unit must be in range for X seconds for the aura to
start affecting it)
- An efficient GetInRange implementation in CEntityManager using a
quadtree or something of the sort (current one is linear in the number
of entities).
This was SVN commit r3238.
2005-12-13 08:05:30 +00:00
0eb7108272
Added aura scripts and 3 auras: a Courage aura of 15 on Themistocles and 5 on Alexander, a Fear aura of 5 on Leonidas, and an Infidelity aura on female citizens.
...
This was SVN commit r3237.
2005-12-13 08:03:49 +00:00
6e82e33ccf
- display_msg and display_error -> debug prefix since in debug header
...
- debug_warn_err now takes LibError
- lib_error.cpp: revise error code -> string (only support liberror
now); add function to set errno from LibError
- unifont, CFont: parameter made a simple wchar_t from const wchar_t&
- mmap now sets errno
- Loader and VfsUtil function now return LibError as well
- Profile.cpp, ProfileViewer.cpp: fix int/uint/size_t warnings
- Renderer.cpp: fix cannot-generate-assignment-operator warning
This was SVN commit r3235.
2005-12-12 19:19:30 +00:00
8d3df809bb
fixed some broken animations with the greek javelinists (though I still can't get either the elite javelinists for the celts or greeks to work properly)
...
This was SVN commit r3234.
2005-12-12 07:47:11 +00:00
8cbf23f123
Fixed a bug with projectiles trying to hit non-extant entities.
...
This was SVN commit r3232.
2005-12-11 23:28:50 +00:00
2e5d310c56
Trees can no longer move.
...
This was SVN commit r3231.
2005-12-11 23:28:08 +00:00
1c1200a049
- massive overhaul of lib error code returning. int -> LibError everywhere.
...
- add translators from errno and GetLastError to LibError
- clarified return values of callbacks (they must return
INFO_CB_CONTINUE to continue)
- this exposed a few bugs in error handling chains (returning incorrect
values); also reduced say-nothing instances of return -1.
- move CHECK_ERR etc. macros to lib_error
This was SVN commit r3229.
2005-12-11 22:23:55 +00:00
78cc73481c
This was SVN commit r3228.
2005-12-11 04:11:08 +00:00
bc23379066
Fixes to entity death and event handling, plus some updates to RmGen.
...
This was SVN commit r3226.
2005-12-11 02:09:11 +00:00
a5f9789940
Fixes to entity death and event handling (buildings should no longer be able to move, all units should be able to die).
...
This was SVN commit r3225.
2005-12-11 02:08:24 +00:00
Mythos_Ruler