11402 Commits

Author SHA1 Message Date
Arturo Gonzalez
2e26ac4bfc New maps in progress... (Fixed minimap relation) 2016-03-21 17:27:24 +01:00
mdtrooper
11c75259d3 Working in the paint arrows A-M-M-A 2016-03-21 17:03:14 +01:00
mdtrooper
800756b9ac Working in the arrows A-M-A 2016-03-21 15:34:33 +01:00
mdtrooper
92703f13c2 Some work in arrows. 2016-03-21 13:13:09 +01:00
mdtrooper
027a2977b6 Clean code. 2016-03-21 12:37:36 +01:00
mdtrooper
4bd2821c6b Some work in arrows. 2016-03-21 12:26:17 +01:00
mdtrooper
5ffc2cfa37 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/javascript/map/MapController.js
	pandora_console/include/javascript/map/NetworkmapController.js
2016-03-21 10:28:41 +01:00
mdtrooper
42ecb787cf Some work. 2016-03-21 10:25:41 +01:00
Arturo Gonzalez
2e04732f75 New maps in progress... (Document the code) 2016-03-21 08:53:52 +01:00
mdtrooper
4f4f8538a4 Some changes for arrows. 2016-03-18 16:58:50 +01:00
mdtrooper
135ae1dd16 Mixed the networkmap level 2 and level 3 2016-03-18 16:19:33 +01:00
Arturo Gonzalez
3a4f0ef9cd New maps in progress... (Fixed error) 2016-03-18 08:57:52 +01:00
Arturo Gonzalez
527c7d0edc New maps in progress... (networkmap arrows use system) 2016-03-18 08:50:12 +01:00
Arturo Gonzalez
3e313c8c43 New maps in progress... (Works in the fantastic arrows... thx mdtrooper) 2016-03-17 17:42:54 +01:00
mdtrooper
4678ef2d39 Clean code of the paint arrows. 2016-03-17 13:00:44 +01:00
mdtrooper
7fafc0e01e Working in the mass selection nodes with rectangle. 2016-03-17 12:39:28 +01:00
mdtrooper
e8f6935fef Fixed the minimap. 2016-03-17 12:28:11 +01:00
Arturo Gonzalez
894bbd2c9e New maps in progress... (mdtrooper i love you <3) 2016-03-17 11:44:07 +01:00
mdtrooper
5cc89d968c Fixed the minimap. 2016-03-17 11:40:38 +01:00
mdtrooper
f0d4ae7a9c Upload lost files 2016-03-17 10:47:02 +01:00
Arturo Gonzalez
56cadb2037 New maps in progress... (Node details finished) 2016-03-17 10:44:43 +01:00
Arturo Gonzalez
9d2dff71e3 New maps in progress... (node details) 2016-03-17 10:31:18 +01:00
Arturo Gonzalez
12565ada17 New maps in progress... (Node detail) 2016-03-17 08:51:45 +01:00
mdtrooper
32d96a3099 Working in the minimap, paint nodes. 2016-03-16 15:59:44 +01:00
mdtrooper
b69b20bedf Working in the minimap. 2016-03-16 15:34:54 +01:00
Arturo Gonzalez
5098f1a74f Revert "New maps in progress... (fixed resize error)"
This reverts commit 5fbf085fef6ec2a14bedc2b4d67787abf185b29f.
2016-03-16 12:37:34 +01:00
Arturo Gonzalez
5fbf085fef New maps in progress... (fixed resize error) 2016-03-16 12:32:45 +01:00
Arturo Gonzalez
e6d0982296 New maps in progress... (Fixed resize with negative numbers) 2016-03-16 12:10:14 +01:00
mdtrooper
c21c710598 Start to code the minimap. 2016-03-15 17:05:37 +01:00
Arturo Gonzalez
bd50ca25be New maps in progress... (Tooltips fixed) 2016-03-15 13:22:04 +01:00
Arturo Gonzalez
dc171c45f2 New maps in progress... (Works in negative size when resize a element) 2016-03-15 10:08:57 +01:00
mdtrooper
3d52c3e842 Fixed the resizing element and arrows 2016-03-15 10:06:36 +01:00
mdtrooper
1a80e7c10c Fixed the drag a resized element 2016-03-15 09:49:49 +01:00
mdtrooper
0593e75476 Working in the minimap. 2016-03-15 09:46:15 +01:00
Arturo Gonzalez
b87e5e6a87 New maps in progress... (document the code) 2016-03-15 08:50:57 +01:00
mdtrooper
cb248b6a92 Some work in the resize 2016-03-14 14:26:19 +01:00
mdtrooper
1fc3b7497b Some work in the resize 2016-03-14 12:52:09 +01:00
mdtrooper
27e53d9576 Some work in the resize 2016-03-14 12:42:07 +01:00
mdtrooper
8f8a267e33 Some work in the resize 2016-03-14 12:35:33 +01:00
mdtrooper
21a1f1cc60 Some work in the resize 2016-03-14 11:32:00 +01:00
mdtrooper
2359b955db Working in the resize action. 2016-03-11 13:14:59 +01:00
mdtrooper
fd0995af96 Working in the resize action. 2016-03-11 12:44:52 +01:00
Arturo Gonzalez
95b13bf3aa New maps in progress... (map editor dialog version 1.0) 2016-03-10 16:12:54 +01:00
Arturo Gonzalez
a1de142e98 New maps in progress... (Edit node dialog, 1.0 version) 2016-03-10 15:22:56 +01:00
Arturo Gonzalez
1a792c4d42 New maps in progress... (edit node dialog() 2016-03-10 14:54:31 +01:00
mdtrooper
9befc1c65e Uploaded some code about resize action 2016-03-10 12:42:25 +01:00
Arturo Gonzalez
9ceb3c15e4 New maps in progress... (Preliminar edit node table) 2016-03-10 11:06:52 +01:00
Arturo Gonzalez
1330fd5a5f New maps in progress... (Changed jquery each to javascript native each and more fixes) 2016-03-09 13:17:27 +01:00
Arturo Gonzalez
ed3b3e7094 New maps in progress... (Delete node added!!) 2016-03-09 12:32:58 +01:00
mdtrooper
9ee921f9c1 Move the styles to the pandora.css 2016-03-09 11:45:48 +01:00