Commit Graph

330 Commits

Author SHA1 Message Date
Simon Robertshaw
26dbb9d309 Missing 'delete' on old blockMap data in save Tranformation 2012-06-09 19:43:35 +01:00
Simon Robertshaw
050ad82155 Unify stamp and clipboard placement code, GameSave translation and transoformation working (not particularly well) 2012-06-09 19:42:07 +01:00
Simon Robertshaw
c408e035fa Preview: Wait for save to load before opening, Simulation: Correct block coords when reading wall data, replace existing particles when placing stamps on top, Game: Clear the simulation when loading a save 2012-06-09 14:54:58 +01:00
Simon Robertshaw
46614017c8 Close the preview dialogue when the model throws an exception 2012-06-08 22:55:11 +01:00
Simon Robertshaw
0ee1e1875d Load save data when showing the save preview 2012-06-08 22:04:14 +01:00
Simon Robertshaw
1dadb11fc2 Remove unneeded files 2012-06-07 16:16:54 +01:00
Simon Robertshaw
61ed6e0276 Rename Save class to SaveInfo, introduce SaveFile for hanlding of local data (stamps and local saves). Rename Stamps browser to LocalBrowser, ready for sharing code with the local save browser 2012-06-07 14:23:26 +01:00
Simon Robertshaw
2e48fc6115 'No Image' icon when save rendering fails 2012-06-06 01:54:27 +01:00
Simon Robertshaw
8fae7dbade Saving and loading at position, yuse exceptions for parsing saves 2012-06-06 01:46:13 +01:00
Simon Robertshaw
7063587706 Fix bmap reading error caused by signed/unsigned comparison 2012-06-05 22:55:39 +01:00
Simon Robertshaw
49dafbfd26 Use a different method for decoding saves with uncompressed object in memory for stamps and clipboard, also allows for transformation (rotation), missing failure states and code for loading it into a Simulation 2012-06-05 20:08:35 +01:00
Simon Robertshaw
bc35d622ad OpenGL JNI Canvas compiled only when needed 2012-06-04 12:21:07 +01:00
Simon Robertshaw
a247951115 Add missing header includer for C libraries. 2012-06-02 16:51:01 +01:00
Simon Robertshaw
e0c9dab8cb Move more SDL dependancies out of program, OpenGLCanvas for JNI and JNI methods. 2012-05-31 10:24:44 +01:00
Simon Robertshaw
ab82847cd6 Fix minor syntax error, move all OpenGL includes into a new file that can detect the OS X version. 2012-05-30 13:17:40 +01:00
Simon Robertshaw
86746f38b0 Separate SDL from graphics code
Also remove OS X specific project files and update Makefile to ensure
the Element class generator only runs when necessary
2012-05-30 12:32:58 +01:00
Simon Robertshaw
f8fcd73b20 Moar button appearance 2012-05-23 20:25:35 +01:00
Simon Robertshaw
f41ab864ef Fix slight issues when clicking on menu section buttons and missing isMouseInside in MouseEnter action for buttons 2012-05-23 19:49:44 +01:00
Simon Robertshaw
f1953603c0 Use mouse hover callback for menu buttons 2012-05-23 19:31:53 +01:00
Simon Robertshaw
c112715ea7 Better element positioning in ErrorMessage 2012-05-23 19:31:40 +01:00
Simon Robertshaw
26eeb40541 Extra callback for just mouse hover 2012-05-23 19:31:01 +01:00
Simon Robertshaw
2b2531a62a Correct position of title in LoginView 2012-05-23 19:30:33 +01:00
Simon Robertshaw
adf7a3c720 Better icon alignment, improve appearance of preview 2012-05-22 20:30:23 +01:00
Simon Robertshaw
f86f2a9997 Restore missing IconFavourite drawing code
Was accidently remove in commit ba5efb101e
2012-05-22 17:48:36 +01:00
Simon Robertshaw
cc0efb13f0 OPS save format from TPT 2012-05-22 16:01:39 +01:00
Simon Robertshaw
7e49d63d28 BSON Library from TPT/MongoDB 2012-05-22 16:01:23 +01:00
Simon Robertshaw
2c5400a732 Warp display with newer shader, Render options works in OpenGL 2012-05-17 22:34:16 +01:00
Simon Robertshaw
8efd07a849 Air tool 2012-05-17 22:10:17 +01:00
Simon Robertshaw
bbf7851596 Seperate new/old CreateParts functions 2012-05-15 20:01:20 +01:00
Simon Robertshaw
ba5efb101e Username, password icons for Login window 2012-05-15 18:55:36 +01:00
Simon Robertshaw
136675b56a Move style into Component 2012-05-15 18:13:17 +01:00
Simon Robertshaw
45563e97e8 Make flood_prop use PropertyType from StructProperty, Property tool works 2012-05-15 00:10:10 +01:00
Simon Robertshaw
0b4ad4f25c Add ability to introspect the Particle struct 2012-05-14 23:04:08 +01:00
Simon Robertshaw
be849a9150 Style improvements to sign tool 2012-05-14 20:51:16 +01:00
Simon Robertshaw
f39d2361e7 Improve appearance of some dialogues, style defaults 2012-05-14 20:47:14 +01:00
Simon Robertshaw
4bb90d0d79 Text alignment for dropdown, make sign UI nice 2012-05-13 21:11:02 +01:00
Simon Robertshaw
41e1d28c56 Correct air include path for OptionsModel, correct Window debugmode logic, justifications for sign 2012-05-13 20:54:29 +01:00
Simon Robertshaw
7758fe52cb DropDown UI component 2012-05-13 20:00:22 +01:00
Simon Robertshaw
4032a0469b Click function for tools that aren't continuous. Debug helper for UI components (Ctrl+Shift D when DEBUG is defined), fix add sign window logic 2012-05-13 17:43:41 +01:00
Simon Robertshaw
724c99102e Stupid git 2012-05-12 22:28:45 +01:00
Simon Robertshaw
7128188048 Primitive sign adding 2012-05-12 22:25:45 +01:00
Simon Robertshaw
c5798c7456 Tools implemented in a similar way to elements 2012-05-12 18:11:20 +01:00
Simon Robertshaw
16d3895e9c Redo Wall IDs 2012-05-12 13:21:04 +01:00
Simon Robertshaw
1c993435ef Default elements in gamemodel 2012-05-07 18:08:41 +01:00
Simon Robertshaw
51b17badf4 A bit of refactoring (elements) 2012-05-07 17:59:50 +01:00
Simon Robertshaw
bb8a3f76e3 OS X compiling working, Make it a bit more friendly with stricter compilers 2012-04-26 13:10:47 +01:00
Simon Robertshaw
22d7865e6d Inline restrict_flt 2012-04-22 22:37:00 +01:00
Simon Robertshaw
892584c5fe Fix Off-by-one error with zoom Window using OpenGL 2012-04-22 20:26:40 +01:00
Simon Robertshaw
e38fd405af Correct quirks with drawrect and fillrect, change UI components accordingly, shorten save name in save button 2012-04-22 17:13:43 +01:00
Simon Robertshaw
96506610b2 Clean out graphics, add openGL graphics in seperate file, change brush to use unsigned char rather than boolean for bitmap/outline 2012-04-21 22:46:37 +01:00
Simon Robertshaw
75a9460c83 OpenGL rendering 2012-04-20 19:21:10 +01:00
Simon Robertshaw
0bab640fe4 Fix warning in Client.cppcpppcppc 2012-04-20 01:45:43 +01:00
Simon Robertshaw
7538881591 Fix more element source file includes 2012-04-20 00:46:08 +01:00
Simon Robertshaw
891ce89ed0 Correct path name for Elements.h include in gel.cpp 2012-04-20 00:40:55 +01:00
Simon Robertshaw
456fca22c6 TPT: Change STOR, PIPE, DUST to make correct use of .flags field. 2012-04-19 17:01:17 +01:00
Simon Robertshaw
ceb25440cb TPT: Fix sponge bug. f93a829671 2012-04-19 16:52:35 +01:00
Simon Robertshaw
c4bace95bf Allow deleting of stamps 2012-04-19 15:22:18 +01:00
Simon Robertshaw
e9fc64eed6 No interaction with non-visible components" 2012-04-19 14:38:15 +01:00
Simon Robertshaw
c13b05d272 Version number update 2012-04-18 21:39:33 +01:00
Simon Robertshaw
699a8f699c Missing tron graphics function 2012-04-18 21:39:07 +01:00
Simon Robertshaw
0cc8f84e63 TPT: Fix the bug where you could set bad temp to insulators. 64629df1af 2012-04-18 21:35:14 +01:00
Simon Robertshaw
f8b1e1a232 TPT: Better description for tron d4a9f86503 2012-04-18 21:33:50 +01:00
Simon Robertshaw
652cd591ff Fix previous include 2012-04-18 21:33:07 +01:00
Simon Robertshaw
44d70ec6b8 TPT: Alterations to TRON and fancy effects ffa5ccb666 2012-04-18 21:31:22 +01:00
Simon Robertshaw
e4d1c7141f TPT: TRON element, needs to glow and fancy explosion on crash eccf5658d2 2012-04-18 21:27:28 +01:00
Simon Robertshaw
472cb8916e TPT: A small fix for convection. ff8ce0ef3a 2012-04-18 21:21:32 +01:00
Simon Robertshaw
1fdaabca6d TPT: Viscosity change for gel. Water diffusion among sponge and gel (but with flying cake effect) c9bcc11d35 2012-04-18 21:20:31 +01:00
Simon Robertshaw
b40f13b66a TPT: Added gel - a liquid with variable heat conductivity and viscosity. 8523da398f 2012-04-18 21:18:37 +01:00
Simon Robertshaw
ff7428fc70 TPT: Fix crash when flood fill deleting life 7a844f51ff 2012-04-18 21:07:26 +01:00
Simon Robertshaw
ea37facf83 TPT: No unmeltable ice anymore. e4448dc1d6 2012-04-18 21:05:14 +01:00
Simon Robertshaw
bfb37563ca TPT: Use graphics function for BCOL a1bd20db91 2012-04-18 21:04:37 +01:00
Simon Robertshaw
2ce377ef43 TPT: Stop walls next to pipe triggering automatic pattern generation 76f49dd024 2012-04-18 21:03:56 +01:00
Simon Robertshaw
d85049fb93 TPT: A fix for ice with ctype = 0. e52f730969 2012-04-18 21:01:54 +01:00
Simon Robertshaw
1681429d7f TPT: Glowing BRAY 2976936cfd 2012-04-18 21:00:43 +01:00
Simon Robertshaw
94e7123791 TPT: Allow DEST to be cloned with CLNE, PCLN, BCLN and PBCN 57d8335ca5 2012-04-18 20:46:34 +01:00
Simon Robertshaw
10e3f176d2 TPT: REALISTIC - Latent heat. It may be buggy, and enthalpy table isn't filled, but it works 4b4830b5a4 2012-04-18 20:44:01 +01:00
Simon Robertshaw
d9cca3ec1e TPT: Fixed burning temp. for fire. 00839a3b14 2012-04-18 19:28:18 +01:00
Simon Robertshaw
6be1b869e5 TPT: Fix ELEC being put into pmap instead of photons 5a3faa0584 2012-04-18 19:20:04 +01:00
Simon Robertshaw
f55fc54f6e TPT: Fix firework glow 001c4502e8 2012-04-18 19:13:50 +01:00
Simon Robertshaw
95c702535c TPT: Fix glow for deut at ligh 4d45bbedb3 2012-04-18 19:12:24 +01:00
Simon Robertshaw
c5a8615e89 TPT: Fix portals being ugly and PRTO effects not being random at first 94b8ed193f 2012-04-18 19:06:56 +01:00
Simon Robertshaw
779ac383dc TPT: Fix major update_particles_i bug, do_move was being called on nonexistant particles, causing kill_part to kill another particle 96ec3486e8 2012-04-18 19:02:27 +01:00
Simon Robertshaw
a8483798cc TPT: fusion step 3 8db6230414 2012-04-18 18:52:37 +01:00
Simon Robertshaw
bf935ac7d8 TPT: fusion step 2 + modify temp/pressure of step 1 803ded3b33 2012-04-18 18:40:14 +01:00
Simon Robertshaw
4ddf723167 TPT: prevent ionizing NBLE and burning H2 during fusion 83d4658589 2012-04-18 18:33:34 +01:00
Simon Robertshaw
bc4a3355de TPT: Fusion, step 1 446f773542 2012-04-18 16:51:47 +01:00
Simon Robertshaw
43ae47ba77 TPT: Added smudge tool afbe8cf38e 2012-04-18 16:40:43 +01:00
Simon Robertshaw
a761fa5cbc TPT: Remove 2 pixels per frame speed limit in detector wall b4a06df0b2 2012-04-18 16:14:10 +01:00
Simon Robertshaw
2ca07515c1 TPT: Fix fighters not going through portals correctly f41af45620 2012-04-18 16:12:16 +01:00
Simon Robertshaw
fa193eb7b4 TPT: Display decor in heat gradient view e83a1a21ae 2012-04-18 15:16:52 +01:00
Simon Robertshaw
6f3954b926 TPT: (REALISTIC) Better air<->body heat conduction. Air density now influences on it (things don't heat vacuum). 71acd578b6 2012-04-18 15:14:40 +01:00
Simon Robertshaw
add4ccb034 TPT: Volume from heat change (for REALISTIC) 290cac8b7e 2012-04-18 15:11:51 +01:00
Simon Robertshaw
d03a9c8fe5 TPT: Rotate/reflect particle, air, and fan velocities in transform_save 830629be3f 2012-04-18 15:10:09 +01:00
Simon Robertshaw
ce7d749dda TPT: Prevent ARAY passing through some non-conductive materials, and let normal ARAY pass through sparked INWR d21c61aa52 2012-04-18 14:59:24 +01:00
Simon Robertshaw
eeff570f89 TPT: Fixed the bug with fighters running away from stick mans, but now boundary check is worser so fighters won't usually notice holes on their way 2b4d0442b5 2012-04-18 14:57:29 +01:00
Simon Robertshaw
f84dc03c23 TPT: A new unstable REALISTIC option. No guarantees - but more realistic behaviour. f41f96f598 2012-04-18 14:50:29 +01:00
Simon Robertshaw
82a1933400 TPT: Old nothing display mode in the form of Basic colour mode fe82685257 2012-04-18 14:43:09 +01:00
Simon Robertshaw
df2d698ed5 Fix drawing of lines, rects and fill within the zoom window 2012-04-17 20:20:45 +01:00
Simon Robertshaw
80a77f4750 TPT: Added FRAY - Force-ray and RPEL - Repeller f6696282e1 2012-04-17 18:42:36 +01:00
Simon Robertshaw
fdb4dff4d7 TPT: Lua methods for reading/writing the bmap and emap (no mapped walltypes yet) 1c4bce1f22 2012-04-17 18:13:17 +01:00
Simon Robertshaw
2417ad3b41 TPT: Prevent gaps in beams of photons from powered clone 3702438482 2012-04-17 18:07:22 +01:00
Simon Robertshaw
89788d43c3 TPT: Make DEUT compress when Newtonian gravity is applied to it c960c29f72 2012-04-17 17:48:12 +01:00
Simon Robertshaw
df303dc491 TPT: Allow BRAY from PSCN to pass through sparked INWR e769f3feb8 2012-04-17 17:46:44 +01:00
Simon Robertshaw
22381b2462 TPT: Draw pixels for the entire fire_alpha array 9001508623 2012-04-17 17:45:03 +01:00
Simon Robertshaw
7682094f13 TPT: Fix stationary photons being created by PCLN/PBCN 91163c44ab 2012-04-17 17:42:29 +01:00
Simon Robertshaw
fd09db2345 TPT: Prevent ambient heat going through walls ccb88b6b3b 2012-04-17 17:32:06 +01:00
Simon Robertshaw
e68d14a5bf TPT: INSL blocks DLAY conduction, and raise DLAY temperature limit 06cb98f705 2012-04-17 17:28:37 +01:00
Simon Robertshaw
fe5ae5e792 TPT: Make ARAY fire once per spark 72a4358eee 2012-04-17 17:26:12 +01:00
Simon Robertshaw
b88a2f680e TPT: More SPRK life checks for electronic elements 68ab3ca3ca 2012-04-17 17:24:51 +01:00
Simon Robertshaw
8ea1e41d87 TPT: Fix switch not activating completely while being sparked 1a5cd45eb8 2012-04-17 17:20:48 +01:00
Simon Robertshaw
a3e97d51d1 TPT: Change wifi so that it always takes one frame to transmit a722d7a396 2012-04-17 17:18:35 +01:00
Simon Robertshaw
ca1690efe1 TPT: Separate loop for updating life, and add SPRK life checks to most electronics 6bdc05cc40 2012-04-17 17:14:23 +01:00
Simon Robertshaw
75f6212751 TPT: Another change to the eval_move check in create_part eaf2af6d40 2012-04-17 16:55:43 +01:00
Simon Robertshaw
db1ffd3208 TPT: Fix WARP destroying DMND a9c198dd46 2012-04-17 16:45:05 +01:00
Simon Robertshaw
69e7dadcdf TPT: Make RBDM/WATR explosion work again, by not killing fire created by WATR 32c9ff3099 2012-04-17 16:36:27 +01:00
Simon Robertshaw
065ca8b9f5 TPT: Only check the bits actually used for wavelength in photon ctype Fixes black photons not being killed after passing through pipe 748a528fe0 2012-04-17 16:33:04 +01:00
Simon Robertshaw
475fd1a0b8 TPT: Solids wall description, and check build_save was successful when saving a stamp 44545d4c96 2012-04-17 16:30:04 +01:00
Simon Robertshaw
609db36f2e TPT: Check coordinates of signs before using them to read pmap or pressure 8a11b6b31d 2012-04-17 16:14:42 +01:00
Simon Robertshaw
f4e2d188c2 transform_save should check wall coordinates against size in blocks, not the actual size ff6aa0227d 2012-04-17 16:11:07 +01:00
Simon Robertshaw
027833fe20 TPT Whoops, eval_move returning 1 should not allow particle creation edcf6d7b2f 2012-04-17 16:06:39 +01:00
Simon Robertshaw
25ce83d5bf TPT: Implement PROP_NEUTABSORB bdf277e687 2012-04-17 16:04:48 +01:00
Simon Robertshaw
c261030cef Started on dropdown control 2012-04-17 15:56:57 +01:00
Simon Robertshaw
c3c31b20b0 Fix portals 2012-04-16 21:19:12 +01:00
Simon Robertshaw
465cb12af4 Newtonian gravity working 2012-04-16 13:58:20 +01:00
Simon Robertshaw
a0506495ad Simulation options 2012-04-15 22:16:57 +01:00
Simon Robertshaw
900e23128a Add ability to get favourites 2012-04-14 21:11:54 +01:00
Simon Robertshaw
4c6be4ff2c Graphics:: Extra icons for Report and Favourite. Client:: Get favourite status in GetSave, FavouriteSave, ReportSave, Preview:: Failure state when loading save 2012-04-14 19:00:24 +01:00
Simon Robertshaw
64063fbc0f Add missing for OpenURI on 64bit Linux 2012-04-14 15:32:19 +01:00
Simon Robertshaw
91064f4935 Remove other references to Global.h 2012-04-14 15:19:18 +01:00
Simon Robertshaw
1c5910fbab Remove deleted 'Global.h' from includes 2012-04-14 15:14:02 +01:00
Simon Robertshaw
20b3be68a7 Remove some unnecessary files. 2012-04-14 14:49:26 +01:00
Simon Robertshaw
66a451129c Fix Integer <-> Pointer casts on 64bit 2012-04-13 20:55:14 +01:00
Simon Robertshaw
e060f75819 Okay instead of Continue for text input dialogue 2012-04-13 19:00:40 +01:00
Simon Robertshaw
db1dbb1afa Text input dialogue 2012-04-13 18:56:05 +01:00
Simon Robertshaw
84ceea525b Nice drawing for brush 2012-04-11 18:23:10 +01:00
Simon Robertshaw
b2907798f2 Fix issue where unborn children were slaughtered when removing a component from an event 2012-04-09 12:40:30 +01:00
Simon Robertshaw
da9cec2c3b Remove unused code 2012-04-09 12:39:45 +01:00
Simon Robertshaw
798c78b04e Add missing GOL data 2012-04-09 11:46:42 +01:00
Simon Robertshaw
c88079d084 Element sampling HUD thingy (No very good with MVC) 2012-04-08 00:11:21 +01:00
Simon Robertshaw
bbfbb81086 Confirmation Dialogue, Save selection and multi-delete 2012-04-07 00:45:24 +01:00
Simon Robertshaw
8f8de875c6 Modifier keys for Lua, Air display, correct render mode saving 2012-04-05 13:48:50 +01:00
Simon Robertshaw
ea51cde1f0 Change brush size with [ and ] keys, change order of drawing for Lua, Fix print and tpt.log so they log to the console when it is open 2012-04-04 21:47:58 +01:00
Simon Robertshaw
89cdeef9ad CommandInterface, Mouse, Keyboard and Tick events, on screen log, print redirected to tpt.log 2012-04-04 18:52:34 +01:00
Simon Robertshaw
299c1da9ae Search and stamps scolling with mouse wheel, Esc to exit 2012-04-03 18:12:32 +01:00
Simon Robertshaw
838a612026 Use a single instance of a background simulation for thumbnail rendering 2012-04-03 17:08:56 +01:00
Simon Robertshaw
73c5082cbc Super, megaheavyweight thumbnail renderer 2012-04-03 14:07:39 +01:00
Simon Robertshaw
efddc12e5d Stamps browser, placement + clipboard sampling and placement - No clipboard or stamp thumbnail generation, needs thumbnail generator from SaveLoader 2012-04-02 17:01:28 +01:00
Simon Robertshaw
289556ac70 Replace Error notification with exception for Tags model 2012-03-29 16:17:30 +01:00
Simon Robertshaw
1f388e4ca0 Exception when loading invalid save 2012-03-29 00:59:10 +01:00
Simon Robertshaw
e9770d8ee7 Clipboard and Stamp from selection (no way to paste/place yet) 2012-03-28 22:01:44 +01:00