Context Navigation

← Previous Change
Next Change →

particle

Timestamp:

Jun 14, 2011, 8:53:28 PM (13 years ago)

Author:

dafrick

Message:

Merging presentation branch back into trunk.
There are many new features and also a lot of other changes and bugfixes, if you want to know, digg through the svn log.
Not everything is yet working as it should, but it should be fairly stable. If you habe any bug reports, just send me an email.

Location:

code/trunk

Files:

: 1 edited
: 6 copied

. (modified) (1 prop)
data/particle/RingExp.particle (copied) (copied from code/branches/presentation/data/particle/RingExp.particle)
data/particle/RingExp2.particle (copied) (copied from code/branches/presentation/data/particle/RingExp2.particle)
data/particle/RingExp3.particle (copied) (copied from code/branches/presentation/data/particle/RingExp3.particle)
data/particle/Shield.particle (copied) (copied from code/branches/presentation/data/particle/Shield.particle)
data/particle/weaponflare.particle (copied) (copied from code/branches/presentation/data/particle/weaponflare.particle)
data/particle/weaponshoot.particle (copied) (copied from code/branches/presentation/data/particle/weaponshoot.particle)

code/trunk

Property svn:mergeinfo changed

/code/branches/bigships (added)	merged: 8426,8503-8504,8588
/code/branches/dockingsystem (added)	merged: 8137,8140,8151,8153,8185-8186,8188-8189,8192
/code/branches/dockingsystem2 (added)	merged: 8196-8197,8206,8257,8289,8382-8383,8434,8487,8493,8500-8501,8544,8560
/code/branches/gameimmersion (added)	merged: 8138,8145-8146,8152,8183-8184,8187,8191,8254,8379,8386,8395,8427,8490,8492,8533,8538,8541-8542,8547,8549-8551,8553,8574-8577
/code/branches/hudimprovements (added)	merged: 7920,7923,7932
/code/branches/pickup (added)	merged: 8255,8375,8381,8422,8433,8486,8489,8502,8534-8536,8543,8554-8555
/code/branches/portals2 (added)	merged: 8460,8466,8483,8511,8599-8600
/code/branches/presentation	merged: 8512,8546,8556,8561,8564-8568,8570,8578-8587,8589,8592-8594,8596-8598,8601,8603,8605,8607-8608,8611-8612,8614-8615,8627-8628,8631-8632,8635,8637,8639-8640,8642-8643,8645-8648,8651,8654-8668,8673,8675,8679-8682,8684,8686,8692,8694,8700,8702-8705
/code/branches/spaceboundaries2 (added)	merged: 8468,8506,8513,8604,8609,8613
/code/branches/spacerace (added)	merged: 8182,8250-8251,8428,8494,8548,8552,8571-8573,8616-8617,8624,8630
/code/branches/steering	merged: 8223,8430-8431,8545,8595
/code/branches/tetris	merged: 8246-8249,8488,8537,8563
/code/branches/tutoriallevel (added)	merged: 7828-7831,7894,8370
/code/branches/tutoriallevel2 (added)	merged: 8371,8374,8376-8378,8444-8451
/code/branches/tutoriallevel3 (added)	merged: 8453,8634,8636
/code/branches/weapons	merged: 8190,8429,8590-8591

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8706 for code/trunk/data/particle

code/trunk

Download in other formats: