Goober5000 eeeb1a8898 don't assert on a benign conflict

2011-07-06 04:39:40 +00:00

..

encrypt.cpp

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

encrypt.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

lua.cpp

Adds sexps to manipulate a ships' collision groups. If two objects are members of the same collision group, they will not collide with each other.

2011-06-28 08:36:54 +00:00

lua.h

Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.

2009-07-11 07:07:57 +00:00

parselo.cpp

fix some things that Zacam noticed

2010-11-23 07:30:36 +00:00

parselo.h

add SCP_string variants of sprintf, sexp_replace_variable_names_with_values, replace_one, replace_all, and lcl_replace_stuff

2010-11-14 02:07:45 +00:00

scripting.cpp

adding blank scripting state to the game

2010-10-23 19:54:39 +00:00

scripting.h

adding blank scripting state to the game

2010-10-23 19:54:39 +00:00

sexp.cpp

don't assert on a benign conflict

2011-07-06 04:39:40 +00:00

sexp.h

How did these values start colliding all of a sudden? Must have been my fault, sorry.

2011-06-28 09:38:06 +00:00