Commit Graph
16183 Commits
Author SHA1 Message Date
benme 6b39d35ac7 Merge pull request #48 from AAMasters/develop
Improvements on dealing with images
2019-05-14 16:18:33 -03:00
Luis Fernando Molina 7936a79ba8 Cockpit files 2019-05-14 19:14:47 +02:00
Luis Fernando Molina 4b812349af New Turquise color 2019-05-14 19:08:08 +02:00
Luis Fernando Molina 407d13d299 BUG strategy space not showing fixed 2019-05-14 17:46:18 +02:00
Luis Fernando Molina cb60bf2e90 Controls showing up again, now as part of the cockpit 2019-05-14 17:14:59 +02:00
Luis Fernando Molina 011c870ed6 Refactoring to Cockpit Space 2019-05-14 16:14:25 +02:00
Luis Fernando Molina a276d439da Refactoring to Cockpit Space 2019-05-14 16:14:17 +02:00
Luis Fernando Molina eb044e07c7 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-14 15:42:17 +02:00
benme ae955b5626 Merge pull request #227 from AAVikings/master
Node configuration
2019-05-14 10:39:51 -03:00
Matias e333b8cac9 Resolving merge conflicts 2019-05-14 10:39:29 -03:00
benme e940f3f522 Merge pull request #91 from AAVikings/master
Node configuration
2019-05-14 10:27:06 -03:00
benme a33283f6cf Merge pull request #35 from AAVikings/develop
Node configuration
2019-05-14 10:27:02 -03:00
benme d4bd380fc4 Merge pull request #4 from AAVikings/develop
Node configuration
2019-05-14 10:27:00 -03:00
benme 24b1421980 Merge pull request #12 from AAVikings/develop
Node configuration
2019-05-14 10:26:58 -03:00
benme e8b5db050b Merge pull request #34 from AAVikings/develop
Node configuration
2019-05-14 10:26:51 -03:00
benme 6d3367f1f5 Merge pull request #105 from AAVikings/develop
Node configuration
2019-05-14 10:26:48 -03:00
Matias 4f411efa5b Merge remote-tracking branch 'origin/master' 2019-05-14 10:25:29 -03:00
Matias ec85eb88dc Node configuration 2019-05-14 10:05:15 -03:00
Matias a162a3685c Node configuration 2019-05-14 09:42:15 -03:00
Matias b591adb715 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-14 09:40:45 -03:00
Matias 2a8d64e0c4 Node configuration 2019-05-14 09:35:29 -03:00
Matias b82b6cb3db Merge remote-tracking branch 'Superalgos/master' into develop 2019-05-14 09:34:13 -03:00
Matias 0c313b6ba6 Node Configuration 2019-05-14 09:32:51 -03:00
Matias ddd638c46b Node configuration 2019-05-14 09:30:04 -03:00
Matias 4e3dc9a245 Node configuration 2019-05-14 09:12:20 -03:00
Matias 54e9afcdfa Node configuration 2019-05-14 09:05:13 -03:00
Matias 8e806a1e4d Removing Miners and Financial Beings 2019-05-14 08:58:10 -03:00
benme b63bf566a3 Merge pull request #90 from AAVikings/master
Empty time period
2019-05-14 08:17:45 -03:00
Matias ae52568fd9 Empty time period 2019-05-14 08:16:12 -03:00
Matias 04ae67800a Empry time period 2019-05-14 08:15:48 -03:00
Luis Fernando Molina d92455804f strategy part also with iconPhysics 2019-05-14 12:48:14 +02:00
Luis Fernando Molina f045312dcb Menu Item Ready to get the icons dinamically 2019-05-14 12:46:12 +02:00
Luis Fernando Molina 4f469bc28f Fine tuning text position 2019-05-14 12:28:49 +02:00
Luis Fernando Molina 6db14dfa1f Refactoring for icon 2019-05-14 12:26:29 +02:00
Luis Fernando Molina a01b7f645d Menu Item Icons not loadeed locally 2019-05-14 12:04:56 +02:00
Luis Fernando Molina 574897b6a1 Image by part type implemented 2019-05-14 09:50:37 +02:00
benme 8b97b9abc4 Merge pull request #89 from AAVikings/master
Adding simulator restart
2019-05-13 21:07:42 -03:00
Matias 2ea04cf671 Adding simulator restart 2019-05-13 21:06:57 -03:00
benme 561d317d64 Merge pull request #226 from AAMasters/develop
Added 2 new divs + automatic formatting
2019-05-13 19:57:38 -03:00
benme b14a118c4e Merge pull request #47 from AAMasters/develop
Adjusted code editor to live inside the master app
2019-05-13 19:57:03 -03:00
benme f721ea1a3c Merge pull request #33 from AAMasters/develop
dinamically create text area and input
2019-05-13 19:56:51 -03:00
Luis Fernando Molina 59dd490c3f Adjusted code editor to live inside the master app 2019-05-14 00:21:36 +02:00
Luis Fernando Molina 8565091bcd dinamically create text area and input 2019-05-14 00:21:07 +02:00
Luis Fernando Molina 3b37786f00 Added 2 new divs + automatic formatting 2019-05-14 00:20:25 +02:00
benme 46f0a43445 Merge pull request #46 from AAMasters/develop
Capital on images path
2019-05-13 17:04:00 -03:00
Luis Fernando Molina d77f5094ca Capital on images path 2019-05-13 22:02:41 +02:00
benme c7e8395578 Merge pull request #45 from AAMasters/develop
Develop Ready
2019-05-13 16:36:38 -03:00
Luis Fernando Molina f72aeebc58 Develop ready 2019-05-13 18:17:32 +02:00
Luis Fernando Molina 9b2377e169 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-13 18:16:15 +02:00
Luis Fernando Molina c5e6d55fc0 Pinning implementation complete 2019-05-13 18:08:35 +02:00