1
0
forked from 0ad/0ad
Commit Graph

3451 Commits

Author SHA1 Message Date
536d6f4cd3 # bugfix (main menu music fading)
fixes #123

This was SVN commit r4012.
2006-06-22 19:13:25 +00:00
8f50fe1ff8 # work on self-tests
add ignore-next-error feature, use it in string_s
refs #117

This was SVN commit r4011.
2006-06-22 19:12:10 +00:00
aeac009990 #merge (2)
path_util: add cppdoc
string_s: fix self test
wsock: fix initialization (no longer requires NLSO ctor, which doesn't
work)

This was SVN commit r4010.
2006-06-22 18:49:23 +00:00
ee4c7965dd # merge all local changes; moving over to new SVN server
* app_hooks: add display_error; can be used by atlas to override our
dialog box
* lots of small fixes (mostly pertaining to headers)
* debug: clean up display_error, protect from reentrancy, fix a few edge
cases (e.g. error message from dtor -> exit pressed -> suppress all
subsequent errors)
* delay_load: add warning: NLSO ctors are unreliable since we're
compiling into static lib

This was SVN commit r4009.
2006-06-22 18:26:08 +00:00
92b9c07f95 Restoring SVN repository:
Greek basket texture

# New Greek vases

# housekeeping
documentation fix: trailing / in directory names is mandatory

# Atlas: Sky texture selection; save with maps

Atlas code tidying: Slightly nicer syntax for defining command handlers,
and some explanation of how it works

Automated build.

This was SVN commit r4008.
2006-06-21 22:37:31 +00:00
823c93ce47 # bugfixes (string, pthread, screenshot writing)
- CStr : early out if empty, don't deref iterator (crashes in VC8)
- init VFS In archive_builder test
- wpthread: avoid race condition when creating threads. cleanup; replace
debug_warn with error codes
- Util: file_buf_free wasn't specifying FB_FROM_HEAP ->
http://www.wildfiregames.com/forum/index.php?showtopic=10085

This was SVN commit r4006.
2006-06-11 17:16:24 +00:00
e9149574e2 This was SVN commit r4005. 2006-06-11 10:41:21 +00:00
35e4dce969 This was SVN commit r4004. 2006-06-11 10:13:17 +00:00
039f26f0c3 Fixed editor brokenness.
# More useful environment (water, lighting) editing
(now saved into the map files).
Fixed no-PCH a bit.

This was SVN commit r4002.
2006-06-11 07:03:59 +00:00
6e57ef7e08 #Top Secret map for amazing screenshot. ;)
This was SVN commit r4001.
2006-06-10 04:51:31 +00:00
fd1202b027 Units will now reserve population space when added to a create queue, rather than only when they get created.
This was SVN commit r3999.
2006-06-10 03:33:22 +00:00
77c59070c1 # Various gameplay updates.
- Added per-player resource pool and modified the GUI and entity scripts
to work with it.
- Modified unit creation functions so the unit is always assigned a
player before firing its initialize event, so that this event can deduct
population, etc from the right player.
- Fixed various small bugs, like a unit not cancelling all of its queued
items when it dies, or buildings not costing anything.

This was SVN commit r3998.
2006-06-10 03:05:16 +00:00
8d06d8601b A few organization changes:
- Removed "Base" from the Technology and Formation class names (it
doesn't make sense because these don't use inheritance).
- Modified the tech methods a little so a player ID is passed to
applyEffects, not getTechnology.

Also added a game startup script which will eventually set up player
resource pools and give them their civ techs.

This was SVN commit r3996.
2006-06-09 23:07:11 +00:00
005983f237 Renamed tech and formation directories for better organization, and created a scripts directory for the game startup script, entity scripts, and eventually things like victory condition scripts for different game modes, or possibly triggers.
This was SVN commit r3995.
2006-06-09 23:04:47 +00:00
52077dfec5 no longer create vc2002 project
This was SVN commit r3994.
2006-06-09 20:01:25 +00:00
a553182f6a More header-file rejigging.
This was SVN commit r3993.
2006-06-09 18:32:00 +00:00
d39a4fac21 Premake: include precompiled.h in the project; set up dependencies for Atlas projects.
# Attempted to make compilation faster
by including as little as possible in some .h files, and moving it into
.cpp.
Fixed BaseTechCollection memory leak.

This was SVN commit r3992.
2006-06-09 16:44:16 +00:00
e10fb780ca bumpier water
This was SVN commit r3991.
2006-06-09 09:39:25 +00:00
5bd13b1aac This was SVN commit r3990. 2006-06-09 08:12:36 +00:00
41f45e4240 fixing some player color
This was SVN commit r3989.
2006-06-09 08:01:42 +00:00
1065c4ba58 larger ship textures
This was SVN commit r3988.
2006-06-09 07:51:43 +00:00
6cc15d9f51 This was SVN commit r3987. 2006-06-09 07:03:07 +00:00
00bff41113 Recompiled Premake in Release, to make it faster
This was SVN commit r3986.
2006-06-09 00:56:40 +00:00
c3669cb137 "update-workspaces.bat --without-tests", particularly for the autobuilder while everything crashes and requires manual clicking of OK buttons
This was SVN commit r3984.
2006-06-08 22:33:59 +00:00
cf44963cbf Exefied cxxtestgen.pl
This was SVN commit r3983.
2006-06-08 22:28:23 +00:00
05b3867104 bugfix: base32 now 0-terminates output string
This was SVN commit r3982.
2006-06-08 21:47:06 +00:00
d0acaecc5c # housekeeping
fix warnings in self tests
make win_pre_main_init manually callable and remove the main() hook (see
rationale at decl of win_pre_main_init)

This was SVN commit r3981.
2006-06-08 21:27:03 +00:00
9542ecdd7e # boatload of fixes to get self-tests to compile+mostly run
refs #117

stub_impl_hack: defines a function otherwise provided by main.cpp

remove old self_test.h contents (e.g. TEST); superceded by cxxtestgen
TS_ASSERT etc.
only include self_test from a test (otherwise, cxxtest include dir won't
be set)
cxxtest won't run tests named only "test"; add more descriptive name

FIXES uncovered by self tests
lib: infinite loop in log2
lockfree: incorrect params

This was SVN commit r3979.
2006-06-08 19:03:43 +00:00
48f0794a4f improvement to test project generation: avoid having to recreate workspace twice after adding test files.
add error_dialog.rc to test.exe and use entry() to do normal lib init.

This was SVN commit r3978.
2006-06-08 18:48:40 +00:00
c59de80915 # Integrated our new unit testing framework with premake to get automated testing after every re-compile.
Trac #117

This was SVN commit r3975.
2006-06-07 22:19:42 +00:00
76cbda8713 This was SVN commit r3971. 2006-06-07 22:15:29 +00:00
74cfa7dd4d This was SVN commit r3970. 2006-06-07 22:14:11 +00:00
ac144581be Set water repeat period to 16.
This was SVN commit r3969.
2006-06-07 19:15:47 +00:00
b0647229a5 Increased water repeat period to 20 for Jason's new water.
This was SVN commit r3968.
2006-06-07 17:24:00 +00:00
cb9857185e more tiny fixes/improvements (finished on that front)
This was SVN commit r3967.
2006-06-07 14:22:26 +00:00
c59da97ed7 another shot at the water, less bump
This was SVN commit r3966.
2006-06-07 08:06:00 +00:00
65f07e300f #Wintry goodies
This was SVN commit r3965.
2006-06-07 07:42:58 +00:00
ba9e7c13c4 This was SVN commit r3964. 2006-06-07 07:42:11 +00:00
127c5113d2 new water
This was SVN commit r3963.
2006-06-07 07:33:55 +00:00
8ebf16749f fix: don't use debug mode suffix on *nix
This was SVN commit r3962.
2006-06-07 04:44:21 +00:00
ec6ed39d0d further cleanup+documentation; move external library code into separate file
This was SVN commit r3961.
2006-06-07 04:34:48 +00:00
137487c521 add initial self-test project creation
This was SVN commit r3960.
2006-06-07 03:02:20 +00:00
5f7875a243 rename i18n's tests subdirectory tests2, so that it doesn't get confused as a self-test directory
This was SVN commit r3959.
2006-06-07 03:01:25 +00:00
570c248b92 The first test, and support file for it and future tests
This was SVN commit r3958.
2006-06-07 02:30:47 +00:00
0ecb2dad1e Updates to the sample tech.
This was SVN commit r3957.
2006-06-07 01:42:17 +00:00
718f2fe8f1 More tech bug fixes.
This was SVN commit r3956.
2006-06-07 01:40:42 +00:00
82dc962a56 # further cleanup to build system
remove platform specific code, provide "external library" definitions,
automatically add static libs to main EXE project.

This was SVN commit r3955.
2006-06-07 01:40:24 +00:00
40f29a8345 Some fixes for techs.
This was SVN commit r3954.
2006-06-07 01:04:41 +00:00
b631ac6007 Modified the example tech a little.
This was SVN commit r3953.
2006-06-07 01:03:47 +00:00
pyrolink
7aad858966 forgot to add this
This was SVN commit r3952.
2006-06-06 23:50:21 +00:00