summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-07-23Merge branch 'level-select' of treeki:newergit/Kamek into level-selectColin Noga2-0/+217
Conflicts: NewerProject.yaml
2011-07-23Added Crowd clapper. Changed everything to LF only. If anyone on Windows ↵Colin Noga39-8223/+8436
tries to read the code now, they will be faced with a single impenetrable line!
2011-07-23fixed crapTreeki4-1/+82
2011-07-23added event blockTreeki3-0/+218
2011-07-20Fixed up sprite spawner (probably)Colin Noga1-9/+16
2011-07-19Bunch of fixes, Zorder stuff, and non-working sprespawnerColin Noga9-801/+2253
2011-07-13Thanks Treeki for showing me my moronityColin Noga1-1/+1
2011-07-13Adding sprite spawner upgrade, and hammer bros throwing stuffColin Noga5-486/+688
2011-07-03Small changes for stabilityColin Noga2-19/+28
2011-07-03Plenty of hammer collision fixesColin Noga2-0/+230
2011-06-29Added some hammer fixesColin Noga1-0/+102
2011-06-26Clean up the mess I made with merge.Colin Noga5-7/+53
2011-06-26Merge branch 'level-select' of treeki:newergit/Kamek into level-selectColin Noga6-3/+335
Conflicts: NewerProject.yaml kamek_pal.x
2011-06-26Trying again to merge changesColin Noga4-1/+219
2011-06-24added the compression updates from masterTreeki3-0/+146
2011-06-24brought this up to date with the linker scripts from masterTreeki4-16/+248
2011-06-19Added all latest fixes for textures, event looper, and sprite spawner, plus ↵Colin Noga4-12/+593
some other odds and ends
2011-06-11Event looper is fully functional!Colin Noga1-24/+36
2011-06-10Added stupid event looper that is not working to sprite 79Colin Noga2-0/+119
2011-06-10Added many small fixes, updates, etcColin Noga6-238/+851
2011-05-21fixed switch blocksTreeki2-0/+65
2011-05-17Submitted for Treeki's perusalColin Noga1-25/+67
2011-05-17temporary fixes and in-progress changes to the size hackColin Noga5-98/+216
2011-05-17sprite texture name generation no longer clobbers r6..9Treeki1-8/+16
2011-05-16Merge branch 'level-select' of tsn:newergit/Kamek into level-selectTreeki8-1/+1017
2011-05-16Merge branch 'level-select' of treeki:newergit/Kamek into level-selectColin Noga4-0/+100
2011-05-16Pushed last mostly stable Tempus hacksColin Noga8-48/+1044
2011-05-09switch settings on Level SelectTreeki2-0/+24
2011-05-09fixed switch blockTreeki1-2/+2
2011-05-09adding Tempus's current sprite texturesTreeki2-37/+75
2011-05-08oops, a bug in SetTitleTreeki1-1/+2
2011-05-08clang_complete.vim againTreeki1-0/+2
2011-05-08bringing the switch block hack over to this branchTreeki3-0/+98
2011-04-13This is bollox, these spritesColin Noga2-19/+77
2011-04-10Think Im supposed to update other branches too...?Colin Noga2-86/+236
2011-04-08updatingTreeki1-0/+145
2011-04-08fuck typosTreeki1-1/+1
2011-04-07merged sprite texture updates into level-selectTreeki2-8/+257
2011-04-07durpTreeki47-25009/+0
2011-04-07I thought I already fixed this bug... why is this code in this branch anyway?Treeki1-0/+3
2011-04-07debug crap for remTreeki1-0/+25
2011-03-28added tileset Pa1/2/3 swap hackTreeki8-6/+416
2011-03-28added gitignoreTreeki1-0/+4
2011-03-13durr I forgot to "git add ." after I had finished editing code :(Treeki10-6583/+4660
2011-03-13this branch now features only the level select stuffTreeki144-1968050/+1341
2011-03-12initial commit. now I can start playing with stuff!Treeki304-0/+2026362
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 20:27:32 +0000