Commit Graph
9906 Commits
Author SHA1 Message Date
Matias df55b8122e Adding dependency 2019-05-15 10:10:53 -03:00
benme 2633b6e9ac Merge pull request #92 from AAVikings/master
Adding clone details
2019-05-15 10:06:00 -03:00
Matias 6096939213 Adding clone details 2019-05-15 10:05:37 -03:00
Luis Fernando Molina 62c240f5ef Merge remote-tracking branch 'upstream/develop' into develop 2019-05-15 13:08:33 +02:00
Luis Fernando Molina 696a7eb431 No scroll bar bug fixed 2019-05-15 13:02:59 +02:00
Luis Fernando Molina 07428f2647 No scroll bar bug fixed 2019-05-15 13:02:31 +02:00
Luis Fernando Molina 920d16a888 Restart Simulation Mutation implemented 2019-05-15 13:02:04 +02:00
Luis Fernando Molina 716163a574 Restart Simulation Button with mouse over / out working 2019-05-15 11:19:43 +02:00
Luis Fernando Molina 0d3f451a0c Extensive code cleaning 2019-05-15 10:40:50 +02:00
Luis Fernando Molina 9b346dde8f Restart Simulation Buttom partially implemented 2019-05-15 10:19:31 +02:00
Luis Fernando Molina 2365fbdb9c FIXED: variable for user storage 2019-05-15 09:51:06 +02:00
benme cef0dabe68 Merge pull request #51 from AAVikings/master
Any team can have public indicators
2019-05-14 19:03:33 -03:00
Matias 92f74d12d5 Any team can have public indicators 2019-05-14 19:03:03 -03:00
benme a9556fdf77 Merge pull request #50 from AAVikings/master
No selected team
2019-05-14 18:54:19 -03:00
Matias ab148f340e No selected team 2019-05-14 18:53:56 -03:00
benme 174d44a7b0 Merge pull request #49 from AAVikings/master
Multiple team support
2019-05-14 18:46:02 -03:00
Matias 2abe3caa73 Multiple team support 2019-05-14 18:45:31 -03:00
Matias c04c902bc1 Merge remote-tracking branch 'upstream/develop' 2019-05-14 18:36:43 -03:00
benme 36775a3de5 Merge pull request #36 from AAVikings/develop
Image source changed
2019-05-14 16:45:42 -03:00
Matias 3642ed47d5 Image source changed 2019-05-14 16:45:17 -03:00
benme 96216c9752 Merge pull request #228 from AAVikings/master
Fixing index file
2019-05-14 16:27:17 -03:00
Matias 5db5727158 Fixing index file 2019-05-14 16:26:36 -03:00
benme 1a03cce18b Merge pull request #35 from AAMasters/develop
Improvements on dealing with images
2019-05-14 16:18:48 -03:00
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