Commit Graph

48 Commits

Author SHA1 Message Date
Rob L
aa77a8403a Update to latest upstream -> Bugfixes 2016-07-25 12:52:51 -04:00
Rob L
df077dc299 Minor fix from upstream. 2016-07-25 12:35:06 -04:00
Rob L
fb27dcec2e Push updated mapview 2016-07-25 12:04:42 -04:00
Rob L
4235435a78 Add title to webview page 2016-07-22 15:39:56 -04:00
Rob L
2940459bf0 Update push for mapview 2016-07-22 15:36:44 -04:00
Rob L
721662227d Update mapview 2016-07-22 13:46:36 -04:00
Rob L
2b95b84796 Dun goofed the directory. Updated 2016-07-22 13:27:20 -04:00
Rob L
1b890a0210 Moved to submodules for master branch integration 2016-07-22 13:21:37 -04:00
Rob L
226917bf22 Merge with master branch maybe 2016-07-22 10:49:42 -04:00
Rob L
e37d3fef2f Remove mapview in prep for subtree merge 2016-07-22 10:45:53 -04:00
Rob L
f9773ca1ba Updated code for webview 2016-07-14 14:40:45 -04:00
Rob L
b242577b47 Update to latest iteration of code 2016-07-14 08:32:03 -04:00
Rob L
f552aa03bd Update to latest mapview code 2016-07-13 11:51:28 -04:00
Rob L
1394dc1f3e Push new updates to webgl 2016-07-12 15:56:31 -04:00
Rob L
04e3e05598 Add reset button 2016-07-07 13:39:25 -04:00
Rob L
a5dcd545a4 Change onreisze to set it directly via window.onresize 2016-07-07 12:55:58 -04:00
Rob L
e1d2dc6631 Removed inline json data and refs to otherwise 2016-07-07 12:51:40 -04:00
Rob L
14ea3776c8 Add dataloading back 2016-07-07 12:49:32 -04:00
Rob L
ffbed442e8 Staging and testing for json data movement 2016-07-07 12:46:22 -04:00
roblevesque
8d1647b712 Update JSON data (Colors) 2016-07-07 12:43:09 -04:00
Rob L
b7ceaf1b9e Change to local versions of external libraries 2016-07-07 12:40:24 -04:00
roblevesque
6a4b49d8fe correct the record on colors 2016-07-07 12:32:52 -04:00
roblevesque
ab0fa753dc Head to wall
Head to wall when you realize last 10 or so commits were not really a loading issue but because of a typo instead.
2016-07-07 12:29:56 -04:00
roblevesque
27124a1a9d Give up and include empireData in main JS 2016-07-07 12:28:24 -04:00
roblevesque
28547e9962 Remove empire data loading 2016-07-07 12:27:37 -04:00
roblevesque
8f8f105d23 add empire data loading 2016-07-07 12:26:50 -04:00
roblevesque
6a1aec0d8f Remove Require 2016-07-07 12:26:02 -04:00
roblevesque
aca705aa68 console.log() is needed 2016-07-07 12:24:21 -04:00
roblevesque
f53b126d01 Additional lack of coffee error correction 2016-07-07 12:22:59 -04:00
roblevesque
0df6a2af6e Fix lack of coffee error 2016-07-07 12:22:28 -04:00
roblevesque
54c8cab4e8 Move empire data to JS file 2016-07-07 12:21:25 -04:00
roblevesque
8de7e42835 Initial Creation 2016-07-07 12:19:26 -04:00
roblevesque
42311a0275 move _callback() call 2016-07-07 12:17:27 -04:00
roblevesque
d7596cc3fa Forgot something 2016-07-07 12:14:43 -04:00
roblevesque
79ce122988 Add Callback for data loading 2016-07-07 12:10:12 -04:00
roblevesque
677dc706ee Move JSON loading to separate function 2016-07-07 12:06:30 -04:00
roblevesque
8abf0adcb9 move JSON load back to top. 2016-07-07 12:04:28 -04:00
roblevesque
463e4fba9f See previous 2016-07-07 11:59:46 -04:00
roblevesque
246ddb2e12 move JSON load to init() 2016-07-07 11:58:26 -04:00
roblevesque
79b2eacc3e Back to single quotes 2016-07-07 11:52:40 -04:00
roblevesque
fc5fd9d2bd Try pulling initial camera target from jsonEmpire 2016-07-07 11:47:05 -04:00
roblevesque
a2e8c2c199 Single to double quotes 2016-07-07 11:43:05 -04:00
roblevesque
4a34761f72 Change to onload execution
use onLoad instead of right away so the body dom element isn't null
2016-07-07 11:35:52 -04:00
roblevesque
1ebee3c8e5 Run JSON through validation to ensure correctness 2016-07-07 11:32:09 -04:00
roblevesque
96956d3ba1 Fix relative path issues with json file.
I apparently don't know how to handle relative paths.   added js/ in front of empiredata.json to handle that lack of knowledge.
2016-07-07 11:26:10 -04:00
roblevesque
996e25ba82 Something something leading forward slash 2016-07-07 11:24:39 -04:00
roblevesque
b175831333 Be more specific with external library locations 2016-07-07 11:23:38 -04:00
Rob L
47da08343c Really add the master project files this time 2016-07-07 11:18:02 -04:00