summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2013-10-29Merge branch 'master' into developSimon Robertshaw1-4/+3
2013-10-26fix virus graphicsjacob13-2/+24
2013-10-26f5: reload sim, f2: screenshot f3: toggle extra HUDjacob12-0/+13
2013-10-26fix sim.decoBox arguments, add a sim.canMove functionjacob12-7/+28
2013-10-24Merge pull request #178 from mniip/x11-clipboardjacob11-110/+121
fix copy and paste in the same tpt window on SDL/Linux/X11
2013-10-24fix copy and paste in the same tpt window on SDL/Linux/X11mniip1-110/+121
2013-10-24fix issue with FILT PHOT scatteringjacob11-4/+3
2013-10-20Merge branch 'develop' of https://github.com/simtr/The-Powder-Toy into developSimon Robertshaw1-1/+1
2013-10-20reduce / prevent PROT in fusion even morejacob11-1/+1
2013-10-20Remove old unfinished virtual machine and Lua bindings for itSimon Robertshaw25-5187/+0
2013-10-18fix bottom row of saves in the save browser being cut offjacob11-1/+1
2013-10-18fix not being able to select / see all elements in menus with tons of elementsjacob12-4/+4
2013-10-18revert b17ef7f93880 (couldn't figure out better fix for the new PSTN bug), ↵jacob12-9/+12
fix annoyance with clicking on save comments changing pages
2013-10-17Ignore invalid walls in some old saves, so that they load correctlyjacksonmj1-35/+41
E.g. save 10631 from old server
2013-10-17Fix incorrect search page countjacksonmj1-1/+7
2013-10-10PROT with 0 life doesn't diejacob11-3/+6
2013-09-29make PROT lasers easier to make, adjust velocities needed to make things ↵jacob12-12/+15
when smashing PROT together, use FIRE_BLEND for PROT graphics
2013-09-28VIRS only burns with PLSM, and has the NO_DECO graphics flagjacob14-13/+29
2013-09-28Fix tpt.get_numOfParts, add "C" next to temperature in HUDjacob12-3/+3
2013-09-27Merge branch 'HEAD' of https://github.com/FacialTurd/The-Powder-Toy.gitjacob12-5/+15
2013-09-27fix min and max in VS2013jacob11-0/+4
2013-09-27Fix crash when trying to convert StringType to PointTypejacksonmj1-4/+14
2013-09-27Decimal number supportliquidcaesium1-1/+1
2013-09-24LCRY + PROT = LCRY + PHOTliquidcaesium1-0/+6
Protons passing through active LCRY get turned into photons slowly, functioning as a powered converter in that manner.
2013-09-21WIFI: always delay one frame before conducting, to prevent particle order issuesjacksonmj1-1/+1
2013-09-15Forgot HUD description for FILT tmp=9jacksonmj1-2/+2
2013-09-14fix BIZS melting without heat sim on (I wonder how many more elements still ↵jacob11-1/+1
do this ...)
2013-09-14update version numberjacob11-3/+3
2013-09-14make PROT more red, and VIRS burns lessjacob12-3/+3
2013-09-14disable PHOT+H2 reaction during fusionjacob11-1/+1
2013-09-14ensure VIBR always eats PROTjacob11-1/+1
2013-09-14PROT+DEUT causes DEUT implosion (same as with NEUT, just negative pressure)jacob14-5/+37
Also PHOT+H2 now also make PROT+ELEC (which will not combine to make more H2)
2013-09-13fix !load -1 crashjacob11-3/+7
2013-09-12fix SOAP crashes by making sure particle id's are between 0 and NPART. Also ↵jacob12-13/+21
cut off .life to between 0 and 65535 when saving
2013-09-12remove useless and laggy lightning_recreate checkjacob12-31/+11
2013-09-12save pavg[] in saves, for VIRS, PIPE, and STORjacob15-17/+31
2013-09-11Merge pull request #158 from mniip/x11-clipboardjacob11-2/+54
X11 clipboard pull
2013-09-08Missing breaks in readOPSjacksonmj2-1/+5
Causing some elements to be loaded incorrectly
2013-09-08CRAY: only set decoration colour after passing through FILTjacksonmj2-1/+7
2013-09-08Revert "Don't reset decorations when sparking with INWR+CRAY(most things)"jacksonmj1-29/+10
This reverts commit 5ad67f7778ede58e9708c43587d694e446a2377b.
2013-09-08Enabled check for PIPE toojacksonmj2-2/+4
2013-09-08Don't reset decorations when sparking with INWR+CRAY(most things)jacksonmj1-10/+29
INWR+CRAY(SOAP) will reset decorations
2013-09-08Include elements[].Enabled in check for invalid lava ctypejacksonmj4-5/+16
2013-09-06fix segfault on wordwrapping a string with a character >=128mniip2-2/+2
2013-09-05fix BCOL melting and not burning when heat sim is offjacob11-1/+1
2013-09-05Make effect of PROT on wifi and portals independent of channel temperature ↵jacksonmj1-1/+14
ranges Cold PROT decreases channel by 1, v cold by 10. Hot PROT increases channel by 1, v hot by 10. Since the effect is specified in terms of effect on channel number not on temperature, this will cause less problems if the temperature gap is ever decreased to add more channels.
2013-09-04new element: VIRS (also solid and gas virus states). Cured by SOAP (CURE ↵jacob16-11/+255
element was not added)
2013-09-03proton collision reaction (might need to be modified). Also some ways to go ↵jacob12-49/+128
to/from protons
2013-09-02fix fixedRatio when VideoBuffer::Resize'ing, fixes #121mniip1-7/+4
2013-09-02new element: PROT (protons) TODO: proton colliders to produce heavier elementsjacob16-42/+181