Permalink
Browse files

Merge remote-tracking branch 'origin/develop'

  • Loading branch information...
jacob1 committed Aug 31, 2014
2 parents c30dbf3 + 84f3f3c commit 7d70c1f8d7278c4e9e47e9e817edcab8313eccb1
Showing with 1,984 additions and 2,228 deletions.
  1. +56 −54 README
  2. +533 −538 SConscript
  3. +20 −0 SConstruct
  4. 0 docs/.py.html
  5. +0 −701 docs/SConscript.html
  6. +0 −217 docs/gendocs.sh.html
  7. +0 −137 docs/style.css
  8. +0 −63 gendocs.sh
  9. +2 −8 generator.py
  10. +9 −11 src/Config.h
  11. +10 −3 src/PowderToySDL.cpp
  12. 0 { → src}/SDLMain.h
  13. +27 −13 { → src}/SDLMain.m
  14. +9 −0 src/client/GameSave.cpp
  15. +1 −1 src/client/requestbroker/RequestBroker.cpp
  16. +2 −1 src/client/requestbroker/RequestBroker.h
  17. +8 −2 src/graphics/Graphics.cpp
  18. +24 −2 src/graphics/RasterDrawMethods.inl
  19. +24 −3 src/graphics/Renderer.cpp
  20. +12 −5 src/gui/elementsearch/ElementSearchActivity.cpp
  21. +2 −0 src/gui/elementsearch/ElementSearchActivity.h
  22. +1 −0 src/gui/filebrowser/FileBrowserActivity.cpp
  23. +25 −16 src/gui/game/GameController.cpp
  24. +3 −0 src/gui/game/GameController.h
  25. +10 −3 src/gui/game/GameModel.cpp
  26. +18 −4 src/gui/game/GameView.cpp
  27. +2 −0 src/gui/game/GameView.h
  28. +8 −0 src/gui/interface/Keys.h
  29. +2 −2 src/gui/interface/Label.cpp
  30. +3 −6 src/gui/interface/SaveButton.cpp
  31. +47 −2 src/gui/options/OptionsView.cpp
  32. +12 −4 src/gui/render/RenderView.cpp
  33. +1 −0 src/gui/save/ServerSaveActivity.cpp
  34. +1 −0 src/gui/search/SearchController.cpp
  35. +2 −2 src/gui/search/SearchModel.cpp
  36. +2 −2 src/gui/search/SearchModel.h
  37. +1 −0 src/gui/search/SearchView.cpp
  38. +11 −27 src/lua/LegacyLuaAPI.cpp
  39. +5 −10 src/lua/LuaBit.cpp
  40. +0 −6 src/lua/LuaButton.cpp
  41. +0 −6 src/lua/LuaButton.h
  42. +0 −6 src/lua/LuaCheckbox.cpp
  43. +0 −6 src/lua/LuaCheckbox.h
  44. +11 −0 src/lua/LuaCompat.c
  45. +30 −0 src/lua/LuaCompat.h
  46. +0 −6 src/lua/LuaComponent.cpp
  47. +0 −6 src/lua/LuaComponent.h
  48. +0 −6 src/lua/LuaLabel.cpp
  49. +0 −6 src/lua/LuaLabel.h
  50. +1 −4 src/lua/LuaLuna.h
  51. +0 −6 src/lua/LuaProgressBar.cpp
  52. +0 −6 src/lua/LuaProgressBar.h
  53. +1 −1 src/lua/LuaScriptHelper.h
  54. +365 −22 src/lua/LuaScriptInterface.cpp
  55. +6 −6 src/lua/LuaScriptInterface.h
  56. +0 −6 src/lua/LuaSlider.cpp
  57. +0 −6 src/lua/LuaSlider.h
  58. +0 −6 src/lua/LuaTextbox.cpp
  59. +0 −6 src/lua/LuaTextbox.h
  60. +0 −6 src/lua/LuaWindow.cpp
  61. +0 −6 src/lua/LuaWindow.h
  62. +26 −2 src/lua/TPTSTypes.cpp
  63. +15 −2 src/lua/TPTSTypes.h
  64. +38 −20 src/lua/TPTScriptInterface.cpp
  65. +1 −1 src/lua/TPTScriptInterface.h
  66. +1 −1 src/{ → lua}/socket/auxiliar.c
  67. +2 −3 src/{ → lua}/socket/auxiliar.h
  68. +1 −4 src/{ → lua}/socket/buffer.c
  69. +1 −1 src/{ → lua}/socket/buffer.h
  70. +1 −4 src/{ → lua}/socket/except.c
  71. +1 −1 src/{ → lua}/socket/except.h
  72. +1 −4 src/{ → lua}/socket/inet.c
  73. +1 −1 src/{ → lua}/socket/inet.h
  74. 0 src/{ → lua}/socket/io.c
  75. +1 −1 src/{ → lua}/socket/io.h
  76. +2 −12 src/{ → lua}/socket/luasocket.c
  77. +1 −1 src/{ → lua}/socket/luasocket.h
  78. +0 −2 src/{ → lua}/socket/options.c
  79. +1 −1 src/{ → lua}/socket/options.h
  80. +1 −4 src/{ → lua}/socket/select.c
  81. 0 src/{ → lua}/socket/select.h
  82. 0 src/{ → lua}/socket/socket.h
  83. 0 src/{ → lua}/socket/socket.lua
  84. +1 −5 src/{ → lua}/socket/socket.lua.cpp
  85. +1 −1 src/{ → lua}/socket/socket.lua.h
  86. +2 −5 src/{ → lua}/socket/tcp.c
  87. +1 −1 src/{ → lua}/socket/tcp.h
  88. +1 −4 src/{ → lua}/socket/timeout.c
  89. +1 −1 src/{ → lua}/socket/timeout.h
  90. +2 −5 src/{ → lua}/socket/udp.c
  91. +1 −1 src/{ → lua}/socket/udp.h
  92. +2 −5 src/{ → lua}/socket/unix.c
  93. +1 −1 src/{ → lua}/socket/unix.h
  94. 0 src/{ → lua}/socket/usocket.c
  95. 0 src/{ → lua}/socket/usocket.h
  96. 0 src/{ → lua}/socket/wsocket.c
  97. 0 src/{ → lua}/socket/wsocket.h
  98. +74 −0 src/simulation/CoordStack.h
  99. +3 −1 src/simulation/ElementGraphics.h
  100. +3 −1 src/simulation/Elements.h
  101. +6 −2 src/simulation/Gravity.cpp
  102. +1 −1 src/simulation/Gravity.h
  103. +146 −108 src/simulation/Simulation.cpp
  104. +0 −1 src/simulation/Simulation.h
  105. +1 −0 src/simulation/SimulationData.cpp
  106. +2 −1 src/simulation/SimulationData.h
  107. +23 −3 src/simulation/elements/ARAY.cpp
  108. +2 −2 src/simulation/elements/BRAY.cpp
  109. +7 −1 src/simulation/elements/CRAY.cpp
  110. +122 −0 src/simulation/elements/DRAY.cpp
  111. +7 −3 src/simulation/elements/DTEC.cpp
  112. +1 −1 src/simulation/elements/EXOT.cpp
  113. +5 −2 src/simulation/elements/FILT.cpp
  114. +74 −0 src/simulation/elements/GVRT.cpp
  115. +1 −0 src/simulation/elements/H2.cpp
  116. +1 −1 src/simulation/elements/NBLE.cpp
  117. +5 −1 src/simulation/elements/PHOT.cpp
  118. +1 −1 src/simulation/elements/PIPE.cpp
  119. +2 −1 src/simulation/elements/PROT.cpp
  120. +1 −1 src/simulation/elements/PRTI.cpp
  121. +10 −1 src/simulation/elements/QRTZ.cpp
  122. +8 −8 src/simulation/elements/{REPL.cpp → RPEL.cpp}
  123. +39 −12 src/simulation/elements/SOAP.cpp
  124. +10 −10 src/simulation/elements/SPRK.cpp
  125. +2 −1 src/simulation/elements/STOR.cpp
  126. +9 −2 src/simulation/elements/URAN.cpp
  127. +2 −1 src/tasks/Task.cpp
  128. +1 −1 src/tasks/Task.h
110 README
@@ -1,15 +1,15 @@
The Powder Toy - May 2013
The Powder Toy - June 2014
Get the latest version here: http://powdertoy.co.uk/Download.html
Get the latest version here: http://powdertoy.co.uk/Download.html
To use online features such as saving, you need to register at: http://powdertoy.co.uk/Register.html
Have you ever wanted to blow something up? Or maybe you always dreamt of operating an atomic power plant? Do you have a will to develop your own CPU? The Powder Toy lets you to do all of these, and even more!
The Powder Toy is a free physics sandbox game, which simulates air pressure and velocity, heat, gravity and a countless number of interactions between different substances! The game provides you with various building materials, liquids, gases and electronic components which can be used to construct complex machines, guns, bombs, realistic terrains and almost anything else. You can then mine them and watch cool explosions, add intricate wirings, play with little stickmen or operate your machine. You can browse and play thousands of different saves made by the community or upload your own � we welcome your creations!
The Powder Toy is a free physics sandbox game, which simulates air pressure and velocity, heat, gravity and a countless number of interactions between different substances! The game provides you with various building materials, liquids, gases and electronic components which can be used to construct complex machines, guns, bombs, realistic terrains and almost anything else. You can then mine them and watch cool explosions, add intricate wirings, play with little stickmen or operate your machine. You can browse and play thousands of different saves made by the community or upload your own - we welcome your creations!
There is a Lua API you can automate your work or even make plugins for the game. The Powder Toy is free and the source code is distributed under the GNU General Public License, so you can modify the game yourself or help with development. Tpt is compiled using scons.
There is a Lua API - you can automate your work or even make plugins for the game. The Powder Toy is free and the source code is distributed under the GNU General Public License, so you can modify the game yourself or help with development. TPT is compiled using scons.
Thanks:
@@ -42,60 +42,62 @@ Controls:
---------------------------------------------------------------------------
TAB Switch between circle/square/triangle brush
Space Pause
Q Quit
Esc Quit
Z Zoom
S Save stamp (+ Ctrl when STK2 is out)
L Load last saved stamp
K Stamp library
1-9 Set view mode
P Save screenshot to .png
F Pause and go to next frame
G Increase grid size
Shift + G Decrease grid size
H Show/Hide HUD
Ctrl + H Show intro text
F1 Show intro text
D Debug mode (+ Ctrl when STK2 is out)
I Invert Pressure and Velocity map
W Toggle gravity modes (+ Ctrl when STK2 is out)
Y Toggle air modes
Ctrl + B Toggle decorations on/off
U Toggle ambient heat on/off
Ctrl + I Install powder toy, for loading saves/stamps by double clicking
~ Console
= Reset pressure and velocity map
Ctrl + = Reset Electricity
[ Decrease brush size
] Increase brush size
Alt + [ Decrease brush size by 1
Alt + ] Increase brush size by 1
Ctrl + C/V/X Copy/Paste/Cut
Ctrl + Z Undo
Ctrl + Cursor drag Rectangle
Shift + Cursor drag Line
Middle click Sample element
Alt + Left click Sample element
Mouse scroll Change brush size
Ctrl + Mouse scroll Change vertical brush size
Shift + Mouse scroll Change horizontal brush size
Shift + Ctrl + R Horizontal mirror for selected area
Ctrl + R Rotate selected area counterclockwise
TAB Switch between circle/square/triangle brush
Space Pause
Q Quit
Esc Quit
Z Zoom
S Save stamp (+ Ctrl when STK2 is out)
L Load last saved stamp
K Stamp library
1-9 Set view mode
P / F2 Save screenshot to .png
E Bring up element search
F Pause and go to next frame
G Increase grid size
Shift + G Decrease grid size
H Show/Hide HUD
Ctrl + H / F1 Show intro text
D / F3 Debug mode (+ Ctrl when STK2 is out)
I Invert Pressure and Velocity map
W Toggle gravity modes (+ Ctrl when STK2 is out)
Y Toggle air modes
B Enter decoration editor menu
Ctrl + B Toggle decorations on/off
N Toggle Newtonian Gravity on/off
U Toggle ambient heat on/off
Ctrl + I Install powder toy, for loading saves/stamps by double clicking
~ Console
= Reset pressure and velocity map
Ctrl + = Reset Electricity
[ Decrease brush size
] Increase brush size
Alt + [ Decrease brush size by 1
Alt + ] Increase brush size by 1
Ctrl + C/V/X Copy/Paste/Cut
Ctrl + Z Undo
Ctrl + Cursor drag Rectangle
Shift + Cursor drag Line
Middle click Sample element
Alt + Left click Sample element
Mouse scroll Change brush size
Ctrl + Mouse scroll Change vertical brush size
Shift + Mouse scroll Change horizontal brush size
Shift + R Horizontal mirror for selected area when pasting stamps
Ctrl + Shift + R Vertical mirror for selected area when pasting stamps
R Rotate selected area counterclockwise when pasting stamps
Only the left Ctrl, Shift, and Alt buttons are enabled to work, not the ones on the right
Command Line:
---------------------------------------------------------------------------
scale:1 Normal window resolution
scale:2 Doubled window resolution
kiosk Fullscreen mode
proxy:server[:port] Proxy server to use [Example: proxy:wwwcache.lancs.ac.uk:8080]
open <file> Opens the file as a stamp or game save
ddir <directory> Directory used for saving stamps and preferences
ptsave:<save id>#<name(Optional)> (ex. ptsave:2198#Destroyable_city_5_wth_metro~dima-gord)
scale:1 Normal window resolution
scale:2 Doubled window resolution
kiosk Fullscreen mode
proxy:server[:port] Proxy server to use [Example: proxy:wwwcache.lancs.ac.uk:8080]
open <file> Opens the file as a stamp or game save
ddir <directory> Directory used for saving stamps and preferences
ptsave:<save id>#[name] [Example: ptsave:2198#Destroyable_city_5_wth_metro~dima-gord]
Oops, something went wrong.

0 comments on commit 7d70c1f

Please sign in to comment.